From 4ffdd6dfe6348d647fd96cc5e83950276cab3237 Mon Sep 17 00:00:00 2001 From: Dries Buytaert <dries@buytaert.net> Date: Sun, 27 Aug 2006 07:44:55 +0000 Subject: [PATCH] - Patch #80717 by jeff/ma3vrck: clean up admin css. --- modules/system/admin.css | 15 ++------------- modules/system/system.module | 12 ++++++------ themes/bluemarine/style.css | 6 ++++++ themes/chameleon/marvin/style.css | 11 +++++++++++ themes/chameleon/style.css | 11 +++++++++++ themes/pushbutton/style.css | 14 ++++++++++++++ 6 files changed, 50 insertions(+), 19 deletions(-) diff --git a/modules/system/admin.css b/modules/system/admin.css index ba564c2ac123..ebb591f3f747 100644 --- a/modules/system/admin.css +++ b/modules/system/admin.css @@ -2,15 +2,13 @@ ** Formatting for administration page */ div.admin-panel { - margin: 0px 0px 0px 0px; + margin: 0; padding: 5px 5px 15px 5px; } div.admin-panel .description { - margin: 0px 0px 3px; + margin: 0 0 3px; padding: 2px 0 3px 0; - font-weight: normal; - text-align: left; color: #999; } @@ -20,15 +18,6 @@ div.admin-panel .body { 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; } diff --git a/modules/system/system.module b/modules/system/system.module index cadf534b9ea3..045d09b5e15f 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -1602,7 +1602,7 @@ function theme_admin_page($blocks) { $output .= '</div>'; foreach ($container as $id => $data) { - $output .= '<div class="'. $id .'">'; + $output .= '<div class="'. $id .' clear-block">'; $output .= $data; $output .= '</div>'; } @@ -1625,14 +1625,14 @@ function theme_admin_block($block) { } $output = <<< EOT - <div class="admin-panel collapsible"> - <div class="head"> + <div class="admin-panel"> + <h3> $block[title] - </div> + </h3> <div class="body"> - <div class="description"> + <p class="description"> $block[description] - </div> + </p> $block[content] </div> </div> diff --git a/themes/bluemarine/style.css b/themes/bluemarine/style.css index 05b1411bb9f1..6575f1197fec 100644 --- a/themes/bluemarine/style.css +++ b/themes/bluemarine/style.css @@ -328,6 +328,12 @@ table { .block-forum h3 { margin-bottom: .5em; } +div.admin-panel h3 { + background-color: #69c; + color: #fff; + padding: 5px 8px 5px; + margin: 0; +} .calendar a { text-decoration: none; } diff --git a/themes/chameleon/marvin/style.css b/themes/chameleon/marvin/style.css index 75142b7e7f85..1698d2e4eac3 100644 --- a/themes/chameleon/marvin/style.css +++ b/themes/chameleon/marvin/style.css @@ -86,6 +86,17 @@ table { margin: 0; } +/* +** Administration page styles +*/ + +div.admin-panel h3 { + background-color: #888; + color: #fff; + padding: 5px 8px 5px; + margin: 0; +} + /* ** Module specific styles */ diff --git a/themes/chameleon/style.css b/themes/chameleon/style.css index 705b746c00bc..38a4cf5ed5e8 100644 --- a/themes/chameleon/style.css +++ b/themes/chameleon/style.css @@ -88,3 +88,14 @@ ul { .item-list ul li { list-style: square; } + +/* +** Administration page styles +*/ + +div.admin-panel h3 { + background-color: #999; + color: #fff; + padding: 5px 8px 5px; + margin: 0; +} \ No newline at end of file diff --git a/themes/pushbutton/style.css b/themes/pushbutton/style.css index 297358d0a57f..30bca12c6ef3 100644 --- a/themes/pushbutton/style.css +++ b/themes/pushbutton/style.css @@ -487,6 +487,20 @@ table#footer-menu { background: transparent url(arrow-up-hover.png) center top no-repeat; } +/* +** Administration page styles +*/ + +div.admin-panel h3 { + background-color: #369; + color: #fff; + padding: 5px 8px 5px; + margin: 0; +} +div.admin-panel .body { + background: #fffaf0; +} + /* ** Module specific styles */ -- GitLab