From b23b22d47805e33f7d918ed5217d811cf706071b Mon Sep 17 00:00:00 2001
From: Richard Marti <richard.marti@gmail.com>
Date: Mon, 9 Sep 2019 17:46:06 +0200
Subject: [PATCH] Bug 1577591 - [Light theme] Set theme colors for the trees on
 Linux and Windows too. r=aleca,darktrojan DONTBUILD

---
 calendar/base/themes/common/calendar-views.css | 12 +++++++++++-
 mail/themes/addons/light/manifest.json         |  9 +++++++++
 mail/themes/addons/light/moz.build             |  3 +++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/calendar/base/themes/common/calendar-views.css b/calendar/base/themes/common/calendar-views.css
index 6ac6ad7319..7f2203962f 100644
--- a/calendar/base/themes/common/calendar-views.css
+++ b/calendar/base/themes/common/calendar-views.css
@@ -902,6 +902,16 @@ agenda-richlist-item[status="CANCELLED"] .agenda-container-box {
     border: solid ThreeDShadow;
 }
 
+:root[lwt-tree] #view-deck {
+    background-color: var(--sidebar-background-color);
+    border-color: var(--sidebar-border-color);
+    scrollbar-color: rgba(128,128,128,.5) rgba(230,230,235,.5);
+}
+
+:root[lwt-tree-brighttext] #view-deck {
+    scrollbar-color: rgba(249,249,250,.4) rgba(20,20,25,.3);
+}
+
 .navigation-inner-box {
     border-bottom: 1px solid var(--calview-border-bottom-color);
 }
@@ -912,7 +922,7 @@ agenda-richlist-item[status="CANCELLED"] .agenda-container-box {
 }
 
 radiogroup#view-tabs{
-    margin: 0px;
+    margin: 0;
 }
 
 radio.calview {
diff --git a/mail/themes/addons/light/manifest.json b/mail/themes/addons/light/manifest.json
index e9ae048810..c3c9fbdeba 100644
--- a/mail/themes/addons/light/manifest.json
+++ b/mail/themes/addons/light/manifest.json
@@ -23,6 +23,15 @@
       "popup_text": "#0c0c0d",
       "popup_border": "#ccc",
       "tab_line": "#0a84ff",
+#ifndef XP_MACOSX
+      "sidebar": "#fff",
+      "sidebar_text": "#000",
+      "sidebar_border": "#888",
+      "sidebar_highlight": "#2292d0",
+      "sidebar_highlight_text": "#fff",
+      "toolbar_field_separator": "#ccc",
+      "toolbar_field_text": "rgb(24, 25, 26)",
+#endif
       "toolbar": "#f5f6f7",
       "toolbar_bottom_separator": "#ccc",
       "toolbar_field": "#fff",
diff --git a/mail/themes/addons/light/moz.build b/mail/themes/addons/light/moz.build
index 1dacec8142..13f127ecc0 100644
--- a/mail/themes/addons/light/moz.build
+++ b/mail/themes/addons/light/moz.build
@@ -7,5 +7,8 @@
 EXTRA_JS_MODULES.themes['light'] += [
     'experiment.css',
     'icon.svg',
+]
+
+EXTRA_PP_JS_MODULES.themes['light'] += [
     'manifest.json',
 ]