Bug 1263442 - Fix the toolbarbutton-1 on dark Linux themes. r=mkmelin a=rkent
authorRichard Marti <richard.marti@gmail.com>
Sun, 10 Apr 2016 12:08:37 +0200
changeset 26923 2b0e37b3a6cf649490501027e7f96df3ecffd1f5
parent 26922 7d769f5efe96410f5a5e6a8f807a782f1f8c2672
child 26924 640bd220edb2ff51ea97c1a48c765240c07b9b4f
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin, rkent
bugs1263442
Bug 1263442 - Fix the toolbarbutton-1 on dark Linux themes. r=mkmelin a=rkent
mail/themes/linux/mail/messageHeader.css
mail/themes/linux/mail/messenger.css
--- a/mail/themes/linux/mail/messageHeader.css
+++ b/mail/themes/linux/mail/messageHeader.css
@@ -129,38 +129,26 @@
   margin: 0 0.1em;
   vertical-align: middle;
   min-width: 28px;
   padding-top: 0;
   padding-bottom: 0;
   list-style-image: none; /* overrides the rule from primaryToolbar.css */
 }
 
-.toolbarbutton-1.msgHeaderView-button,
-.toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-button,
-.toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-dropmarker {
+.toolbarbutton-1.msgHeaderView-button {
   background: var(--toolbarbutton-hover-background);
   border-color: var(--toolbarbutton-hover-bordercolor);
 }
 
-.toolbarbutton-1.msgHeaderView-button:not([disabled=true]):-moz-any(:hover,[open]) >
-.toolbarbutton-menubutton-button,
-.toolbarbutton-1.msgHeaderView-button:not([disabled=true]):-moz-any(:hover,[open]) >
-.toolbarbutton-menubutton-dropmarker,
-.toolbarbutton-1.msgHeaderView-button:not([disabled=true]):not([checked=true]):not([open]):not(:active):hover,
-.toolbarbutton-1.msgHeaderView-button:not([buttonover]):not([open]):not(:active):hover >
-.toolbarbutton-menubutton-dropmarker:not([disabled]) {
+.toolbarbutton-1.msgHeaderView-button:not([disabled=true]):not([checked=true]):not([open]):not(:active):hover {
   background: var(--toolbarbutton-active-background);
   border-color: var(--toolbarbutton-active-bordercolor);
 }
 
-.toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-dropmarker::before {
-  display: none !important;
-}
-
 /* toolbar[mode="text"] is necessary so that we end up with more specificity
  * than the !important rule in toolkit's toolbar.css.
  */
 toolbar[mode="text"] .msgHeaderView-button .toolbarbutton-text,
 toolbar[mode="text"] toolbarpaletteitem .msgHeaderView-button .toolbarbutton-text {
   margin: 0 !important;
   padding-top: 1px !important;
   padding-bottom: 2px !important;
--- a/mail/themes/linux/mail/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -143,42 +143,62 @@ toolbox[labelalign="end"] .toolbarbutton
   min-height: 0;
   margin: 0;
   border-top-style: none;
   border-inline-start-style: none;
   border-bottom-style: none;
 }
 
 .findbar-button:not(:-moz-any([checked="true"],[disabled="true"])):hover,
+.toolbarbutton-1:not([disabled=true]):hover {
+  background: var(--toolbarbutton-hover-background);
+  background-clip: padding-box;
+  box-shadow: var(--toolbarbutton-hover-boxshadow);
+}
+
+.findbar-button:not(:-moz-any([checked="true"],[disabled="true"])):hover,
 .toolbarbutton-1:not([disabled=true]):hover,
 .toolbarbutton-1[open]:not([disabled=true]) > .toolbarbutton-menubutton-button,
 .toolbarbutton-1:not([disabled=true]):not(:-moz-any(:active, [open])):hover > .toolbarbutton-menubutton-button,
 .toolbarbutton-1:not([disabled=true]):not([open]):hover > .toolbarbutton-menubutton-dropmarker {
-  background: var(--toolbarbutton-hover-background);
-  background-clip: padding-box;
   border-color: var(--toolbarbutton-hover-bordercolor);
-  box-shadow: var(--toolbarbutton-hover-boxshadow);
+}
+
+.toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked="true"],:hover:active) {
+  border-color: var(--toolbarbutton-active-bordercolor);
 }
 
 .findbar-button:not([disabled=true]):-moz-any([checked="true"],:hover:active),
-.toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked="true"],:hover:active),
+.toolbarbutton-1:not([type="menu-button"]):not([disabled=true]):-moz-any([open],[checked="true"],:hover:active),
 .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active, [open="true"]),
 .toolbarbutton-1[open="true"] > .toolbarbutton-menubutton-dropmarker:not([disabled="true"]) {
   background: var(--toolbarbutton-active-background);
   background-clip: padding-box;
   box-shadow: var(--toolbarbutton-active-boxshadow);
   border-color: var(--toolbarbutton-active-bordercolor);
   transition-duration: 10ms;
 }
 
 .toolbarbutton-1[checked="true"]:not(:active):hover {
   background-color: var(--toolbarbutton-checkedhover-backgroundcolor);
   transition: background-color 150ms;
 }
 
+.toolbarbutton-1 > .toolbarbutton-menubutton-button:-moz-locale-dir(ltr),
+.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-locale-dir(rtl) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.toolbarbutton-1 > .toolbarbutton-menubutton-button:-moz-locale-dir(rtl),
+.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-locale-dir(ltr) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
 .toolbarbutton-1 .toolbarbutton-menu-dropmarker,
 .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   -moz-appearance: none !important;
   margin-left: 0;
   margin-right: 0;
 }
 
 .toolbarbutton-1 .toolbarbutton-menu-dropmarker > .dropmarker-icon,