Bug 521659 - Main menu doesn't have hover/pressed state when using lightweight theme. r=rflint

--HG--
extra : rebase_source : 977345fdc59197573586aa197ead87c3ff0d2171

browser/themes/winstripe/browser/browser.css

@@ -103,7 +103,7 @@ toolbarbutton.bookmark-item-microsummarized {
   max-width: 20em;
 }
 
-toolbarbutton.bookmark-item:hover:active,
+toolbarbutton.bookmark-item:hover:active:not([disabled="true"]),
 toolbarbutton.bookmark-item[open="true"] {
   padding-top: 3px;
   padding-bottom: 1px;

toolkit/themes/winstripe/global/jar.mn

@@ -186,7 +186,7 @@ toolkit.jar:
         skin/classic/aero/global/groupbox.css
         skin/classic/aero/global/linkTree.css
         skin/classic/aero/global/listbox.css
-        skin/classic/aero/global/menu.css
+*       skin/classic/aero/global/menu.css                                (menu-aero.css)
 *       skin/classic/aero/global/menulist.css                            (menulist-aero.css)
         skin/classic/aero/global/netError.css
         skin/classic/aero/global/numberbox.css
@@ -208,7 +208,7 @@ toolkit.jar:
         skin/classic/aero/global/tabbox.css
 *       skin/classic/aero/global/textbox.css                             (textbox-aero.css)
 *       skin/classic/aero/global/toolbar.css
-        skin/classic/aero/global/toolbarbutton.css
+*       skin/classic/aero/global/toolbarbutton.css                       (toolbarbutton-aero.css)
 *       skin/classic/aero/global/tree.css                                (tree-aero.css)
         skin/classic/aero/global/wizard.css
         skin/classic/aero/global/alerts/alert.css                        (alerts/alert.css)

toolkit/themes/winstripe/global/menu-aero.css

@@ -0,0 +1,12 @@
+%include menu.css
+
+@media all and (-moz-windows-default-theme) {
+  menubar > menu:-moz-lwtheme {
+    -moz-appearance: menuitem;
+  }
+
+  menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) {
+    color: inherit !important;
+    text-shadow: inherit;
+  }
+}

toolkit/themes/winstripe/global/menu.css

@@ -58,20 +58,25 @@ menuitem[default="true"] {
   font-weight: bold;
 }
 
-menu[disabled="true"], menuitem[disabled="true"],
+menu[disabled="true"],
+menuitem[disabled="true"],
 menu[_moz-menuactive="true"][disabled="true"],
 menuitem[_moz-menuactive="true"][disabled="true"] {
   color: GrayText;
+  text-shadow: none;
 }
 
-menu[disabled="true"]:not([_moz-menuactive="true"]):-moz-system-metric(windows-classic),
-menuitem[disabled="true"]:not([_moz-menuactive="true"]):-moz-system-metric(windows-classic) {
-  color: ThreeDShadow;
-  text-shadow: 1px 1px ThreeDHighlight;
+@media all and (-moz-windows-classic) {
+  menu[disabled="true"],
+  menubar > menu[disabled="true"][_moz-menuactive="true"],
+  menuitem[disabled="true"] {
+    color: ThreeDShadow;
+    text-shadow: 1px 1px ThreeDHighlight;
+  }
 }
 
 menuitem.spell-suggestion {
-  font-weight:bold;
+  font-weight: bold;
 }
 
 /* ..... internal content .... */
@@ -140,18 +145,30 @@ menuitem.menuitem-iconic > .menu-iconic-left {
 menubar > menu {
   border: 2px solid transparent;
 }
+
+menubar > menu[_moz-menuactive="true"]:not([disabled="true"]) {
+  color: -moz-menubarhovertext;
+}
+
 menubar > menu[_moz-menuactive="true"][open="true"] {
   border-width: 3px 1px 1px 3px;
 }
-menubar > menu[_moz-menuactive="true"],
-menubar > menu[_moz-menuactive="true"][open="true"] {
-  color: -moz-menubarhovertext;
-}
+
 menubar > menu:-moz-lwtheme {
   -moz-appearance: none;
+  border-style: none;
+}
+
+menubar > menu:-moz-lwtheme:not([disabled="true"]) {
   color: inherit !important;
 }
 
+menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) {
+  background-color: Highlight;
+  color: HighlightText !important;
+  text-shadow: none;
+}
+
 /* ..... internal content .... */
 
 .menubar-left {

toolkit/themes/winstripe/global/toolbarbutton-aero.css

@@ -0,0 +1,8 @@
+%include toolbarbutton.css
+
+@media all and (-moz-windows-default-theme) {
+  toolbarbutton:-moz-lwtheme:not([disabled="true"]) {
+    color: inherit;
+    text-shadow: inherit;
+  }
+}

toolkit/themes/winstripe/global/toolbarbutton.css

@@ -78,12 +78,13 @@ toolbarbutton:focus
   outline-offset: -2px;
 }
 
-toolbarbutton:hover,
+toolbarbutton:hover:not([disabled="true"]),
 toolbarbutton[buttonover="true"] {
   border-color: ThreeDHighlight ThreeDShadow ThreeDShadow ThreeDHighlight;
 }
 
-toolbarbutton:hover:active,
+toolbarbutton:hover:active:not([disabled="true"]),
+toolbarbutton[open="true"]:hover,
 toolbarbutton[open="true"] {
   border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow;
   padding-top: 4px;
@@ -92,37 +93,19 @@ toolbarbutton[open="true"] {
   -moz-padding-end: 2px;
 }
 
-toolbarbutton[disabled="true"],
-toolbarbutton[disabled="true"]:hover,
-toolbarbutton[disabled="true"]:hover:active,
-toolbarbutton[disabled="true"][open="true"],
-toolbarbutton[disabled="true"][checked="true"] {
-  border-color: transparent;
-  padding: 3px;
+toolbarbutton[disabled="true"] {
   color: GrayText;
-}
-
-toolbarbutton[disabled="true"]:-moz-system-metric(windows-classic),
-toolbarbutton[disabled="true"]:-moz-system-metric(windows-classic):hover,
-toolbarbutton[disabled="true"]:-moz-system-metric(windows-classic):hover:active,
-toolbarbutton[disabled="true"][open="true"]:-moz-system-metric(windows-classic),
-toolbarbutton[disabled="true"][checked="true"]:-moz-system-metric(windows-classic) {
-  color: ThreeDShadow;
-  text-shadow: 1px 1px ThreeDHighlight;
-}
-
-toolbarbutton:-moz-lwtheme {
   text-shadow: none;
 }
 
-toolbarbutton:-moz-lwtheme:not(:hover):not([checked="true"]):not([open="true"]):not([disabled="true"]) {
-  color: inherit;
-  text-shadow: inherit;
+@media all and (-moz-windows-classic) {
+  toolbarbutton[disabled="true"] {
+    color: ThreeDShadow;
+    text-shadow: 1px 1px ThreeDHighlight;
+  }
 }
 
-/* ..... checked state ..... */
-
-toolbarbutton[checked="true"] {
+toolbarbutton[checked="true"]:not([disabled="true"]) {
   border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow !important;
   padding-top: 4px !important;
   padding-bottom: 2px !important;
@@ -132,6 +115,28 @@ toolbarbutton[checked="true"] {
   color: ButtonText;
 }
 
+@media all and (-moz-windows-default-theme) {
+  toolbarbutton:-moz-lwtheme {
+    text-shadow: none;
+  }
+
+  toolbarbutton:-moz-lwtheme:not(:hover):not([checked="true"]):not([open="true"]):not([disabled="true"]) {
+    color: inherit;
+    text-shadow: inherit;
+  }
+}
+
+@media not all and (-moz-windows-default-theme) {
+  toolbarbutton:-moz-lwtheme {
+    -moz-appearance: none;
+  }
+
+  toolbarbutton:-moz-lwtheme:not([disabled="true"]) {
+    color: inherit;
+    text-shadow: inherit;
+  }
+}
+
 /* ::::: toolbarbutton menu ::::: */
 
 .toolbarbutton-menu-dropmarker {