Bug 1519972 - Apply the [brighttext] attribute to the folderPane-toolbar too. r=aceman
authorRichard Marti <richard.marti@gmail.com>
Mon, 14 Jan 2019 20:41:12 +0100
changeset 33372 10e4790e1368
parent 33371 8f9029b8f6f3
child 33373 ef2abc8fb99e
push id2368
push userclokep@gmail.com
push dateMon, 28 Jan 2019 21:12:50 +0000
treeherdercomm-beta@56d23c07d815 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaceman
bugs1519972
Bug 1519972 - Apply the [brighttext] attribute to the folderPane-toolbar too. r=aceman
mail/base/content/messenger.xul
mail/themes/linux/mail/messenger.css
mail/themes/linux/mail/primaryToolbar.css
mail/themes/osx/mail/primaryToolbar.css
mail/themes/windows/mail/mailWindow1.css
mail/themes/windows/mail/messenger.css
mail/themes/windows/mail/primaryToolbar.css
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -447,28 +447,30 @@
              beneath both of them. -->
         <box id="mailContent" orient="vertical" flex="1">
           <!-- mail-toolbox with the main toolbarbuttons -->
 #include mainMailToolbox.inc.xul
 
           <box id="messengerBox" orient="horizontal" flex="1" minheight="100" height="100" persist="height">
             <vbox id="folderPaneBox" minwidth="125" width="200" persist="width">
               <sidebarheader id="folderPaneHeader" hidden="true" align="center"/>
-              <toolbar id="folderPane-toolbar"
-                       class="inline-toolbar"
-                       toolboxid="mail-toolbox"
-                       toolbarname="&folderPaneBar.label;"
-                       accesskey="&folderPaneBar.accesskey;"
-                       customizable="true"
-                       align="start"
-                       mode="icons" defaultmode="icons" lockmode="true"
-                       iconsize="small" defaulticonsize="small" lockiconsize="true"
-                       context="toolbar-context-menu"
-                       defaultset="folderpane-mode-selector"
-                       collapsed="true"/>
+              <toolbox id="folderPane-toolbox">
+                <toolbar id="folderPane-toolbar"
+                         class="inline-toolbar"
+                         toolboxid="mail-toolbox"
+                         toolbarname="&folderPaneBar.label;"
+                         accesskey="&folderPaneBar.accesskey;"
+                         customizable="true"
+                         align="start"
+                         mode="icons" defaultmode="icons" lockmode="true"
+                         iconsize="small" defaulticonsize="small" lockiconsize="true"
+                         context="toolbar-context-menu"
+                         defaultset="folderpane-mode-selector"
+                         collapsed="true"/>
+              </toolbox>
               <tree id="folderTree" class="plain" flex="1"
                     hidecolumnpicker="true" persist="mode" mode="all"
                     keepcurrentinview="true"
                     context="folderPaneContext"
                     disableKeyNavigation="true"
                     ondragstart="gFolderTreeView._onDragStart(event);"
                     ondragover="gFolderTreeView._onDragOver(event);"
                     ondrop="gFolderTreeView._onDragDrop(event);"
--- a/mail/themes/linux/mail/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -87,17 +87,17 @@ toolbar[brighttext] {
 .contentTabToolbox[brighttext],
 #header-view-toolbar[brighttext],
 #ab-toolbox > toolbar[brighttext],
 .mail-toolbox > toolbar[brighttext],
 #event-toolbox > toolbar[brighttext],
 #compose-toolbox > toolbar[brighttext],
 #headers-box > toolbar[brighttext],
 #FormatToolbox > toolbar[brighttext],
-:root[lwt-tree-brighttext] #folderPane-toolbar {
+#folderPane-toolbox > toolbar[brighttext] {
   --toolbarbutton-hover-background: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .25));
   --toolbarbutton-hover-bordercolor: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .5));
   --toolbarbutton-header-bordercolor: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .25));
 
   --toolbarbutton-active-background: var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .4));
   --toolbarbutton-active-bordercolor: var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .7));
   --toolbarbutton-active-boxshadow: 0 0 0 1px var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .4)) inset;
 
--- a/mail/themes/linux/mail/primaryToolbar.css
+++ b/mail/themes/linux/mail/primaryToolbar.css
@@ -35,16 +35,20 @@
   border-bottom: 1px solid var(--chrome-content-separator-color);
 }
 
 .mail-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
+#folderPane-toolbox {
+  -moz-appearance: none;
+}
+
 /* remove the small icons checkbox in Customize window */
 #smallicons {
   display: none;
 }
 
 /* ::::: primary toolbar buttons ::::: */
 
 #button-getmsg {
--- a/mail/themes/osx/mail/primaryToolbar.css
+++ b/mail/themes/osx/mail/primaryToolbar.css
@@ -54,16 +54,20 @@
 }
 
 .mail-toolbox > toolbar {
   -moz-appearance: none;
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
+#folderPane-toolbox {
+  -moz-appearance: none;
+}
+
 /* remove the small icons checkbox in Customize window */
 #smallicons {
   display: none;
 }
 
 #button-getmsg {
   list-style-image: url("chrome://messenger/skin/icons/getmsg.svg");
 }
--- a/mail/themes/windows/mail/mailWindow1.css
+++ b/mail/themes/windows/mail/mailWindow1.css
@@ -14,27 +14,16 @@
 @import url("chrome://messenger/skin/messageIcons.css");
 @import url("chrome://messenger/skin/shared/mailWindow1.css");
 
 #folderPane-toolbar {
   border-top-style: none;
   border-bottom: 1px solid ThreeDShadow;
 }
 
-:root[lwt-tree-brighttext] #folderPane-toolbar {
-  border-bottom-color: var(--sidebar-border-color, rgba(249,249,250,.2));
-  --toolbarbutton-hover-background: rgba(255, 255, 255, .25);
-  --toolbarbutton-hover-bordercolor: rgba(255, 255, 255, .5);
-  --toolbarbutton-header-bordercolor: rgba(255, 255, 255, .25);
-  --toolbarbutton-active-background: rgba(255, 255, 255, .4);
-  --toolbarbutton-active-bordercolor: rgba(255, 255, 255, .7);
-  --toolbarbutton-active-boxshadow: 0 0 0 1px rgba(255, 255, 255, .4) inset;
-  --toolbarbutton-checkedhover-backgroundcolor: rgba(255, 255, 255, .5);
-}
-
 /* Give viewPickerPopup a menu look */
 #viewPickerPopup {
   background-color: menu;
 }
 
 #viewPickerPopup > menu,
 #viewPickerPopup > menuitem {
   padding-inline-end: 1px;
--- a/mail/themes/windows/mail/messenger.css
+++ b/mail/themes/windows/mail/messenger.css
@@ -110,18 +110,18 @@ toolbar[brighttext] {
 }
 
 .contentTabToolbox[brighttext],
 #header-view-toolbar[brighttext],
 #ab-toolbox > toolbar[brighttext],
 .mail-toolbox > toolbar[brighttext],
 #event-toolbox > toolbar[brighttext],
 #compose-toolbox > toolbar[brighttext],
-#navigation-toolbox > toolbar[brighttext],
-:root[lwt-tree-brighttext] #folderPane-toolbar {
+#folderPane-toolbox > toolbar[brighttext],
+#navigation-toolbox > toolbar[brighttext] {
   --toolbarbutton-hover-background: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .25));
   --toolbarbutton-hover-bordercolor: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .5));
   --toolbarbutton-header-bordercolor: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .25));
 
   --toolbarbutton-active-background: var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .4));
   --toolbarbutton-active-bordercolor: var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .7));
   --toolbarbutton-active-boxshadow: 0 0 0 1px var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .4)) inset;
 
--- a/mail/themes/windows/mail/primaryToolbar.css
+++ b/mail/themes/windows/mail/primaryToolbar.css
@@ -28,16 +28,17 @@
   }
 
   #messengerWindow[tabsintitlebar] > #navigation-toolbox:not(:-moz-lwtheme):-moz-window-inactive {
     color: InactiveCaptionText;
   }
 }
 
 #navigation-toolbox,
+#folderPane-toolbox,
 #mail-toolbar-menubar2 {
   -moz-appearance: none;
 }
 
 @media (-moz-os-version: windows-win10) and (-moz-windows-default-theme) {
   #menubar-items > #mail-menubar > menu {
     -moz-appearance: none;
     border-style: none;
@@ -894,17 +895,18 @@ toolbar:not([mode="text"]) > toolbarpale
 @media (-moz-os-version: windows-win8),
        (-moz-os-version: windows-win10) {
   #appmenuSecondaryPane {
     --appMenu-bg-color: -moz-dialog;
     --appMenu-bg-box-shadow: ThreeDShadow;
   }
 
   .mail-toolbox,
-  .contentTabToolbox {
+  .contentTabToolbox,
+  #folderPane-toolbox {
     box-shadow: none;
   }
 
   #mail-toolbar-menubar2 {
     box-shadow: none;
   }
 
   @media (-moz-windows-default-theme: 0) {