Bug 1435549 - Port bug 1347184, bug 1412591 and bug 1423762 to TB. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Sat, 03 Feb 2018 13:53:45 +0100
changeset 31036 b5e155228d89c235f2bfb013b32672ab35b0d519
parent 31035 35eeda15d791f4e96b4558faa3a399e18ed95003
child 31037 eecb7a8b461827c2c49116af2492a6baec1828e7
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersjorgk
bugs1435549, 1347184, 1412591, 1423762
Bug 1435549 - Port bug 1347184, bug 1412591 and bug 1423762 to TB. r=jorgk Referenced bugs: Bug 1347184 - Add support for colors.icons and colors.icons_attention propertie Bug 1412591 - Implement Google Chrome frame_inactive property Bug 1423762 - Add support for toolbar_field_separator and proper support for toolbar_vertical_separator
mail/base/content/messenger.css
mail/themes/linux/mail/mailWindow1.css
mail/themes/linux/mail/messenger.css
mail/themes/osx/mail/mailWindow1.css
mail/themes/osx/mail/messenger.css
mail/themes/shared/mail/messageHeader.css
mail/themes/shared/mail/messenger.css
mail/themes/windows/mail/messageHeader.css
mail/themes/windows/mail/messenger.css
--- a/mail/base/content/messenger.css
+++ b/mail/base/content/messenger.css
@@ -262,29 +262,26 @@ menupopup[type="folder"] {
 .map-list {
   -moz-binding: url("chrome://messenger/content/addressbook/addrbookWidgets.xml#map-list");
 }
 
 /* Lightweight themes support */
 
 :root:-moz-lwtheme {
   color: var(--lwt-text-color) !important;
-}
-
-/**
- * [customization-lwtheme] is actually not used in TB but we leave it in case
- * it will be moved from browser to toolkit. The expression is always :not().
- */
-:root:-moz-lwtheme:not([customization-lwtheme]) {
   background-color: var(--lwt-accent-color) !important;
   background-image: var(--lwt-header-image), var(--lwt-additional-images) !important;
   background-position: var(--lwt-background-alignment) !important;
   background-repeat: var(--lwt-background-tiling) !important;
 }
 
+:root:-moz-lwtheme:-moz-window-inactive {
+  background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color)) !important;
+}
+
 :root[lwthemefooter="true"] #status-bar:-moz-lwtheme {
   background-repeat: no-repeat;
   background-position: bottom left;
   background-color: var(--lwt-accent-color);
   background-image: var(--lwt-footer-image);
 }
 
 /* AppButton support */
--- a/mail/themes/linux/mail/mailWindow1.css
+++ b/mail/themes/linux/mail/mailWindow1.css
@@ -17,18 +17,21 @@
 @import url("chrome://messenger/skin/shared/mailWindow1.css");
 
 menu > #folderLocationPopup > menu > .menu-iconic-left,
 menu > #folderLocationPopup > menuitem > .menu-iconic-left {
   padding-inline-start: 2px;
 }
 
 #folderTree {
+  background-color: -moz-OddTreeRow;
+}
+
+#folderTree:not(:-moz-lwtheme) {
   border-bottom: 1px solid ThreeDShadow;
-  background-color: -moz-OddTreeRow;
 }
 
 #threadTree {
   border-bottom: 1px solid ThreeDShadow;
 }
 
 #mailContent {
   -moz-appearance: toolbox;
@@ -148,17 +151,17 @@ treechildren::-moz-tree-cell-text(imapde
 /* ..... tree adjustments ..... */
 
 #accountCentralBox {
   border-bottom: 1px solid ThreeDShadow;
 }
 
 /* ..... message pane adjustments ..... */
 
-#messagepanebox {
+#messagepanebox:not(:-moz-lwtheme) {
   border-bottom: 1px solid ThreeDShadow;
 }
 
 /* ..... status bar adjustments ..... */
 
 #quotaMeter {
   -moz-appearance: none;
 }
--- a/mail/themes/linux/mail/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -32,32 +32,32 @@
   --toolbarbutton-header-bordercolor: rgba(0, 0, 0, .25);
   --toolbarbutton-hover-boxshadow: none;
 
   --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: #0a84ff;
+  --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #0a84ff);
 
   --lwt-header-image: none;
   --arrowpanel-dimmed: hsla(0, 0%, 80%, .3);
   --arrowpanel-dimmed-further: hsla(0, 0%, 80%, .45);
 }
 
 :root:-moz-lwtheme {
   --toolbar-bgcolor: rgba(255,255,255,.4);
   --toolbar-bgimage: none;
 
   --toolbarbutton-icon-fill-opacity: 1;
 }
 
 toolbar[brighttext] {
-  --toolbarbutton-icon-fill-attention: #45a1ff;
+  --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #45a1ff);
 }
 
 #header-view-toolbar[brighttext],
 #ab-toolbox > toolbar[brighttext],
 .mail-toolbox > toolbar[brighttext],
 #event-toolbox > toolbar[brighttext],
 #compose-toolbox > toolbar[brighttext],
 #headers-box > toolbar[brighttext],
@@ -191,17 +191,17 @@ menulist > menupopup >
   display: -moz-box;
 }
 
 /* ::::: toolbarbutton ::::: */
 
 .toolbarbutton-1 {
   -moz-box-orient: vertical;
   -moz-context-properties: fill, fill-opacity;
-  fill: currentColor;
+  fill: var(--lwt-toolbarbutton-icon-fill, currentColor);
   fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
 toolbox[labelalign="end"] .toolbarbutton-1,
 toolbox[labelalign="end"] .toolbarbutton-1[type="menu-button"]
   > .toolbarbutton-menubutton-button {
   -moz-box-orient: horizontal;
 }
--- a/mail/themes/osx/mail/mailWindow1.css
+++ b/mail/themes/osx/mail/mailWindow1.css
@@ -196,20 +196,16 @@ splitter {
 }
 
 /* ..... status bar adjustments ..... */
 
 #quotaMeter {
   -moz-appearance: none;
 }
 
-#status-bar {
-  border-top: none !important;
-}
-
 .tabmail-tab[type="message"][IsFeedMessage] {
   list-style-image: url("chrome://messenger-newsblog/skin/rss-feed.png");
   -moz-image-region: rect(0 16px 16px 0);
 }
 
 @media (min-resolution: 2dppx) {
   .tabmail-tab[type="message"][IsFeedMessage] {
     list-style-image: url("chrome://messenger-newsblog/skin/rss-feed@2x.png");
--- a/mail/themes/osx/mail/messenger.css
+++ b/mail/themes/osx/mail/messenger.css
@@ -37,17 +37,17 @@
                                      transparent) border-box;
   --toolbarbutton-active-bordercolor: hsla(0, 0%, 0%, .3);
   --toolbarbutton-active-boxshadow: 0 1px 0 hsla(0, 0%, 100%, .5),
                                     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: #0a84ff;
+  --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #0a84ff);
 
   --lwt-header-image: none;
   --arrowpanel-dimmed: hsla(210, 4%, 10%, .07);
   --arrowpanel-dimmed-further: hsla(210, 4%, 10%, .12);
 }
 
 :root:-moz-window-inactive {
   --toolbar-bgcolor: -moz-mac-chrome-inactive;
@@ -56,17 +56,17 @@
 :root:-moz-lwtheme {
   --toolbar-bgcolor: rgba(255,255,255,.4);
   --toolbar-bgimage: none;
 
   --toolbarbutton-icon-fill-opacity: 1;
 }
 
 toolbar[brighttext] {
-  --toolbarbutton-icon-fill-attention: #45a1ff;
+  --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #45a1ff);
 }
 
 #messengerWindow:not([tabsintitlebar]) #titlebar {
   height: 22px;
 }
 
 @media (-moz-mac-yosemite-theme) {
   :root:not(:-moz-lwtheme) {
@@ -187,17 +187,17 @@ toolbox[labelalign="end"] toolbarpalette
 .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   margin: 0;
 }
 
 .toolbarbutton-1 {
   margin: 5px 2px;
   -moz-context-properties: fill, fill-opacity;
-  fill: currentColor;
+  fill: var(--lwt-toolbarbutton-icon-fill, currentColor);
   fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
 .toolbarbutton-1,
 .toolbarbutton-menubutton-button {
   color: inherit;
 }
 
--- a/mail/themes/shared/mail/messageHeader.css
+++ b/mail/themes/shared/mail/messageHeader.css
@@ -9,16 +9,20 @@
 .headerContainer {
   min-width: 1px;
 }
 
 #otherActionsButton > .toolbarbutton-icon {
   display: none;
 }
 
+.toolbarbutton-1.msgHeaderView-button {
+  fill: currentColor;
+}
+
 /* ::::: msg header toolbars ::::: */
 
 #expandedHeaderRows > row,
 #expandedHeader2Rows > row {
   /* Ensure that the header names and values are aligned with each other. */
   -moz-box-align: baseline;
 }
 
--- a/mail/themes/shared/mail/messenger.css
+++ b/mail/themes/shared/mail/messenger.css
@@ -21,16 +21,36 @@ toolbar[printpreview="true"] {
   padding: 0;
 }
 
 #tabbar-toolbar[customizing="true"] {
   min-width: 16px;
   min-height: 10px;
 }
 
+.chromeclass-toolbar toolbarseparator:-moz-lwtheme {
+  -moz-appearance: none;
+  min-width: 1px;
+  background-image: linear-gradient(
+                    transparent 4px,
+                    var(--lwt-toolbar-vertical-separator, rgba(0,0,0,.2)) 4px,
+                    var(--lwt-toolbar-vertical-separator, rgba(0,0,0,.2)) calc(100% - 4px),
+                    transparent calc(100% - 4px));
+  margin-left: 1px;
+  margin-right: 1px;
+}
+
+.chromeclass-toolbar[brighttext] toolbarseparator:-moz-lwtheme {
+  background-image: linear-gradient(
+                    transparent 4px,
+                    var(--lwt-toolbar-vertical-separator, rgba(255,255,255,.3)) 4px,
+                    var(--lwt-toolbar-vertical-separator, rgba(255,255,255,.3)) calc(100% - 4px),
+                    transparent calc(100% - 4px));
+}
+
 /* :::::: throbber :::::::::: */
 
 #throbber-box {
   width: 16px;
   min-height: 16px;
   margin: 0 3px;
 }
 
@@ -39,16 +59,20 @@ toolbar[printpreview="true"] {
 }
 
 #wrapper-throbber-box > #throbber-box {
   list-style-image: url("chrome://messenger/skin/icons/notloading.png");
 }
 
 /* ::::: Status bar ::::: */
 
+#status-bar:-moz-lwtheme {
+  border-top: 1px solid var(--tabs-border-color);
+}
+
 #status-bar:-moz-lwtheme toolbarbutton {
   color: var(--lwt-text-color, inherit);
 }
 
 /* ::::: online/offline icons ::::: */
 
 #offline-status {
   padding: 0 2px;
--- a/mail/themes/windows/mail/messageHeader.css
+++ b/mail/themes/windows/mail/messageHeader.css
@@ -96,20 +96,19 @@
   cursor: text;
 }
 
 .inline-toolbar {
   -moz-appearance: none;
   -moz-box-pack: end;
 }
 
-.inline-toolbar toolbarpaletteitem toolbarseparator,
-.inline-toolbar toolbarseparator {
+#header-view-toolbox toolbarpaletteitem toolbarseparator,
+#header-view-toolbox toolbarseparator {
   margin-top: 1px;
-  margin-inline-start: 1px; /* make it symetrical */
 }
 
 window[inlinetoolbox] #smallicons,
 window[inlinetoolbox] #newtoolbar {
   display: none;
 }
 
 .inline-toolbox[doCustomization] #attachment-view-toolbar {
--- a/mail/themes/windows/mail/messenger.css
+++ b/mail/themes/windows/mail/messenger.css
@@ -30,17 +30,17 @@
   --toolbarbutton-header-bordercolor: rgba(0, 0, 0, .1);
   --toolbarbutton-hover-boxshadow: none;
 
   --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: #0a84ff;
+  --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #0a84ff);
 
   --lwt-header-image: none;
   --arrowpanel-dimmed: hsla(0, 0%, 80%, .3);
   --arrowpanel-dimmed-further: hsla(0, 0%, 80%, .45);
 }
 
 @media (-moz-windows-default-theme) {
   :root {
@@ -58,17 +58,17 @@
 
   --toolbar-bgcolor: rgba(255,255,255,.4);
   --toolbar-bgimage: none;
 
   --toolbarbutton-icon-fill-opacity: 1;
 }
 
 toolbar[brighttext] {
-  --toolbarbutton-icon-fill-attention: #45a1ff;
+  --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #45a1ff);
 }
 
 .menu-iconic > .menu-iconic-left,
 .menuitem-iconic > .menu-iconic-left {
   display: -moz-box;
   padding-top: 0;
 }
 
@@ -87,17 +87,17 @@ toolbar[brighttext] {
   -moz-box-flex: 1; /* make menu items expand to fill toolbar height */
 }
 
 /* ::::: toolbarbutton ::::: */
 
 .toolbarbutton-1 {
   -moz-box-orient: vertical;
   -moz-context-properties: fill, fill-opacity;
-  fill: currentColor;
+  fill: var(--lwt-toolbarbutton-icon-fill, currentColor);
   fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
 toolbox[labelalign="end"] .toolbarbutton-1,
 toolbox[labelalign="end"] .toolbarbutton-1[type="menu-button"]
   > .toolbarbutton-menubutton-button {
   -moz-box-orient: horizontal;
 }