Index: update.php =================================================================== RCS file: /cvs/drupal/drupal/update.php,v retrieving revision 1.197 diff -u -F^f -r1.197 update.php --- update.php 14 Aug 2006 05:47:36 -0000 1.197 +++ update.php 14 Aug 2006 20:23:12 -0000 @@ -402,6 +402,7 @@ function update_progress_page() { // Prevent browser from using cached drupal.js or update.js drupal_add_js('misc/progress.js', TRUE); drupal_add_js('misc/update.js', TRUE); + drupal_add_css(drupal_get_path('module', 'system') .'/admin.css', 'core'); drupal_set_title('Updating'); $output = '
'; Index: modules/menu/menu.css =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.css,v retrieving revision 1.1 diff -u -F^f -r1.1 menu.css --- modules/menu/menu.css 14 Aug 2006 07:14:49 -0000 1.1 +++ modules/menu/menu.css 14 Aug 2006 20:23:12 -0000 @@ -10,19 +10,19 @@ } li.expanded { list-style-type: circle; - list-style-image: url(menu-expanded.png); + list-style-image: url(../../misc/menu-expanded.png); padding: 0.2em 0.5em 0 0; margin: 0; } li.collapsed { list-style-type: disc; - list-style-image: url(menu-collapsed.png); + list-style-image: url(../../misc/menu-collapsed.png); padding: 0.2em 0.5em 0 0; margin: 0; } li.leaf { list-style-type: square; - list-style-image: url(menu-leaf.png); + list-style-image: url(../../misc/menu-leaf.png); padding: 0.2em 0.5em 0 0; margin: 0; } Index: modules/system/admin.css =================================================================== RCS file: modules/system/admin.css diff -N modules/system/admin.css --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/system/admin.css 14 Aug 2006 20:23:12 -0000 @@ -0,0 +1,73 @@ +/* +** Progressbar styles +*/ +.progress { + font-weight: bold; +} +.progress .bar { + background: #fff url(progress.gif); + border: 1px solid #00375a; + height: 1.5em; + margin-top: 0.2em; +} +.progress .filled { + background: #0072b9; + height: 1em; + border-bottom: 0.5em solid #004a73; + width: 0%; +} +.progress .percentage { + float: right; +} + +/* +** Formatting for administration page +*/ +div.admin-panel { + margin: 0px 0px 0px 0px; + padding: 5px 5px 15px 5px; +} + +div.admin-panel .description { + margin: 0px 0px 3px; + padding: 2px 0 3px 0; + font-weight: normal; + text-align: left; + color: #999; +} + +div.admin-panel .body { + padding: 0 4px 2px 8px; + background-color: #f4f4f4; + line-height: 1.2em; +} + +div.admin-panel .head { + background-color: #6699CC; + color: #FFFFFF; + font-weight: bold; + font-size: 14px; + margin: 0px 0px 0px 0px; + padding: 4px 4px 4px 8px; +} + +div.admin { + padding-top: 15px; +} + +div.admin .left { + float: left; + width: 47%; + margin-left: 1em; +} +div.admin .right { + float: right; + width: 47%; + margin-right: 1em; +} + +div.admin .expert-link { + text-align: right; + margin-right: 1em; + padding-right: 4px; +} Index: modules/system/system.css =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.css,v retrieving revision 1.1 diff -u -F^f -r1.1 system.css --- modules/system/system.css 14 Aug 2006 07:14:49 -0000 1.1 +++ modules/system/system.css 14 Aug 2006 20:23:13 -0000 @@ -124,3 +124,88 @@ height: 1.75em; margin: 0; } + +/* +** Autocomplete styles +*/ +/* Suggestion list */ +#autocomplete { + position: absolute; + border: 1px solid; + overflow: hidden; +} +#autocomplete ul { + margin: 0; + padding: 0; + list-style: none; +} +#autocomplete li { + background: #fff; + color: #000; + white-space: pre; + cursor: default; +} +#autocomplete li.selected { + background: #0072b9; + color: #fff; +} +/* Animated throbber */ +html.js input.form-autocomplete { + background-image: url(../../misc/throbber.gif); + background-repeat: no-repeat; + background-position: 100% 2px; +} +html.js input.throbbing { + background-position: 100% -18px; +} + +/* +** Collapsing fieldsets +*/ +html.js fieldset.collapsed { + border-bottom-width: 0; + border-left-width: 0; + border-right-width: 0; + margin-bottom: 0; +} +html.js fieldset.collapsed * { + display: none; +} +html.js fieldset.collapsed table *, +html.js fieldset.collapsed legend, +html.js fieldset.collapsed legend * { + display: inline; +} +html.js fieldset.collapsible legend a { + padding-left: 15px; + background: url(../../misc/menu-expanded.png) 5px 50% no-repeat; +} +html.js fieldset.collapsed legend a { + background-image: url(../../misc/menu-collapsed.png); +} +/* Note: IE-only fix due to '* html' (breaks Konqueror otherwise). */ +* html.js fieldset.collapsible legend a { + display: block; +} + +/* +** Resizable text areas +*/ +.resizable-textarea { + width: 95%; +} +.resizable-textarea .grippie { + height: 14px; + background: #eee url(../../misc/grippie.png) no-repeat 100% 100%; + border: 1px solid #ddd; + border-top-width: 0; + cursor: s-resize; +} + +/* +** Formatting for welcome page +*/ +#first-time strong { + display: block; + padding: 1.5em 0 .5em; +} Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.344 diff -u -F^f -r1.344 system.module --- modules/system/system.module 14 Aug 2006 07:17:37 -0000 1.344 +++ modules/system/system.module 14 Aug 2006 20:23:14 -0000 @@ -244,6 +244,7 @@ function system_menu($may_cache) { if (arg(0) == 'admin') { global $custom_theme; $custom_theme = variable_get('admin_theme', 'bluemarine'); + drupal_add_css(drupal_get_path('module', 'system') .'/admin.css', 'core'); } // Add the CSS for this module. We put this in !$may_cache so it is only Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.652 diff -u -F^f -r1.652 user.module --- modules/user/user.module 14 Aug 2006 06:53:57 -0000 1.652 +++ modules/user/user.module 14 Aug 2006 20:23:16 -0000 @@ -756,6 +756,10 @@ function user_menu($may_cache) { 'weight' => 10); } else { + // Add the CSS for this module. We put this in !$may_cache so it is only + // added once per request. + drupal_add_css(drupal_get_path('module', 'user') .'/user.css', 'core'); + if (arg(0) == 'user' && is_numeric(arg(1)) && arg(1) > 0) { $account = user_load(array('uid' => arg(1)));