Bug 1543615 - Extend toolbar colors to the customization mode for all themes without a header image. r=dao
authorTim Nguyen <ntim.bugs@gmail.com>
Thu, 11 Apr 2019 09:38:19 +0000
changeset 468968 c77962add953a48bdbcbbcd3d157d63d1267cd8e
parent 468967 10af6c739d9c7065e581f0c074321bc5f28dcc3a
child 468969 cb9dda98d12b13dfbebb80c3e197921784d96d53
child 469174 a04e551ab0586beb74f587f1b6f18e5e3f0aaeec
push id35855
push useraciure@mozilla.com
push dateThu, 11 Apr 2019 16:11:15 +0000
treeherdermozilla-central@c77962add953 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1543615
milestone68.0a1
first release with
nightly linux32
c77962add953 / 68.0a1 / 20190411161115 / files
nightly linux64
c77962add953 / 68.0a1 / 20190411161115 / files
nightly mac
c77962add953 / 68.0a1 / 20190411161115 / files
nightly win32
c77962add953 / 68.0a1 / 20190411161115 / files
nightly win64
c77962add953 / 68.0a1 / 20190411161115 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1543615 - Extend toolbar colors to the customization mode for all themes without a header image. r=dao Differential Revision: https://phabricator.services.mozilla.com/D27041
browser/themes/shared/compacttheme.inc.css
browser/themes/shared/customizableui/customizeMode.inc.css
--- a/browser/themes/shared/compacttheme.inc.css
+++ b/browser/themes/shared/compacttheme.inc.css
@@ -1,21 +1,13 @@
 % 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/.
 
 /* compacttheme.css is loaded in browser.xul after browser.css when it is
    preffed on.  The bulk of the styling is here in the shared file, but
    there are overrides for each platform in their compacttheme.css files. */
 
-:root:-moz-lwtheme {
-  --toolbar-non-lwt-bgcolor: var(--toolbar-bgcolor);
-  --toolbar-non-lwt-textcolor: var(--lwt-text-color);
-  --toolbar-non-lwt-bgimage: none;
-}
-
 :root:-moz-lwtheme-brighttext {
-  /* !important to override LightweightThemeManager.addBuiltInTheme in
-     BrowserGlue.jsm */
+  /* !important to override LightweightThemeConsumer.jsm */
   --autocomplete-popup-background: #2A2A2E !important;
   --autocomplete-popup-highlight-background: #0060DF;
 }
-
--- a/browser/themes/shared/customizableui/customizeMode.inc.css
+++ b/browser/themes/shared/customizableui/customizeMode.inc.css
@@ -8,25 +8,26 @@
   --drag-drop-transition-duration: .3s;
 }
 
 #main-window[customizing] .customization-target:not(#widget-overflow-fixed-list) {
   min-width: 100px;
 }
 
 #customization-container {
-  background-color: var(--toolbar-non-lwt-bgcolor);
-  background-image: var(--toolbar-non-lwt-bgimage);
-  color: var(--toolbar-non-lwt-textcolor);
-  text-shadow: none;
+  background-color: var(--toolbar-bgcolor);
+  background-image: var(--toolbar-bgimage);
+  color: var(--toolbar-color);
 }
 
 :root[lwtheme-image] #customization-container {
   background-color: transparent;
   background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-non-lwt-bgcolor) 45px);
+  color: var(--toolbar-non-lwt-textcolor);
+  text-shadow: none;
 }
 
 #customization-palette {
   padding: 5px 20px 20px;
 }
 
 #customization-header {
   font-weight: 600;