Bug 1557972 - Theme the "Grouped by Sort" header with the Dark theme too. r=aleca
authorRichard Marti <richard.marti@gmail.com>
Sun, 09 Jun 2019 16:19:46 +0200
changeset 35820 fe5ced6a8398bb4438540773bcd19ecea67270d7
parent 35819 222be3dc3eb1bd86a666ac6b0b0cff78cb078c82
child 35821 c3a368a1bca2bcb20c7f92cfe5c82ea1d159bc96
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersaleca
bugs1557972
Bug 1557972 - Theme the "Grouped by Sort" header with the Dark theme too. r=aleca
mail/themes/linux/mail/mailWindow1.css
mail/themes/linux/mail/messenger.css
mail/themes/osx/jar.mn
mail/themes/osx/mail/icons/group-background.gif
mail/themes/osx/mail/mailWindow1.css
mail/themes/osx/mail/messenger.css
mail/themes/shared/mail/mailWindow1.css
mail/themes/windows/mail/mailWindow1.css
mail/themes/windows/mail/messenger.css
--- a/mail/themes/linux/mail/mailWindow1.css
+++ b/mail/themes/linux/mail/mailWindow1.css
@@ -38,30 +38,35 @@ menu > #folderLocationPopup > menuitem >
 }
 
 #folderPaneHeader {
   border-bottom: 1px solid ThreeDShadow;
 }
 
 /* ::::: thread decoration ::::: */
 
-treechildren::-moz-tree-row(dummy)  {
-  background-color: var(--row-grouped-header-bg-color);
+treechildren::-moz-tree-row(dummy) {
+  background-color: var(--row-grouped-header-bg-color) !important;
+  border-color: transparent !important;
   padding-inline-start: 2px;
-  margin-bottom: 1px;
+  margin: 1px;
 }
 
-treechildren::-moz-tree-row(dummy, selected, focus)  {
-  background-color: Highlight;
+treechildren::-moz-tree-row(dummy, selected, focus) {
+  background-color: var(--row-grouped-header-bg-color-selected) !important;
 }
 
 treechildren::-moz-tree-cell-text(dummy) {
   font-weight: bold;
 }
 
+:root[lwt-tree] treechildren::-moz-tree-cell-text(dummy, selected) {
+  color: var(--sidebar-highlight-text-color);
+}
+
 #correspondentCol {
   padding-inline-start: 17px;
 }
 
 /* ..... folder pane adjustments ..... */
 
 #folderPane-toolbar {
   min-height: 24px;
--- a/mail/themes/linux/mail/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -32,16 +32,18 @@
   --toolbarbutton-active-background: rgba(154, 154, 154, .5) linear-gradient(rgba(255, 255, 255, .7), rgba(255, 255, 255, .4));
   --toolbarbutton-active-bordercolor: rgba(0, 0, 0, .3);
   --toolbarbutton-active-boxshadow: 0 1px 1px rgba(0, 0, 0, .1) inset, 0 0 1px rgba(0, 0, 0, .3) inset;
 
   --toolbarbutton-checkedhover-backgroundcolor: rgba(200, 200, 200, .5);
   --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #0a84ff);
 
   --lwt-header-image: none;
+  --row-grouped-header-bg-color: -moz-dialog;
+  --row-grouped-header-bg-color-selected: Highlight;
   --panel-separator-color: ThreeDShadow;
   --arrowpanel-dimmed: hsla(0, 0%, 80%, .3);
   --arrowpanel-dimmed-further: hsla(0, 0%, 80%, .45);
   --splitter-color: ThreeDShadow;
   --urlbar-popup-url-color: -moz-nativehyperlinktext;
   --urlbar-popup-action-color: -moz-nativehyperlinktext;
 }
 
@@ -57,16 +59,22 @@
 :root[lwt-popup-brighttext] {
   --panel-separator-color: rgba(249, 249, 250, .1);
   --arrowpanel-dimmed: rgba(249, 249, 250, .1);
   --arrowpanel-dimmed-further: rgba(249, 249, 250, .15);
 }
 
 :root[lwt-tree] {
   --splitter-color: var(--sidebar-border-color);
+  --row-grouped-header-bg-color: hsla(0,0%,50%,.15);
+  --row-grouped-header-bg-color-selected: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.6));
+}
+
+:root[lwt-tree-brighttext] {
+  --row-grouped-header-bg-color-selected: var(--sidebar-highlight-background-color, rgba(249,249,250,.3));
 }
 
 toolbar[brighttext] {
   --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #45a1ff);
 }
 
 #FindToolbar:-moz-lwtheme,
 .contentTabToolbox:-moz-lwtheme,
--- a/mail/themes/osx/jar.mn
+++ b/mail/themes/osx/jar.mn
@@ -140,17 +140,16 @@ classic.jar:
   skin/classic/messenger/icons/dot.png                           (mail/icons/dot.png)
   skin/classic/messenger/icons/dot.svg                           (mail/icons/dot.svg)
   skin/classic/messenger/icons/flag-col.png                      (mail/icons/flag-col.png)
   skin/classic/messenger/icons/flaggedmail.png                   (mail/icons/flaggedmail.png)
   skin/classic/messenger/icons/folder-pane.png                   (mail/icons/folder-pane.png)
   skin/classic/messenger/icons/folder-pane@2x.png                (mail/icons/folder-pane@2x.png)
   skin/classic/messenger/icons/exclude.png                       (mail/icons/exclude.png)
   skin/classic/messenger/icons/exclude-selected.png              (mail/icons/exclude-selected.png)
-  skin/classic/messenger/icons/group-background.gif              (mail/icons/group-background.gif)
   skin/classic/messenger/icons/multicolor.png                    (mail/icons/multicolor.png)
   skin/classic/messenger/icons/secure.png                        (mail/icons/secure.png)
   skin/classic/messenger/icons/server.png                        (mail/icons/server.png)
   skin/classic/messenger/icons/server@2x.png                     (mail/icons/server@2x.png)
   skin/classic/messenger/icons/spring.png                        (mail/icons/spring.png)
   skin/classic/messenger/icons/chat-16@2x.png                    (mail/icons/chat-16@2x.png)
   skin/classic/messenger/icons/insecure.png                      (mail/icons/insecure.png)
   skin/classic/messenger/icons/identity.png                      (mail/icons/identity.png)
deleted file mode 100644
index a3c06992986baffb83ac33d0189d5d249066063e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/osx/mail/mailWindow1.css
+++ b/mail/themes/osx/mail/mailWindow1.css
@@ -79,30 +79,32 @@
   #folderTree treechildren::-moz-tree-twisty(selected, focus),
   #folderTree treechildren::-moz-tree-cell-text(selected, focus) {
     color: #282828;
   }
 }
 
 /* ::::: group rows ::::: */
 
-treechildren::-moz-tree-row(dummy)  {
-  background-image: url("chrome://messenger/skin/icons/group-background.gif");
-  background-repeat: repeat-x;
-  background-color: rgb(246, 246, 246);
-  border: 1px solid rgb(197, 199, 202);
-  margin: 0 1px;
+treechildren::-moz-tree-row(dummy) {
+  background-color: var(--row-grouped-header-bg-color) !important;
+  border-color: transparent !important;
+  margin: 1px;
 }
 
-treechildren::-moz-tree-row(dummy, focus, selected)  {
-  background-color: #3874d1;
-  border-color: #3874d1;
-  background-image: none !important;
-  margin: 0px;
-  padding: 0 1px;
+treechildren::-moz-tree-row(dummy, selected, focus) {
+  background-color: var(--row-grouped-header-bg-color-selected) !important;
+}
+
+treechildren::-moz-tree-cell-text(dummy) {
+  font-weight: bold;
+}
+
+:root[lwt-tree] treechildren::-moz-tree-cell-text(dummy, selected) {
+  color: var(--sidebar-highlight-text-color);
 }
 
 /* ..... message pane adjustments ..... */
 
 /* We need to hide overflow in messagepanebox, so that resizing doesn't spill
    header content over the statusbar.
    */
 
--- a/mail/themes/osx/mail/messenger.css
+++ b/mail/themes/osx/mail/messenger.css
@@ -40,16 +40,18 @@
                                     0 1px 0 hsla(0, 0%, 0%, .05) inset,
                                     0 1px 1px hsla(0, 0%, 0%, .2) inset;
   --toolbarbutton-inactive-bordercolor: rgba(0, 0, 0, 0.1);
   --toolbarbutton-inactive-boxshadow: 0 1px 0 hsla(0, 0%, 0%, .05) inset;
   --toolbarbutton-checkedhover-backgroundcolor: hsla(0, 0%, 0%, .09);
   --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #0a84ff);
 
   --lwt-header-image: none;
+  --row-grouped-header-bg-color: #d5d5d5;
+  --row-grouped-header-bg-color-selected: #3874d1;
   --panel-separator-color: hsla(210, 4%, 10%, .14);
   --arrowpanel-dimmed: hsla(0, 0%, 80%, .3);
   --arrowpanel-dimmed-further: hsla(0, 0%, 80%, .45);
   --splitter-color: #bdbdbd;
   --urlbar-popup-url-color: hsl(210, 77%, 47%);
   --urlbar-popup-action-color: hsl(178, 100%, 28%);
 }
 
@@ -67,16 +69,22 @@
 :root[lwt-popup-brighttext] {
   --panel-separator-color: rgba(249, 249, 250, .1);
   --arrowpanel-dimmed: rgba(249, 249, 250, .1);
   --arrowpanel-dimmed-further: rgba(249, 249, 250, .15);
 }
 
 :root[lwt-tree] {
   --splitter-color: var(--sidebar-border-color);
+  --row-grouped-header-bg-color: hsla(0,0%,50%,.15);
+  --row-grouped-header-bg-color-selected: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.6));
+}
+
+:root[lwt-tree-brighttext] {
+  --row-grouped-header-bg-color-selected: var(--sidebar-highlight-background-color, rgba(249,249,250,.3));
 }
 
 toolbar[brighttext] {
   --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #45a1ff);
 }
 
 #FindToolbar:-moz-lwtheme,
 .contentTabToolbox:-moz-lwtheme,
--- a/mail/themes/shared/mail/mailWindow1.css
+++ b/mail/themes/shared/mail/mailWindow1.css
@@ -1,18 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-:root {
-  --row-grouped-header-bg-color: -moz-dialog;
-}
-
 #tabmail:-moz-lwtheme {
   text-shadow: none;
 }
 
 #messengerBox {
   color: -moz-DialogText;
   background-color: -moz-Dialog;
 }
--- a/mail/themes/windows/mail/mailWindow1.css
+++ b/mail/themes/windows/mail/mailWindow1.css
@@ -31,30 +31,37 @@
 #viewPickerPopup menu[_moz-menuactive="true"],
 #viewPickerPopup menuitem[_moz-menuactive="true"] {
   color: -moz-MenuHoverText;
   background-color: -moz-MenuHover;
 }
 
 /* ::::: thread decoration ::::: */
 
-treechildren::-moz-tree-row(dummy)  {
-  background-color: var(--row-grouped-header-bg-color);
+treechildren::-moz-tree-row(dummy) {
+  background-color: var(--row-grouped-header-bg-color) !important;
+  border-color: transparent !important;
   padding-inline-start: 2px;
-  margin-bottom: 1px;
+  margin: 1px;
 }
 
-treechildren::-moz-tree-row(dummy, selected, focus)  {
-  background-color: Highlight;
+treechildren::-moz-tree-row(dummy, hover),
+treechildren::-moz-tree-row(dummy, selected, focus) {
+  background-color: var(--row-grouped-header-bg-color-selected) !important;
+  color: inherit;
 }
 
 treechildren::-moz-tree-cell-text(dummy) {
   font-weight: bold;
 }
 
+:root[lwt-tree] treechildren::-moz-tree-cell-text(dummy, selected) {
+  color: var(--sidebar-highlight-text-color);
+}
+
 #correspondentCol {
   padding-inline-start: 20px;
 }
 
 /* ..... tabs ..... */
 
 .tabmail-tab[type="message"][IsFeedMessage] {
   list-style-image: url("chrome://messenger-newsblog/skin/rss-feed.png");
--- a/mail/themes/windows/mail/messenger.css
+++ b/mail/themes/windows/mail/messenger.css
@@ -33,16 +33,18 @@
   --toolbarbutton-active-background: rgba(0, 0, 0, .15);
   --toolbarbutton-active-bordercolor: rgba(0, 0, 0, .15);
   --toolbarbutton-active-boxshadow: 0 0 0 1px rgba(0, 0, 0, .15) inset;
 
   --toolbarbutton-checkedhover-backgroundcolor: rgba(0, 0, 0, .2);
   --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #0a84ff);
 
   --lwt-header-image: none;
+  --row-grouped-header-bg-color: -moz-dialog;
+  --row-grouped-header-bg-color-selected: Highlight;
   --panel-separator-color: ThreeDLightShadow;
   --arrowpanel-dimmed: hsla(0, 0%, 80%, .3);
   --arrowpanel-dimmed-further: hsla(0, 0%, 80%, .45);
   --splitter-color: ThreeDShadow;
 }
 
 @media (-moz-windows-default-theme) {
   :root {
@@ -82,16 +84,22 @@
 :root[lwt-popup-brighttext] {
   --panel-separator-color: rgba(249, 249, 250, .1);
   --arrowpanel-dimmed: rgba(249, 249, 250, .1);
   --arrowpanel-dimmed-further: rgba(249, 249, 250, .15);
 }
 
 :root[lwt-tree] {
   --splitter-color: var(--sidebar-border-color);
+  --row-grouped-header-bg-color: hsla(0,0%,50%,.15);
+  --row-grouped-header-bg-color-selected: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.6));
+}
+
+:root[lwt-tree-brighttext] {
+  --row-grouped-header-bg-color-selected: var(--sidebar-highlight-background-color, rgba(249,249,250,.3));
 }
 
 toolbar[brighttext] {
   --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #45a1ff);
 }
 
 #FindToolbar:-moz-lwtheme,
 .contentTabToolbox:-moz-lwtheme,