From b6dabb59e815e15d701e51128aa7170a570654d4 Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim.bugs@gmail.com>
Date: Tue, 16 Mar 2021 18:55:41 +0000
Subject: [PATCH] Bug 1698415 - Remove --in-content-warning-container variable
 and tweak --in-content-box-info-background for proton. r=Itiel

Differential Revision: https://phabricator.services.mozilla.com/D108388
---
 browser/themes/shared/preferences/preferences.inc.css | 16 +++-------------
 toolkit/themes/shared/in-content/common.inc.css       |  3 ++-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/browser/themes/shared/preferences/preferences.inc.css b/browser/themes/shared/preferences/preferences.inc.css
index 70729e12c1c2..e30fc00ac36c 100644
--- a/browser/themes/shared/preferences/preferences.inc.css
+++ b/browser/themes/shared/preferences/preferences.inc.css
@@ -5,16 +5,6 @@
 %endif
 @namespace html "http://www.w3.org/1999/xhtml";
 
-:root {
-  --in-content-warning-container: var(--grey-20);
-}
-
-@media (prefers-color-scheme: dark) {
-  :root {
-    --in-content-warning-container: var(--grey-90-a30);
-  }
-}
-
 #preferences-root {
   text-rendering: optimizeLegibility;
 }
@@ -247,7 +237,7 @@ button > hbox > label {
 .info-panel,
 .extension-controlled {
   margin-block: 18px !important;
-  background: var(--in-content-warning-container);
+  background: var(--in-content-box-info-background);
   border-radius: 5px;
   padding-inline-end: 10px;
 }
@@ -888,7 +878,7 @@ image.update-throbber {
 }
 
 #policies-container {
-  background-color: var(--in-content-warning-container);
+  background-color: var(--in-content-box-info-background);
   padding: 0 8px;
   margin-inline-end: 16px;
   border-radius: 2px;
@@ -1068,7 +1058,7 @@ menulist[indicator=true] > menupopup menuitem[indicator=true]:not([image]) > .me
 }
 
 .updateSettingCrossUserWarningContainer {
-  background: var(--in-content-warning-container);
+  background: var(--in-content-box-info-background);
   border-radius: 5px;
   padding: 2px 8px 8px;
   margin-block-end: 17px;
diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css
index f5d9603a1911..98721524eef8 100644
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -15,7 +15,7 @@
   --in-content-box-background: #fff;
   --in-content-box-background-odd: rgba(12, 12, 13, 0.05); /* grey 90 a05 */
   --in-content-box-border-color: var(--grey-90-a30);
-  --in-content-box-info-background: var(--grey-20);
+  --in-content-box-info-background: #f0f0f4;
   --in-content-item-hover: rgba(69, 161, 255, 0.2); /* blue 40 a20 */
   --in-content-item-selected: #0a84ff;
   --in-content-accent-color: #0a84ff;
@@ -111,6 +111,7 @@
 @supports not -moz-bool-pref("browser.proton.enabled") {
 :root {
   --in-content-page-background: #f9f9fa;
+  --in-content-box-info-background: var(--grey-20);
   --in-content-button-background: var(--grey-90-a10);
   --in-content-button-background-hover: var(--grey-90-a20);
   --in-content-button-background-active: var(--grey-90-a30);
-- 
2.11.4.GIT