Commit 5ab7e4a0 authored by Dries's avatar Dries

- Patch #1020642 by amateescu: improved coding standards for toolbar.css.

parent 874fe3d8
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
float: right; float: right;
} }
#toolbar ul li a { #toolbar ul li a {
float: none;
display: inline-block; display: inline-block;
float: none;
zoom: 1; zoom: 1;
} }
#toolbar div.toolbar-menu { #toolbar div.toolbar-menu {
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
float: left; float: left;
} }
#toolbar ul#toolbar-user li { #toolbar ul#toolbar-user li {
display: inline;
float: none; float: none;
display: inline;
} }
#toolbar-menu { #toolbar-menu {
float: none; float: none;
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
body.toolbar { body.toolbar {
padding-top: 2.2em; padding-top: 2.2em;
} }
body.toolbar-drawer { body.toolbar-drawer {
padding-top: 5.3em; padding-top: 5.3em;
} }
...@@ -14,15 +13,15 @@ body.toolbar-drawer { ...@@ -14,15 +13,15 @@ body.toolbar-drawer {
*/ */
#toolbar, #toolbar,
#toolbar * { #toolbar * {
margin: 0;
padding: 0;
border: 0; border: 0;
outline: 0;
font-size: 100%; font-size: 100%;
vertical-align: baseline;
line-height: inherit; line-height: inherit;
text-align: left; /* LTR */
list-style: none; list-style: none;
margin: 0;
outline: 0;
padding: 0;
text-align: left; /* LTR */
vertical-align: baseline;
} }
/** /**
...@@ -32,34 +31,31 @@ body.toolbar-drawer { ...@@ -32,34 +31,31 @@ body.toolbar-drawer {
* across different themes, while still allowing browsers to resize the text. * across different themes, while still allowing browsers to resize the text.
*/ */
#toolbar { #toolbar {
font: normal small "Lucida Grande", Verdana, sans-serif;
background: #666; background: #666;
color: #ccc; color: #ccc;
position: fixed; font: normal small "Lucida Grande", Verdana, sans-serif;
top: 0;
left: 0; left: 0;
right: 0;
margin: 0 -20px; margin: 0 -20px;
padding: 0 20px; padding: 0 20px;
z-index: 600; position: fixed;
right: 0;
top: 0;
-moz-box-shadow: 0 3px 20px #000; -moz-box-shadow: 0 3px 20px #000;
-webkit-box-shadow: 0 3px 20px #000; -webkit-box-shadow: 0 3px 20px #000;
box-shadow: 0 3px 20px #000; box-shadow: 0 3px 20px #000;
filter: progid:DXImageTransform.Microsoft.Shadow(color=#000000, direction='180', strength='10'); filter: progid:DXImageTransform.Microsoft.Shadow(color=#000000, direction='180', strength='10');
-ms-filter: "progid:DXImageTransform.Microsoft.Shadow(color=#000000, direction='180', strength='10')"; -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(color=#000000, direction='180', strength='10')";
z-index: 600;
} }
#toolbar div.collapsed { #toolbar div.collapsed {
display: none; display: none;
visibility: hidden; visibility: hidden;
} }
#toolbar a { #toolbar a {
color: #fff; color: #fff;
font-size: .846em; font-size: .846em;
text-decoration: none; text-decoration: none;
} }
#toolbar ul li, #toolbar ul li,
#toolbar ul li a { #toolbar ul li a {
float: left; /* LTR */ float: left; /* LTR */
...@@ -74,69 +70,61 @@ body.toolbar-drawer { ...@@ -74,69 +70,61 @@ body.toolbar-drawer {
padding: 5px 50px 5px 10px; /* LTR */ padding: 5px 50px 5px 10px; /* LTR */
position: relative; position: relative;
} }
#toolbar-home a span { #toolbar-home a span {
vertical-align: text-bottom;
width: 11px;
height: 14px;
display: block;
background: url(toolbar.png) no-repeat 0 -45px; background: url(toolbar.png) no-repeat 0 -45px;
text-indent: -9999px; display: block;
height: 14px;
margin: 3px 0px; margin: 3px 0px;
text-indent: -9999px;
vertical-align: text-bottom;
width: 11px;
} }
#toolbar-user { #toolbar-user {
float: right; /* LTR */ float: right; /* LTR */
} }
#toolbar-menu { #toolbar-menu {
float: left; /* LTR */ float: left; /* LTR */
} }
#toolbar div.toolbar-menu a.toggle { #toolbar div.toolbar-menu a.toggle {
position: absolute; background: url(toolbar.png) 0 -20px no-repeat;
right: 10px; /* LTR */
bottom: 0; bottom: 0;
cursor: pointer; cursor: pointer;
background: url(toolbar.png) 0 -20px no-repeat; height: 25px;
text-indent: -9999px;
overflow: hidden; overflow: hidden;
position: absolute;
right: 10px; /* LTR */
text-indent: -9999px;
width: 25px; width: 25px;
height: 25px;
} }
#toolbar div.toolbar-menu a.toggle:focus, #toolbar div.toolbar-menu a.toggle:focus,
#toolbar div.toolbar-menu a.toggle:hover { #toolbar div.toolbar-menu a.toggle:hover {
background-position: -50px -20px; background-position: -50px -20px;
} }
#toolbar div.toolbar-menu a.toggle-active { #toolbar div.toolbar-menu a.toggle-active {
background-position: -25px -20px; background-position: -25px -20px;
} }
#toolbar div.toolbar-menu a.toggle-active.toggle:focus, #toolbar div.toolbar-menu a.toggle-active.toggle:focus,
#toolbar div.toolbar-menu a.toggle-active.toggle:hover { #toolbar div.toolbar-menu a.toggle-active.toggle:hover {
background-position: -75px -20px; background-position: -75px -20px;
} }
#toolbar div.toolbar-menu ul li a { #toolbar div.toolbar-menu ul li a {
padding: 0 10px;
-moz-border-radius: 10px; -moz-border-radius: 10px;
-webkit-border-radius: 10px; -webkit-border-radius: 10px;
border-radius: 10px; border-radius: 10px;
padding: 0 10px;
} }
#toolbar div.toolbar-menu ul li a:focus, #toolbar div.toolbar-menu ul li a:focus,
#toolbar div.toolbar-menu ul li a:hover, #toolbar div.toolbar-menu ul li a:hover,
#toolbar div.toolbar-menu ul li a:active, #toolbar div.toolbar-menu ul li a:active,
#toolbar div.toolbar-menu ul li a.active:focus { #toolbar div.toolbar-menu ul li a.active:focus {
background: #444; background: #444;
} }
#toolbar div.toolbar-menu ul li a.active:hover, #toolbar div.toolbar-menu ul li a.active:hover,
#toolbar div.toolbar-menu ul li a.active:active, #toolbar div.toolbar-menu ul li a.active:active,
#toolbar div.toolbar-menu ul li a.active, #toolbar div.toolbar-menu ul li a.active,
#toolbar div.toolbar-menu ul li.active-trail a { #toolbar div.toolbar-menu ul li.active-trail a {
text-shadow: #333 0 1px 0;
background: url(toolbar.png) 0 0 repeat-x; background: url(toolbar.png) 0 0 repeat-x;
text-shadow: #333 0 1px 0;
} }
/** /**
...@@ -154,10 +142,10 @@ background-position: -75px -20px; ...@@ -154,10 +142,10 @@ background-position: -75px -20px;
* it with position:absolute; toolbar needs its z-index to stay above overlay. * it with position:absolute; toolbar needs its z-index to stay above overlay.
*/ */
* html #toolbar { * html #toolbar {
position: absolute; left: -20px;
margin: 0; margin: 0;
padding-right: 0; padding-right: 0;
left: -20px; position: absolute;
right: 0; right: 0;
width: 100%; width: 100%;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment