Bug 1443561 - Part 1b: Move #navigator-toolbox rule back to browser/base/content to avoid CSP issues. r=me
authorTim Nguyen <ntim.bugs@gmail.com>
Wed, 22 Aug 2018 09:06:03 +0100
changeset 432753 c896958f358e
parent 432752 a92aacd177b5
child 432754 e1296c1105fb
push id106858
push userntim.bugs@gmail.com
push dateWed, 22 Aug 2018 08:06:14 +0000
treeherdermozilla-inbound@c896958f358e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1443561
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1443561 - Part 1b: Move #navigator-toolbox rule back to browser/base/content to avoid CSP issues. r=me
browser/base/content/browser.css
browser/themes/shared/browser.inc.css
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -23,16 +23,24 @@
   background-image: var(--lwt-header-image) !important;
   background-position: right top !important;
 }
 
 :root:-moz-lwtheme:-moz-window-inactive {
   background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color)) !important;
 }
 
+/* Set additional backgrounds alignment relative to toolbox */
+
+#navigator-toolbox:-moz-lwtheme {
+  background-image: var(--lwt-additional-images);
+  background-position: var(--lwt-background-alignment);
+  background-repeat: var(--lwt-background-tiling);
+}
+
 #main-window:not([chromehidden~="toolbar"]) {
 %ifdef XP_MACOSX
   min-width: 335px;
 %else
   min-width: 300px;
 %endif
 }
 
--- a/browser/themes/shared/browser.inc.css
+++ b/browser/themes/shared/browser.inc.css
@@ -24,24 +24,16 @@
 }
 
 /* Increase contrast of UI links on dark themes */
 
 :root[lwt-popup-brighttext] panel .text-link {
   color: @lwtPopupBrighttextLinkColor@;
 }
 
-/* Set additional backgrounds alignment relative to toolbox*/
-
-#navigator-toolbox:-moz-lwtheme {
-  background-image: var(--lwt-additional-images);
-  background-position: var(--lwt-background-alignment);
-  background-repeat: var(--lwt-background-tiling);
-}
-
 /* Toolbar / content area border */
 
 #navigator-toolbox::after {
   content: "";
   display: -moz-box;
   border-bottom: 1px solid var(--toolbox-border-bottom-color);
 }