Bug 1508157 - Port bug 1468517: Make toolbar_bottom_separator color apply to findbar top border. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Sun, 11 Nov 2018 23:11:07 +0100
changeset 33740 e975eec95a7e884346424bc9eace9ac511d1b01e
parent 33739 f019858bc23802b8672abd6deec4626962496916
child 33741 237d8227bd3fbbcbbf2ff62f376f255a8666c5f2
push id388
push userclokep@gmail.com
push dateMon, 28 Jan 2019 20:54:56 +0000
reviewersjorgk
bugs1508157, 1468517
Bug 1508157 - Port bug 1468517: Make toolbar_bottom_separator color apply to findbar top border. r=jorgk
calendar/base/themes/common/today-pane.css
calendar/base/themes/windows/today-pane.css
mail/base/modules/ThemeVariableMap.jsm
mail/themes/linux/mail/addrbook/addressbook.css
mail/themes/linux/mail/compacttheme.css
mail/themes/linux/mail/compose/messengercompose.css
mail/themes/linux/mail/messenger.css
mail/themes/linux/mail/primaryToolbar.css
mail/themes/osx/mail/addrbook/addressbook.css
mail/themes/osx/mail/compacttheme.css
mail/themes/osx/mail/compose/messengercompose.css
mail/themes/osx/mail/messenger.css
mail/themes/osx/mail/primaryToolbar.css
mail/themes/windows/mail/addrbook/addressbook.css
mail/themes/windows/mail/compacttheme.css
mail/themes/windows/mail/compose/messengercompose.css
mail/themes/windows/mail/messenger.css
mail/themes/windows/mail/primaryToolbar.css
--- a/calendar/base/themes/common/today-pane.css
+++ b/calendar/base/themes/common/today-pane.css
@@ -24,17 +24,17 @@
 #today-pane-panel > * {
   color: -moz-DialogText;
 }
 
 #today-pane-panel > sidebarheader {
   -moz-appearance: none;
   background-color: var(--toolbar-bgcolor, -moz-Dialog);
   background-image: var(--toolbar-bgimage, none);
-  border-bottom: 1px solid var(--toolbox-border-bottom-color, ThreeDShadow);
+  border-bottom: 1px solid var(--chrome-content-separator-color, ThreeDShadow);
 }
 
 #today-pane-panel:-moz-lwtheme > sidebarheader {
   color: inherit;
 }
 
 .today-pane-cycler {
   -moz-context-properties: fill;
--- a/calendar/base/themes/windows/today-pane.css
+++ b/calendar/base/themes/windows/today-pane.css
@@ -6,17 +6,17 @@
 
 .today-subpane {
   border-bottom-color: ThreeDShadow;
 }
 
 @media (-moz-os-version: windows-win8) and (-moz-windows-default-theme),
        (-moz-os-version: windows-win10) and (-moz-windows-default-theme) {
   #today-pane-panel:not(:-moz-lwtheme) {
-    --toolbox-border-bottom-color: #c2c2c2;
+    --chrome-content-separator-color: #c2c2c2;
   }
 }
 
 #today-pane-panel > sidebarheader {
   height: 35px;
 }
 
 @media (-moz-os-version: windows-win7) {
--- a/mail/base/modules/ThemeVariableMap.jsm
+++ b/mail/base/modules/ThemeVariableMap.jsm
@@ -42,17 +42,17 @@ const ThemeVariableMap = [
     lwtProperty: "toolbar_field_separator",
   }],
   ["--tabs-border-color", {
     lwtProperty: "toolbar_top_separator",
   }],
   ["--lwt-toolbar-vertical-separator", {
     lwtProperty: "toolbar_vertical_separator",
   }],
-  ["--toolbox-border-bottom-color", {
+  ["--chrome-content-separator-color", {
     lwtProperty: "toolbar_bottom_separator",
   }],
   ["--lwt-toolbarbutton-icon-fill", {
     lwtProperty: "icon_color",
   }],
   ["--lwt-toolbarbutton-icon-fill-attention", {
     lwtProperty: "icon_attention_color",
   }],
--- a/mail/themes/linux/mail/addrbook/addressbook.css
+++ b/mail/themes/linux/mail/addrbook/addressbook.css
@@ -7,17 +7,17 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
 @import url("chrome://messenger/skin/shared/addressbook.css");
 
 #ab-toolbox {
   -moz-appearance: none;
   background-color: var(--toolbar-bgcolor);
-  border-bottom: 1px solid var(--toolbox-border-bottom-color);
+  border-bottom: 1px solid var(--chrome-content-separator-color);
 }
 
 #ab-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
 /* ::::: directory pane adjustments ::::: */
--- a/mail/themes/linux/mail/compacttheme.css
+++ b/mail/themes/linux/mail/compacttheme.css
@@ -1,17 +1,17 @@
 /* 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/. */
 
 @import url("chrome://messenger/skin/shared/compacttheme.css");
 
 /* Quick-Filter-Bar */
 #quick-filter-bar {
-  border-bottom-color: var(--toolbox-border-bottom-color);
+  border-bottom-color: var(--chrome-content-separator-color);
 }
 
 #MsgHeadersToolbar {
   background-image: none;
 }
 
 #headers-box {
   -moz-appearance: none;
--- a/mail/themes/linux/mail/compose/messengercompose.css
+++ b/mail/themes/linux/mail/compose/messengercompose.css
@@ -28,17 +28,17 @@
 }
 
 #attachmentBucket attachmentitem[dropOn="bottom"] {
   border-bottom-color: Highlight;
 }
 
 #compose-toolbox {
   background-color: var(--toolbar-bgcolor);
-  border-bottom: 1px solid var(--toolbox-border-bottom-color);
+  border-bottom: 1px solid var(--chrome-content-separator-color);
 }
 
 /** Stock icons for the menu items. */
 
 #fontFaceMenu {
   -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic");
   list-style-image: url("moz-icon://stock/gtk-select-font?size=menu");
 }
--- a/mail/themes/linux/mail/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -15,17 +15,17 @@
   --tabs-border-color: rgba(0,0,0,.3);
   --tabline-color: highlight;
 
   --toolbar-non-lwt-bgcolor: -moz-dialog;
   --toolbar-non-lwt-textcolor: -moz-dialogtext;
   --toolbar-non-lwt-bgimage: linear-gradient(rgba(255,255,255,.15), rgba(255,255,255,.15));
   --toolbar-bgcolor: var(--toolbar-non-lwt-bgcolor);
   --toolbar-bgimage: var(--toolbar-non-lwt-bgimage);
-  --toolbox-border-bottom-color: ThreeDShadow;
+  --chrome-content-separator-color: ThreeDShadow;
 
   --toolbarbutton-border-radius: 2px;
   --toolbarbutton-icon-fill-opacity: .85;
   --toolbarbutton-hover-background: rgba(255, 255, 255, .5) linear-gradient(rgba(255, 255, 255, .5), transparent);
   --toolbarbutton-hover-bordercolor: rgba(0, 0, 0, .25);
   --toolbarbutton-header-bordercolor: rgba(0, 0, 0, .25);
   --toolbarbutton-hover-boxshadow: none;
 
@@ -823,16 +823,17 @@ findbar {
   background-color: var(--toolbar-bgcolor);
   color: var(--toolbar-color);
   text-shadow: none;
 }
 
 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);
 }
 
 /* ::::: groupbox ::::: */
 
 groupbox {
   -moz-appearance: groupbox;
   margin: 5px;
   padding: 5px;
--- a/mail/themes/linux/mail/primaryToolbar.css
+++ b/mail/themes/linux/mail/primaryToolbar.css
@@ -27,17 +27,17 @@
   color: var(--toolbar-color, inherit);
 }
 
 .mail-toolbox::after,
 .contentTabToolbox::after {
   content: "";
   display: -moz-box;
   height: 1px;
-  border-bottom: 1px solid var(--toolbox-border-bottom-color);
+  border-bottom: 1px solid var(--chrome-content-separator-color);
 }
 
 .mail-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
 /* remove the small icons checkbox in Customize window */
--- a/mail/themes/osx/mail/addrbook/addressbook.css
+++ b/mail/themes/osx/mail/addrbook/addressbook.css
@@ -19,17 +19,17 @@
 
 #ab-toolbox:-moz-lwtheme::before {
   content: "";
   display: -moz-box;
   position: absolute;
   top: 100%;
   margin-top: -1px;
   height: 1px;
-  border-bottom: 1px solid var(--toolbox-border-bottom-color);
+  border-bottom: 1px solid var(--chrome-content-separator-color);
 }
 
 #ab-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
 /* ::::: directory pane icons ::::: */
--- a/mail/themes/osx/mail/compacttheme.css
+++ b/mail/themes/osx/mail/compacttheme.css
@@ -23,17 +23,17 @@
 }
 
 /* Quick-Filter-Bar */
 #quick-filter-bar-main-bar:-moz-lwtheme {
   background: transparent;
 }
 
 #quick-filter-bar-expando:-moz-lwtheme {
-  border-bottom-color: var(--toolbox-border-bottom-color);
+  border-bottom-color: var(--chrome-content-separator-color);
   background: transparent;
 }
 
 #headers-box {
   -moz-appearance: none;
 }
 
 #FormatToolbar {
--- a/mail/themes/osx/mail/compose/messengercompose.css
+++ b/mail/themes/osx/mail/compose/messengercompose.css
@@ -13,17 +13,17 @@
 
 #compose-toolbox:-moz-lwtheme::before {
   content: "";
   display: -moz-box;
   position: absolute;
   top: 100%;
   margin-top: -1px;
   height: 1px;
-  border-bottom: 1px solid var(--toolbox-border-bottom-color);
+  border-bottom: 1px solid var(--chrome-content-separator-color);
 }
 
 #attachments-box[empty] > #attachmentBucket:focus {
   box-shadow: 0 0 1.5px 1px -moz-mac-focusring inset;
 }
 
 #attachmentBucket attachmentitem {
   border-top: 1px solid transparent;
--- a/mail/themes/osx/mail/messenger.css
+++ b/mail/themes/osx/mail/messenger.css
@@ -15,17 +15,17 @@
   --tabs-border-color: rgba(0,0,0,.3);
   --tabline-color: #0a84ff;
 
   --toolbar-non-lwt-bgcolor: #f9f9fa;
   --toolbar-non-lwt-textcolor: #0c0c0d;
   --toolbar-non-lwt-bgimage: none;
   --toolbar-bgcolor: var(--toolbar-non-lwt-bgcolor);
   --toolbar-bgimage: var(--toolbar-non-lwt-bgimage);
-  --toolbox-border-bottom-color: hsl(0, 0%, 60%);
+  --chrome-content-separator-color: hsl(0, 0%, 60%);
 
   --toolbarbutton-border-radius: 3px;
   --toolbarbutton-icon-fill-opacity: .85;
   --toolbarbutton-hover-background: hsla(0, 0%, 100%, .1)
                                     linear-gradient(hsla(0, 0%, 100%, .3),
                                     hsla(0, 0%, 100%, .1));
   --toolbarbutton-hover-bordercolor: hsla(0, 0%, 0%, .2);
   --toolbarbutton-header-bordercolor: hsla(0, 0%, 0%, .2);
@@ -102,21 +102,21 @@ toolbar[brighttext] {
 
 #messengerWindow:not([tabsintitlebar]) #titlebar {
   height: 22px;
 }
 
 @media (-moz-mac-yosemite-theme) {
   :root:not(:-moz-lwtheme) {
     --tabs-border-color: rgba(0,0,0,.2);
-    --toolbox-border-bottom-color: hsl(0, 0%, 68%);
+    --chrome-content-separator-color: hsl(0, 0%, 68%);
   }
   :root:not(:-moz-lwtheme):-moz-window-inactive {
     --tabs-border-color: rgba(0,0,0,.05);
-    --toolbox-border-bottom-color: hsl(0, 0%, 85%);
+    --chrome-content-separator-color: hsl(0, 0%, 85%);
   }
 }
 
 .inline-toolbar,
 .contentTabToolbar {
   -moz-appearance: none;
   min-width: 50px;
   min-height: 14px;
@@ -729,16 +729,17 @@ findbar {
   border-top: 1px solid #888;
   color: -moz-DialogText;
   text-shadow: none;
 }
 
 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;
 }
 
 /* ::::: groupbox ::::: */
--- a/mail/themes/osx/mail/primaryToolbar.css
+++ b/mail/themes/osx/mail/primaryToolbar.css
@@ -36,17 +36,17 @@
 .mail-toolbox::after,
 .contentTabToolbox::after {
   -moz-appearance: toolbox;
   content: "";
   display: -moz-box;
   margin-top: -1px;
   height: 1px;
   /* use inset box-shadow instead of border because -moz-appearance hides the border */
-  box-shadow: inset 0 -1px var(--toolbox-border-bottom-color);
+  box-shadow: inset 0 -1px var(--chrome-content-separator-color);
 }
 
 .mail-bar3 {
   padding: 4px 4px 0;
 }
 
 .mail-toolbox > toolbar
 .contentTabToolbox > toolbar {
--- a/mail/themes/windows/mail/addrbook/addressbook.css
+++ b/mail/themes/windows/mail/addrbook/addressbook.css
@@ -51,24 +51,24 @@
   min-width: 50px;
 }
 
 /* :::: Toolbar :::: */
 
 #ab-toolbox {
   -moz-appearance: none;
   background-color: var(--toolbar-bgcolor);
-  border-bottom: 1px solid var(--toolbox-border-bottom-color);
+  border-bottom: 1px solid var(--chrome-content-separator-color);
 }
 
 @media (-moz-windows-default-theme) {
   @media (-moz-os-version: windows-win8),
          (-moz-os-version: windows-win10) {
     #ab-toolbox:not(:-moz-lwtheme) {
-      --toolbox-border-bottom-color: #c2c2c2;
+      --chrome-content-separator-color: #c2c2c2;
     }
   }
 }
 
 toolbar:not(:-moz-lwtheme) {
   -moz-appearance: none;
 }
 
@@ -150,11 +150,11 @@ toolbox > toolbar:last-of-type {
   border: none;
   border-top: 1px solid ThreeDShadow;
 }
 
 @media (-moz-windows-glass) {
   #ab-toolbox:not(:-moz-lwtheme) {
     color: black;
     text-shadow: 0 0 .7em white, 0 0 .7em white, 0 1px 0 rgba(255, 255, 255, .4);
-    --toolbox-border-bottom-color: #aabccf;
+    --chrome-content-separator-color: #aabccf;
   }
 }
--- a/mail/themes/windows/mail/compacttheme.css
+++ b/mail/themes/windows/mail/compacttheme.css
@@ -182,10 +182,10 @@
   background-image: none !important;
   border-top: none !important;
   box-shadow: none !important;
   padding-top: 0 !important;
 }
 
 /* Quick-Filter-Bar */
 #quick-filter-bar-expando {
-  border-bottom-color: var(--toolbox-border-bottom-color);
+  border-bottom-color: var(--chrome-content-separator-color);
 }
--- a/mail/themes/windows/mail/compose/messengercompose.css
+++ b/mail/themes/windows/mail/compose/messengercompose.css
@@ -527,24 +527,24 @@ toolbarbutton.formatting-button[disabled
 
 #findbar-replaceButton > .toolbarbutton-icon {
   display: none;
 }
 
 #compose-toolbox {
   -moz-appearance: none;
   background-color: var(--toolbar-bgcolor);
-  border-bottom: 1px solid var(--toolbox-border-bottom-color);
+  border-bottom: 1px solid var(--chrome-content-separator-color);
 }
 
 @media (-moz-windows-default-theme) {
   @media (-moz-os-version: windows-win8),
          (-moz-os-version: windows-win10) {
     #compose-toolbox:not(:-moz-lwtheme) {
-      --toolbox-border-bottom-color: #c2c2c2;
+      --chrome-content-separator-color: #c2c2c2;
     }
   }
 }
 
 toolbar:not(:-moz-lwtheme) {
   -moz-appearance: none;
 }
 
--- a/mail/themes/windows/mail/messenger.css
+++ b/mail/themes/windows/mail/messenger.css
@@ -16,17 +16,17 @@
   --tabline-color: highlight;
 
   --glassShadowColor: hsla(240, 5%, 5%, .3);
   --toolbar-non-lwt-bgcolor: -moz-dialog;
   --toolbar-non-lwt-textcolor: -moz-dialogtext;
   --toolbar-non-lwt-bgimage: linear-gradient(rgba(255,255,255,.15), rgba(255,255,255,.15));
   --toolbar-bgcolor: var(--toolbar-non-lwt-bgcolor);
   --toolbar-bgimage: var(--toolbar-non-lwt-bgimage);
-  --toolbox-border-bottom-color: ThreeDShadow;
+  --chrome-content-separator-color: ThreeDShadow;
 
   --toolbarbutton-border-radius: 2px;
   --toolbarbutton-icon-fill-opacity: .85;
   --toolbarbutton-hover-background: rgba(0, 0, 0, .1);
   --toolbarbutton-hover-bordercolor: rgba(0, 0, 0, .1);
   --toolbarbutton-header-bordercolor: rgba(0, 0, 0, .1);
   --toolbarbutton-hover-boxshadow: none;
 
@@ -881,16 +881,17 @@ findbar {
   background-color: var(--toolbar-bgcolor);
   color: var(--toolbar-color);
   text-shadow: none;
 }
 
 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);
 }
 
 /* ::::: groupbox ::::: */
 
 groupbox {
   -moz-appearance: groupbox;
   border: 2px groove ThreeDFace;
   border-radius: 3px;
--- a/mail/themes/windows/mail/primaryToolbar.css
+++ b/mail/themes/windows/mail/primaryToolbar.css
@@ -154,17 +154,17 @@
   box-shadow: none;
 }
 
 .mail-toolbox::after,
 .contentTabToolbox::after {
   content: "";
   display: -moz-box;
   height: 1px;
-  border-bottom: 1px solid var(--toolbox-border-bottom-color);
+  border-bottom: 1px solid var(--chrome-content-separator-color);
 }
 
 .mail-toolbox > toolbar:-moz-lwtheme,
 .contentTabToolbox > toolbar:-moz-lwtheme {
   border-top: none;
 }
 
 .button-appmenu .toolbarbutton-text,
@@ -820,17 +820,17 @@ toolbar:not([mode="text"]) > toolbarpale
       color: ThreeDShadow;
     }
   }
 }
 
 @media (-moz-windows-glass) {
   .mail-toolbox:not(:-moz-lwtheme)::after,
   .contentTabToolbox:not(:-moz-lwtheme)::after {
-    --toolbox-border-bottom-color: #aabccf;
+    --chrome-content-separator-color: #aabccf;
   }
 
   #tabs-toolbar {
     -moz-box-ordinal-group: 10;
   }
 
   #mail-toolbar-menubar2 {
     -moz-box-ordinal-group: 20;
@@ -929,11 +929,11 @@ toolbar:not([mode="text"]) > toolbarpale
   #navigation-toolbox > #mail-toolbar-menubar2 {
     background-color: transparent;
     padding-top: 0;
     padding-bottom: 0 !important;
   }
 
   .mail-toolbox:not(:-moz-lwtheme)::after,
   .contentTabToolbox:not(:-moz-lwtheme)::after {
-    --toolbox-border-bottom-color: #c2c2c2;
+    --chrome-content-separator-color: #c2c2c2;
   }
 }