Index: modules/shortcut/shortcut.css =================================================================== RCS file: /cvs/drupal/drupal/modules/shortcut/shortcut.css,v retrieving revision 1.8 diff -u -r1.8 shortcut.css --- modules/shortcut/shortcut.css 31 May 2010 08:18:02 -0000 1.8 +++ modules/shortcut/shortcut.css 3 Jun 2010 10:54:06 -0000 @@ -1,67 +1,65 @@ /* $Id: shortcut.css,v 1.8 2010/05/31 08:18:02 dries Exp $ */ div#toolbar a#edit-shortcuts { + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + color: #e4e4e4; float: right; - padding: 5px 10px 5px 5px; line-height: 24px; - color: #bbb; + margin-top: 5px; + padding: 0px 5px 0px 5px; } div#toolbar a#edit-shortcuts:focus, -div#toolbar a#edit-shortcuts:hover, +div#toolbar a#edit-shortcuts:hover { + text-decoration: underline; +} div#toolbar a#edit-shortcuts.active { - color: #fff; + background-color: #000; } - div#toolbar div.toolbar-shortcuts ul { - padding: 5px 0 2px 0; + float: left; height: 28px; line-height: 24px; - float: left; margin-left:5px; + padding: 5px 0 2px 0; } - div#toolbar div.toolbar-shortcuts ul li a { - padding: 0 5px 0 5px; - margin-right: 5px; - border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; + border-radius: 5px; + margin-right: 5px; + padding: 0 5px 0 5px; } - div#toolbar div.toolbar-shortcuts ul li a:focus, div#toolbar div.toolbar-shortcuts ul li a:hover, div#toolbar div.toolbar-shortcuts ul li a.active:focus { background: #555; } - div#toolbar div.toolbar-shortcuts ul li a.active:hover, div#toolbar div.toolbar-shortcuts ul li a.active { background: #000; } - div#toolbar div.toolbar-shortcuts span.icon { - float: left; background: #444; - width: 30px; - height: 30px; - margin-right: 5px; - border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; + border-radius: 5px; + float: left; + height: 30px; + margin-right: 5px; + width: 30px; } - div.add-or-remove-shortcuts { padding-top: 5px; } - div.add-or-remove-shortcuts a span.icon { - display: block; - width: 12px; background: transparent url(shortcut.png) no-repeat scroll 0 0; - height: 12px; + display: block; float: left; + height: 12px; margin-left:8px; + width: 12px; } - div.add-shortcut a:focus span.icon, div.add-shortcut a:hover span.icon { background-position: 0 -12px; @@ -73,36 +71,32 @@ div.remove-shortcut a:hover span.icon { background-position: -12px -12px; } - div.add-or-remove-shortcuts a span.text { + display: none; float: left; padding-left:10px; - display: none; } - div.add-or-remove-shortcuts a:focus span.text, div.add-or-remove-shortcuts a:hover span.text { - font-size: 10px; - line-height: 12px; - color: #fff; background-color: #5f605b; - display: block; - padding-right: 6px; - cursor: pointer; - border-top-right-radius: 5px; - border-bottom-right-radius: 5px; - -moz-border-radius-topright: 5px; -moz-border-radius-bottomright: 5px; + -moz-border-radius-topright: 5px; + -webkit-border-bottom-right-radius: 5px; -webkit-border-top-right-radius: 5px; - -webkit-border-bottom-right-radius: 5px; + border-bottom-right-radius: 5px; + border-top-right-radius: 5px; + color: #fff; + cursor: pointer; + display: block; + font-size: 10px; + line-height: 12px; + padding-right: 6px; } - #shortcut-set-switch .form-type-radios { - padding-bottom: 0; margin-bottom: 0; + padding-bottom: 0; } - #shortcut-set-switch .form-item-new { - padding-top: 0; padding-left: 17px; + padding-top: 0; }