Bug 1543820 - Port bug 1506913: Don't apply theme colors on findbar when theme has a header image. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Thu, 11 Apr 2019 22:39:41 +0200
changeset 26330 e614af52388152d486513d7ff5b511c2a69fcb2e
parent 26329 e1c03b7fdd86d87f5396bd0cf3cba39bc22b9690
child 26331 1aad2ba888ec2d7ba3e16259b7967da1e356aad3
push id15788
push usermozilla@jorgk.com
push dateFri, 12 Apr 2019 22:02:02 +0000
treeherdercomm-central@826410daf770 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk
bugs1543820, 1506913
Bug 1543820 - Port bug 1506913: Don't apply theme colors on findbar when theme has a header image. r=jorgk
mail/themes/linux/mail/messenger.css
mail/themes/osx/mail/messenger.css
mail/themes/windows/mail/messenger.css
--- a/mail/themes/linux/mail/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -851,25 +851,26 @@ button[type="menu-button"] {
 }
 
 .contentTabInstance:-moz-lwtheme {
   background-color: transparent;
   background-image: linear-gradient(transparent 40px, -moz-dialog 40px);
 }
 
 findbar {
-  background-color: var(--toolbar-bgcolor);
-  color: var(--toolbar-color);
+  background-color: var(--toolbar-non-lwt-bgcolor);
+  color: var(--toolbar-non-lwt-textcolor);
   text-shadow: none;
 }
 
-findbar:-moz-lwtheme {
+:root:not([lwtheme-image]) findbar:-moz-lwtheme {
   background-color: var(--lwt-accent-color);
   background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor));
   border-top-color: var(--chrome-content-separator-color);
+  color: var(--toolbar-color);
 }
 
 /* ::::: groupbox ::::: */
 
 groupbox {
   -moz-appearance: groupbox;
   margin: 5px;
   padding: 5px;
--- a/mail/themes/osx/mail/messenger.css
+++ b/mail/themes/osx/mail/messenger.css
@@ -728,17 +728,17 @@ button[type="menu-button"] > dropmarker 
 
 findbar {
   background: linear-gradient(#e8e8e8, #d0d0d0) repeat-x;
   border-top: 1px solid #888;
   color: -moz-DialogText;
   text-shadow: none;
 }
 
-findbar:-moz-lwtheme {
+:root:not([lwtheme-image]) findbar:-moz-lwtheme {
   background-color: var(--lwt-accent-color);
   background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor));
   border-top-color: var(--chrome-content-separator-color);
   color: var(--toolbar-color);
 }
 
 .contentTabAddress * {
   text-shadow: none;
--- a/mail/themes/windows/mail/messenger.css
+++ b/mail/themes/windows/mail/messenger.css
@@ -894,25 +894,26 @@ statusbarpanel:-moz-lwtheme,
 }
 
 .contentTabInstance:-moz-lwtheme {
   background-color: transparent;
   background-image: linear-gradient(transparent 40px, -moz-dialog 40px);
 }
 
 findbar {
-  background-color: var(--toolbar-bgcolor);
-  color: var(--toolbar-color);
+  background-color: var(--toolbar-non-lwt-bgcolor);
+  color: var(--toolbar-non-lwt-textcolor);
   text-shadow: none;
 }
 
-findbar:-moz-lwtheme {
+:root:not([lwtheme-image]) findbar:-moz-lwtheme {
   background-color: var(--lwt-accent-color);
   background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor));
   border-top-color: var(--chrome-content-separator-color);
+  color: var(--toolbar-color);
 }
 
 /* ::::: groupbox ::::: */
 
 groupbox {
   -moz-appearance: groupbox;
   border: 2px groove ThreeDFace;
   border-radius: 3px;