Bug 1439134 - Port bug 1404688 to TB: Theming API - Remove text-shadow from text when there is no background-image. r=jorgk

mail/base/content/messenger.css

@@ -268,11 +268,15 @@ menupopup[type="folder"] {
 :root:-moz-lwtheme {
   color: var(--lwt-text-color) !important;
   background-color: var(--lwt-accent-color) !important;
-  background-image: var(--lwt-header-image), var(--lwt-additional-images) !important;
+  background-image: var(--lwt-additional-images) !important;
   background-position: var(--lwt-background-alignment) !important;
   background-repeat: var(--lwt-background-tiling) !important;
 }
 
+:root:-moz-lwtheme[lwtheme-image] {
+  background-image: var(--lwt-header-image), var(--lwt-additional-images) !important;
+}
+
 :root:-moz-lwtheme:-moz-window-inactive {
   background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color)) !important;
 }

mail/themes/shared/mail/tabmail.css

@@ -142,7 +142,7 @@
  */
 
 /* Lightweight theme on tabs */
-.tabmail-tab > .tab-stack > .tab-background[selected=true]:-moz-lwtheme {
+:root[lwtheme-image] .tabmail-tab > .tab-stack > .tab-background[selected=true] {
   background-attachment: scroll, fixed;
   background-color: transparent;
   background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)),

mail/themes/windows/mail/mailWindow1.css

@@ -258,7 +258,7 @@ treechildren::-moz-tree-cell-text(imapdeleted) {
       margin: 0 !important;
       padding: 9px 17px;
       -moz-context-properties: stroke;
-      stroke: black;
+      stroke: currentColor;
     }
 
     @media (-moz-windows-default-theme) {
@@ -290,19 +290,19 @@ treechildren::-moz-tree-cell-text(imapdeleted) {
       list-style-image: url(chrome://messenger/skin/window-controls/close.svg);
     }
 
-    .titlebar-button:-moz-lwtheme {
+    :root[lwtheme-image] .titlebar-button {
       -moz-context-properties: unset;
     }
-    #titlebar-min:-moz-lwtheme {
+    :root[lwtheme-image] #titlebar-min {
       list-style-image: url(chrome://messenger/skin/window-controls/minimize-themes.svg);
     }
-    #titlebar-max:-moz-lwtheme {
+    :root[lwtheme-image] #titlebar-max {
       list-style-image: url(chrome://messenger/skin/window-controls/maximize-themes.svg);
     }
-    :root[sizemode="maximized"] #titlebar-max:-moz-lwtheme {
+    :root[lwtheme-image][sizemode="maximized"] #titlebar-max {
       list-style-image: url(chrome://messenger/skin/window-controls/restore-themes.svg);
     }
-    #titlebar-close:-moz-lwtheme {
+    :root[lwtheme-image] #titlebar-close {
       list-style-image: url(chrome://messenger/skin/window-controls/close-themes.svg);
     }