Bug 1378075 - Restore Windows Classic Desktop fallbacks removed by bug 1340495 and 1343196. r=frg,IanN
authorBill Gianopoulos <wgianopoulos@gmail.com>
Mon, 31 Jul 2017 07:14:21 -0400
changeset 29535 58eaeea16828c6f4fec2c09f7c24d11332dacba1
parent 29534 152c7d7bbc6ac6e44f70230be9e4b96cd6dc34a5
child 29536 d74685ff0eae9c1aafe77b453fe36d25c75f78e5
push id378
push userclokep@gmail.com
push dateMon, 13 Nov 2017 18:45:35 +0000
reviewersfrg, IanN
bugs1378075, 1340495, 1343196
Bug 1378075 - Restore Windows Classic Desktop fallbacks removed by bug 1340495 and 1343196. r=frg,IanN
suite/themes/classic/communicator/button.css
suite/themes/classic/communicator/toolbar.css
--- a/suite/themes/classic/communicator/button.css
+++ b/suite/themes/classic/communicator/button.css
@@ -3,16 +3,71 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ==== button.css ==========================================================
    == Styles for special buttons in the Communicator suite.
    ========================================================================== */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+/* Restore Windows Classic fallbacks removed by bug 1340495 */
+
+@media (-moz-windows-classic) {
+
+  /* ::::: toolbarbutton ::::: */
+
+  toolbarbutton {
+    border: 1px solid transparent;
+    background-color: transparent;
+  }
+
+  toolbarbutton:hover:not([disabled="true"]) {
+    border-color: ThreeDHighlight ThreeDShadow ThreeDShadow ThreeDHighlight;
+  }
+
+  toolbarbutton:hover:active:not([disabled="true"]),
+  toolbarbutton[open="true"]:hover,
+  toolbarbutton[open="true"] {
+    border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow;
+  }
+
+  toolbarbutton[checked="true"]:not([disabled="true"]) {
+    border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow;
+    background-color: rgba(255,255,255,0.5);
+  }
+
+  /* ::::: toolbarbutton menu ::::: */
+
+  .toolbarbutton-menu-dropmarker {
+    border: none !important;
+    background-color: transparent !important;
+  }
+
+  /* ::::: toolbarbutton menu-button ::::: */
+
+  toolbarbutton[type="menu-button"],
+  toolbarbutton[type="menu-button"]:hover,
+  toolbarbutton[type="menu-button"]:hover:active,
+  toolbarbutton[type="menu-button"][open="true"],
+  toolbarbutton[type="menu-button"][disabled="true"],
+  toolbarbutton[type="menu-button"][disabled="true"]:hover,
+  toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
+    border-style: none;
+  }
+
+  /* .......... dropmarker .......... */
+
+  .toolbarbutton-menubutton-dropmarker {
+    background-color: transparent;
+  }
+
+}
+
+/* End restore Windows Classic fallbacks removed by bug 1340495 */
+
 /* ::::: large toolbar buttons ::::: */
 
 .toolbarbutton-1,
 .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   min-width: 47px;
   -moz-box-orient: vertical;
 }
 
--- a/suite/themes/classic/communicator/toolbar.css
+++ b/suite/themes/classic/communicator/toolbar.css
@@ -3,16 +3,63 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== toolbar.css ====================================================
   == Styles used by XUL grippytoolbar in addition to general toolbar styles.
   ======================================================================= */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+/* Restore Windows Classic fallbacks removed by bug 1343196 */
+
+@media (-moz-windows-classic) {
+
+  /* ::::: toolbox ::::: */
+
+  toolbox {
+    background-color: -moz-Dialog;
+    border-top: 2px solid;
+    -moz-border-top-colors: ThreeDShadow ThreeDHighlight;
+  }
+
+  /* ::::: toolbar & menubar ::::: */
+
+  toolbar {
+    border-top: 1px solid ThreeDHighlight;
+    border-bottom: 1px solid ThreeDShadow;
+  }
+
+  toolbar:first-child, menubar {
+    border-bottom: 1px solid ThreeDShadow;
+    border-top: 0px !important;
+  }
+
+/* ::::: lightweight theme ::::: */
+ 
+  menubar:-moz-lwtheme,
+  toolbox:-moz-lwtheme,
+  toolbar:-moz-lwtheme {
+    background: none;
+    border-color: transparent;
+  }
+
+  /* ::::: toolbar decorations ::::: */
+
+  toolbarseparator {
+    border-top: 2px solid transparent;
+    border-bottom: 2px solid transparent;
+    border-left: 3px solid transparent;
+    border-right: 3px solid transparent;
+    -moz-border-left-colors  : transparent transparent ThreeDShadow;
+    -moz-border-right-colors : transparent transparent ThreeDHighlight;
+  }
+}
+
+/* End restore Windows Classic fallbacks removed by bug 1343196 */
+
 toolbar[type="menubar"]:not([autohide="true"]):not([xpfe="false"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag) {
   -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-drag");
 }
 
 /* ::::: toolbar & menubar ::::: */
 
 .toolbar-holder {
   border-left: 1px solid ThreeDHighlight;