- Patch #607682 by seutje: clean up the mess that is toolbar.css.

1 files changed, 33 insertions, 42 deletions

diff --git a/modules/toolbar/toolbar.css b/modules/toolbar/toolbar.css
index 9f9838dcb..b90bbbf57 100644
--- a/modules/toolbar/toolbar.css
+++ b/modules/toolbar/toolbar.css
@@ -1,19 +1,19 @@
 /* $Id$ */
 
 body.toolbar {
-  padding-top: 30px;
+  padding-top: 2.2em;
 }
 
 body.toolbar-drawer {
-  padding-top: 80px;
+  padding-top: 6.6em;
 }
 
 /**
  * Aggressive resets so we can achieve a consistent look in hostile CSS
  * environments.
  */
-div#toolbar,
-div#toolbar * {
+#toolbar,
+#toolbar * {
   margin: 0;
   padding: 0;
   border: 0;
@@ -28,8 +28,8 @@ div#toolbar * {
 /**
  * Base styles.
  */
-div#toolbar {
-  font: normal 11px/20px "Lucida Grande", Verdana, sans-serif;
+#toolbar {
+  font: normal 0.9em "Lucida Grande", Verdana, sans-serif;
   background: #666;
   color: #ccc;
   position: fixed;
@@ -39,12 +39,12 @@ div#toolbar {
   z-index: 600;
 }
 
-div#toolbar .collapsed {
+#toolbar div.collapsed {
   display: none;
   visibility: hidden;
 }
 
-div#toolbar div.shadow {
+#toolbar div.shadow {
   position: absolute;
   left: 0;
   right: 0;
@@ -53,40 +53,38 @@ div#toolbar div.shadow {
   background: url(toolbar.png) 0 -45px repeat-x;
 }
 
-div#toolbar a {
+#toolbar a {
   text-decoration: none;
   color: #fff;
 }
 
-div#toolbar ul li,
-div#toolbar ul li a {
+#toolbar ul li,
+#toolbar ul li a {
   float: left;
 }
 
 /**
  * Administration menu.
  */
-div#toolbar div.toolbar-menu {
+#toolbar div.toolbar-menu {
   background: #000;
-  height: 25px;
-  line-height: 20px;
-  padding: 5px 10px 0;
+  line-height: 1.84;
+  padding: 5px 50px 5px 10px;
   position: relative;
 }
 
-div#toolbar div.toolbar-menu #toolbar-user {
-  position: absolute;
-  right: 50px;
+#toolbar-user {
+  float: right;
 }
-
-div#toolbar div.toolbar-menu #toolbar-menu {
-  position: absolute;
-  left: 10px;
+  
+#toolbar-menu {
+  float: left;
 }
 
-div#toolbar div.toolbar-menu a.toggle {
+#toolbar div.toolbar-menu a.toggle {
   position: absolute;
   right: 10px;
+  bottom: 0;
   cursor: pointer;
   background: url(toolbar.png) 0 -20px no-repeat;
   text-indent: -9999px;
@@ -95,24 +93,25 @@ div#toolbar div.toolbar-menu a.toggle {
   height: 25px;
 }
 
-div#toolbar div.toolbar-menu a.toggle-active {
+#toolbar div.toolbar-menu a.toggle-active {
   background-position:  -25px -20px;
 }
 
-div#toolbar div.toolbar-menu ul li a {
+#toolbar div.toolbar-menu ul li a {
   -moz-border-radius: 10px;
   -webkit-border-radius: 10px;
+  border-radius: 10px;
   padding: 0 10px;
 }
 
-div#toolbar div.toolbar-menu ul li a:focus,
-div#toolbar div.toolbar-menu ul li a:hover,
-div#toolbar div.toolbar-menu ul li a.active:focus {
+#toolbar div.toolbar-menu ul li a:focus,
+#toolbar div.toolbar-menu ul li a:hover,
+#toolbar div.toolbar-menu ul li a.active:focus {
   background: #444;
 }
 
-div#toolbar div.toolbar-menu ul li a.active:hover,
-div#toolbar div.toolbar-menu ul li a.active {
+#toolbar div.toolbar-menu ul li a.active:hover,
+#toolbar div.toolbar-menu ul li a.active {
   text-shadow: #333 0 1px 0;
   background: url(toolbar.png) 0 0 repeat-x;
 }
@@ -120,26 +119,18 @@ div#toolbar div.toolbar-menu ul li a.active {
 /**
  * Collapsed drawer of additional toolbar content.
  */
-div#toolbar div.toolbar-drawer {
+#toolbar div.toolbar-drawer {
   position: relative;
   padding: 0 10px;
 }
 
 /**
- * IE 6 Fixes.
+ * IE 6 Fix.
  *
- * Since IE 6 has severe problems interpreting fixed positioning, we downgrade
- * the behavior of the admin toolbar entirely to static positioning.
+ * IE 6 shows elements with position:fixed as position:static
+ * so we remove the padding-top from the body
  */
 * html body.toolbar,
 * html body.toolbar-drawer {
   padding-top: 0;
 }
-
-* html div#toolbar {
-  position: static;
-}
-
-* html div#toolbar div.shadow {
-  display: none;
-}