Bug 1608344 - Adjust Task and Event tree colours for the dark theme. r=pmorris
authorRichard Marti <richard.marti@gmail.com>
Sat, 11 Jan 2020 18:33:18 +0100
changeset 37956 7c322e55ef6b2497f57865d6d2d258a9ec185c7e
parent 37955 1784150a888a0a5d9e9416a3fee9926fc7907324
child 37957 a9d1bbebb67f0407900127d2653e5d5656b0c4aa
push id398
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:10:28 +0000
reviewerspmorris
bugs1608344
Bug 1608344 - Adjust Task and Event tree colours for the dark theme. r=pmorris
calendar/base/themes/common/calendar-task-tree.css
calendar/base/themes/common/calendar-unifinder.css
calendar/base/themes/windows/calendar-task-tree.css
--- a/calendar/base/themes/common/calendar-task-tree.css
+++ b/calendar/base/themes/common/calendar-task-tree.css
@@ -12,33 +12,50 @@
     margin-top: 1px;
     margin-bottom: 1px;
 }
 
 .calendar-task-tree > treechildren::-moz-tree-cell-text(inprogress) {
     color: green !important;
 }
 
+:root[lwt-tree-brighttext] .calendar-task-tree > treechildren::-moz-tree-cell-text(inprogress) {
+    color: #00bd00 !important;
+}
+
 .calendar-task-tree > treechildren::-moz-tree-row(inprogress, selected, focus) {
     background-color: green !important;
 }
 
-.calendar-task-tree > treechildren::-moz-tree-cell-text(inprogress, selected, focus) {
-    color: HighlightText !important;
+:root[lwt-tree-brighttext] .calendar-task-tree > treechildren::-moz-tree-row(inprogress, selected, focus) {
+    background-color: #00bd00 !important;
 }
 
 .calendar-task-tree > treechildren::-moz-tree-cell-text(overdue) {
     color: red !important;
 }
 
+:root[lwt-tree-brighttext] .calendar-task-tree > treechildren::-moz-tree-cell-text(overdue) {
+    color: #ff7a7a !important;
+}
+
 .calendar-task-tree > treechildren::-moz-tree-row(overdue, selected, focus) {
     background-color: red !important;
 }
 
-.calendar-task-tree > treechildren::-moz-tree-cell-text(overdue, selected, focus) {
+:root[lwt-tree-brighttext] .calendar-task-tree > treechildren::-moz-tree-row(overdue, selected, focus) {
+    background-color: #ff7a7a !important;
+}
+
+.calendar-task-tree > treechildren::-moz-tree-cell-text(inprogress, selected, focus),
+:root[lwt-tree-brighttext] .calendar-task-tree >
+  treechildren::-moz-tree-cell-text(inprogress, selected, focus),
+.calendar-task-tree > treechildren::-moz-tree-cell-text(overdue, selected, focus),
+:root[lwt-tree-brighttext] .calendar-task-tree >
+  treechildren::-moz-tree-cell-text(overdue, selected, focus) {
     color: HighlightText !important;
 }
 
 .calendar-task-tree > treechildren::-moz-tree-cell-text(completed) {
     text-decoration: line-through;
     font-style: italic;
 }
 
@@ -59,21 +76,30 @@
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-priority, highpriority) {
     list-style-image: url(chrome://calendar-common/skin/icons/priority.svg);
     -moz-context-properties: fill;
     fill: red;
     margin-inline-start: -2px;
 }
 
+:root[lwt-tree-brighttext] .calendar-task-tree >
+  treechildren::-moz-tree-image(calendar-task-tree-col-priority, highpriority) {
+    fill: #ff7a7a;
+}
+
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-priority, lowpriority) {
     list-style-image: url(chrome://calendar-common/skin/task-images.png);
     -moz-image-region: rect(0 26px 13px 13px);
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-priority, selected, lowpriority) {
-    list-style-image: url(chrome://calendar-common/skin/task-images.png);
+    -moz-image-region: rect(0 39px 13px 26px);
+}
+
+:root[lwt-tree-brighttext] .calendar-task-tree >
+  treechildren::-moz-tree-image(calendar-task-tree-col-priority, lowpriority) {
     -moz-image-region: rect(0 39px 13px 26px);
 }
 
 treecol.calendar-task-tree-col-percentcomplete {
     text-align: end;
 }
--- a/calendar/base/themes/common/calendar-unifinder.css
+++ b/calendar/base/themes/common/calendar-unifinder.css
@@ -4,18 +4,17 @@
 
 /* only format Unifinder lists */
 #unifinder-search-results-tree > treechildren::-moz-tree-cell-text(highpriority) {
    font-weight: bold;
 }
 
 #unifinder-search-results-tree > treechildren::-moz-tree-cell-text(lowpriority) {
    font-style: italic;
-   color: GrayText !important;
-   background-color: -moz-field;
+   opacity: 0.6;
 }
 
 /* workaround to avoid Window Flick */
 #unifinder-search-results-tree {
     -moz-appearance: none;
     min-height: 92px;
     margin: 0;
 }
--- a/calendar/base/themes/windows/calendar-task-tree.css
+++ b/calendar/base/themes/windows/calendar-task-tree.css
@@ -26,25 +26,35 @@
 }
 
 /* Use on Win7 and up default theme a dark text color when selected focus */
 @media (-moz-windows-default-theme) {
     .calendar-task-tree > treechildren::-moz-tree-row(inprogress, selected, focus) {
         border-color: green !important;
     }
 
-    .calendar-task-tree > treechildren::-moz-tree-cell-text(inprogress, selected, focus) {
+    :root[lwt-tree-brighttext] .calendar-task-tree > treechildren::-moz-tree-row(inprogress, selected, focus) {
+        border-color: #00bd00 !important;
+    }
+
+    .calendar-task-tree > treechildren::-moz-tree-cell-text(inprogress, selected, focus),
+    :root[lwt-tree-brighttext] .calendar-task-tree > treechildren::-moz-tree-cell-text(inprogress, selected, focus) {
         color: white !important;
     }
 
     .calendar-task-tree > treechildren::-moz-tree-row(overdue, selected, focus) {
         border-color: red !important;
     }
 
-    .calendar-task-tree > treechildren::-moz-tree-cell-text(overdue, selected, focus) {
+    :root[lwt-tree-brighttext] .calendar-task-tree > treechildren::-moz-tree-row(overdue, selected, focus) {
+        border-color: #ff7a7a !important;
+    }
+
+    .calendar-task-tree > treechildren::-moz-tree-cell-text(overdue, selected, focus),
+    :root[lwt-tree-brighttext] .calendar-task-tree > treechildren::-moz-tree-cell-text(overdue, selected, focus) {
         color: white !important;
     }
 
     @media (-moz-os-version: windows-win7) {
         .calendar-task-tree > treechildren::-moz-tree-row(inprogress, selected, focus) {
             background: linear-gradient(rgba(0, 128, 0, .28), rgba(0, 128, 0, .5));
         }