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 481070 c896958f358eb37982e325ab4ed8e1244320b0bc
parent 481069 a92aacd177b541c80474ea95f50dbc3c3bd5d57e
child 481071 e1296c1105fbf9f34a7b54018d1767d56a6d5847
push id232
push userfmarier@mozilla.com
push dateWed, 05 Sep 2018 20:45:54 +0000
reviewersme
bugs1443561
milestone63.0a1
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);
 }