sync both themes with Mozilla 11 toolkit winstripe changes

[themes.git] / LCARStrek / global / toolbarbutton.css

diff --git a/LCARStrek/global/toolbarbutton.css b/LCARStrek/global/toolbarbutton.css
index ea05e9f7d915cba7c41d42337ab539d66eb8f2a2..ff4835735b4dc2e7fd35e877a489bf4d05ac844c 100644 (file)
--- a/LCARStrek/global/toolbarbutton.css
+++ b/LCARStrek/global/toolbarbutton.css
@@ -46,18 +46,19 @@
 /* ::::: toolbarbutton ::::: */
 
 toolbarbutton {
-  -moz-border-radius: 3px;
+  border-radius: 3px;
   -moz-box-align: center;
   -moz-box-pack: center;
   margin: 0px;
-  margin-left: 2px;
+  -moz-margin-start: 2px;
   border: none;
   padding: 1px 2px;
   background-color: #000000;
   color: #FFCF00;
 }
 
-.toolbarbutton-icon {
+.toolbarbutton-icon[label]:not([label=""]),
+.toolbarbutton-icon[type="menu"] {
   -moz-margin-start: 1px;
   -moz-margin-end: 2px;
 }
@@ -72,14 +73,13 @@ toolbarbutton.tabbable {
   -moz-user-focus: normal !important;
 }
 
-toolbarbutton:focus {
+toolbarbutton:-moz-focusring {
   -moz-outline-radius: 3px;
   outline: 1px dotted #008484;
   -moz-outline-offset: -1px;
 }
 
-toolbarbutton:hover,
-toolbarbutton[buttonover="true"] {
+toolbarbutton:hover {
   background-color: #FFCF00;
   color: #000000;
 }
@@ -102,12 +102,18 @@ toolbarbutton[open="true"] {
 toolbarbutton[disabled="true"],
 toolbarbutton[disabled="true"]:hover,
 toolbarbutton[disabled="true"]:hover:active,
-toolbarbutton[disabled="true"][open="true"] {
-  padding: 1px;
+toolbarbutton[disabled="true"][open="true"],
+toolbarbutton[disabled="true"][checked="true"] {
+  padding: 1px 2px;
   background-color: #000000;
   color: #8050B0;
 }
 
+toolbarbutton:-moz-lwtheme {
+  text-shadow: none;
+}
+
+
 /* ..... checked state ..... */
 
 toolbarbutton[checked="true"] {
@@ -189,21 +195,21 @@ toolbarbutton[type="menu-button"]:hover:active > toolbarbutton.toolbarbutton-men
 toolbarbutton[type="menu-button"][open="true"] > toolbarbutton.toolbarbutton-menubutton-button {
   padding-top: 2px !important;
   padding-bottom: 0px !important;
-  -moz-padding-start: 2px !important;
-  -moz-padding-end: 0px !important;
+  -moz-padding-start: 3px !important;
+  -moz-padding-end: 1px !important;
 }
 
 toolbarbutton[disabled="true"] > toolbarbutton.toolbarbutton-menubutton-button,
 toolbarbutton[disabled="true"]:hover:active > toolbarbutton.toolbarbutton-menubutton-button {
-  padding: 1px !important;
+  padding: 1px 2px !important;
 }
 
 /* .......... dropmarker .......... */
 
 .toolbarbutton-menubutton-dropmarker {
-  -moz-border-radius: 3px;
+  border-radius: 3px;
   -moz-box-align: start;
-  padding: 3px 1px 1px 1px;
+  padding: 3px 1px 1px;
   border: none;
   background-color: transparent;
 }
@@ -219,15 +225,15 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropm
 toolbarbutton[type="menu-button"]:not([disabled="true"]):hover > .toolbarbutton-menubutton-dropmarker,
 toolbarbutton[type="menu-button"]:not([disabled="true"]):hover:active > .toolbarbutton-menubutton-dropmarker,
 toolbarbutton[type="menu-button"][open="true"]:not([disabled="true"]) > .toolbarbutton-menubutton-dropmarker,
-toolbarbutton[type="menu"]:not([disabled="true"]):hover > .toolbarbutton-menu-dropmarker,
-toolbarbutton[type="menu"]:not([disabled="true"]):hover:active > .toolbarbutton-menu-dropmarker,
-toolbarbutton[type="menu"][open="true"]:not([disabled="true"]) > .toolbarbutton-menu-dropmarker {
+toolbarbutton[type="menu"]:not([disabled="true"]):hover .toolbarbutton-menu-dropmarker,
+toolbarbutton[type="menu"]:not([disabled="true"]):hover:active .toolbarbutton-menu-dropmarker,
+toolbarbutton[type="menu"][open="true"]:not([disabled="true"]) .toolbarbutton-menu-dropmarker {
   list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
  -moz-image-region: auto;
 }
 
 
 .toolbarbutton-menubutton-dropmarker[disabled="true"] {
-  padding: 3px 1px 1px 1px !important;
+  padding: 3px 1px 1px !important;
   border: none !important;
 }