Skip to content

Commit 3e88d84

Browse files
conemaconema
committed
Fix colors for default theme
1 parent 50d7591 commit 3e88d84

File tree

8 files changed

+125
-52
lines changed

8 files changed

+125
-52
lines changed

‎skin/addressbook.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
--treechildren-hoverSelectedBackground: var(--tree-background-color-selected);
1919
}
2020

21-
#ab-toolbox > #addrbook-toolbar-menubar2:not(:-moz-lwtheme):not(:-moz-window-inactive) {
21+
#ab-toolbox > #addrbook-toolbar-menubar2:not(:-moz-window-inactive) {
2222
color: #fff !important;
2323
background-color: var(--background-color);
2424
}
2525

26-
#ab-toolbox > #addrbook-toolbar-menubar2:not(:-moz-lwtheme):-moz-window-inactive {
26+
#ab-toolbox > #addrbook-toolbar-menubar2:-moz-window-inactive {
2727
color: #ddd !important;
2828
background-color: var(--background-color-inactive);
2929
}

‎skin/compose.css‎

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,71 @@
22
@import url(chrome://MonterailOverlay/skin/icons/css/compose.css);
33
@import url(chrome://MonterailOverlay/skin/root.css);
44

5-
#headers-box>#MsgHeadersToolbar:not(:-moz-lwtheme),
6-
#FormatToolbox>#FormatToolbar:not(:-moz-lwtheme) {
5+
6+
#msgIdentity,
7+
textbox.textbox-addressingWidget,
8+
.dummy-row-cell:last-child,
9+
#msgSubject {
10+
color: #000 !important;
11+
}
12+
13+
#appcontent {
14+
border: 0;
15+
}
16+
17+
#msgIdentity:hover,
18+
#msgSubject:hover,
19+
textbox.textbox-addressingWidget:hover {
20+
background: transparent !important;
21+
border-bottom: 1px solid var(--composer-header-border-color) !important;
22+
}
23+
24+
textbox.textbox-addressingWidget[focused="true"],
25+
#msgSubject[focused="true"],
26+
#msgIdentity[focused="true"] {
27+
background: #fff !important;
28+
}
29+
30+
#status-bar,
31+
#compose-toolbar-sizer {
32+
background-color: var(--background-color-light) !important;
33+
color: var(--message-list-text-color) !important;
34+
background-image: none !important;
35+
}
36+
37+
#headers-box>#MsgHeadersToolbar,
38+
#FormatToolbox>#FormatToolbar {
739
color: var(--message-list-text-color);
840
background-color: var(--background-color-light);
941
-moz-appearance: none;
1042
}
1143

12-
#compose-toolbox>#compose-toolbar-menubar2:not(:-moz-lwtheme),
13-
#compose-toolbox>#composeToolbar2:not(:-moz-lwtheme),
44+
#compose-toolbox>#compose-toolbar-menubar2,
45+
#compose-toolbox>#composeToolbar2,
1446
#compose-toolbox>toolbar[id^="__customToolbar"] {
1547
background-color: var(--background-color);
1648
color: #fff;
1749
-moz-appearance: none;
1850
}
1951

20-
#compose-toolbox>#compose-toolbar-menubar2:not(:-moz-lwtheme):-moz-window-inactive,
21-
#compose-toolbox > #composeToolbar2:not(:-moz-lwtheme):-moz-window-inactive {
52+
#compose-toolbox>#compose-toolbar-menubar2:-moz-window-inactive,
53+
#compose-toolbox > #composeToolbar2:-moz-window-inactive,
54+
#menubar-items > #mail-menubar > menu:-moz-window-inactive {
2255
color: #ddd !important;
2356
background-color: var(--background-color-inactive) !important;
2457
}
2558

26-
#menubar-items > #mail-menubar > menu:not([disabled="true"])[_moz-menuactive="true"] {
59+
#menubar-items > #mail-menubar > menu:not([disabled="true"])[_moz-menuactive="true"],
60+
#menubar-items > #mail-menubar > menu {
2761
color: #fff;
2862
}
2963

3064
.toolbarbutton-1 {
3165
-moz-context-properties: fill;
3266
}
3367

34-
.toolbarbutton-1:not(:-moz-lwtheme),
35-
.toolbarbutton-menubutton-button:not(:-moz-lwtheme) {
68+
.toolbarbutton-1,
69+
.toolbarbutton-menubutton-button {
3670
color: #fff;
3771
fill: #fff;
3872
}

‎skin/linux/addressbook.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
-moz-appearance: none;
33
}
44

5-
#ab-toolbox > #addrbook-toolbar-menubar2:not(:-moz-lwtheme):not(:-moz-window-inactive) {
5+
#ab-toolbox > #addrbook-toolbar-menubar2:not(:-moz-window-inactive) {
66
color: #fff;
77
background-color: var(--background-color);
88
}
99

10-
#ab-toolbox > #addrbook-toolbar-menubar2:not(:-moz-lwtheme):-moz-window-inactive {
10+
#ab-toolbox > #addrbook-toolbar-menubar2:-moz-window-inactive {
1111
color: #ddd;
1212
background-color: var(--background-color-inactive);
1313
}

‎skin/linux/compose.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/* Fix black text on compose menu TH 52 */
2-
toolbar:not(.inline-toolbar):not(:-moz-lwtheme) .toolbarbutton-1 .toolbarbutton-text {
2+
toolbar:not(.inline-toolbar) .toolbarbutton-1 .toolbarbutton-text {
33
color: #fff;
44
}

‎skin/linux/messenger.css‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
-moz-appearance: none;
1010
}
1111

12-
#titlebar:not(:-moz-lwtheme):not(:-moz-window-inactive),
13-
#navigation-toolbox > #tabs-toolbar:not(:-moz-lwtheme):not(:-moz-window-inactive),
14-
#navigation-toolbox > #mail-toolbar-menubar2:not(:-moz-lwtheme):not(:-moz-window-inactive) {
12+
#titlebar:not(:-moz-window-inactive),
13+
#navigation-toolbox > #tabs-toolbar:not(:-moz-window-inactive),
14+
#navigation-toolbox > #mail-toolbar-menubar2:not(:-moz-window-inactive) {
1515
color: #fff;
1616
background-color: var(--background-color) !important;
1717
}
1818

19-
#titlebar:not(:-moz-lwtheme):-moz-window-inactive,
20-
#navigation-toolbox > #tabs-toolbar:not(:-moz-lwtheme):-moz-window-inactive,
21-
#navigation-toolbox > #mail-toolbar-menubar2:not(:-moz-lwtheme):-moz-window-inactive {
19+
#titlebar:-moz-window-inactive,
20+
#navigation-toolbox > #tabs-toolbar:-moz-window-inactive,
21+
#navigation-toolbox > #mail-toolbar-menubar2:-moz-window-inactive {
2222
color: #ddd;
2323
background-color: var(--background-color-inactive);
2424
}
@@ -29,7 +29,7 @@
2929
color: inherit;
3030
}
3131

32-
.tabmail-tab:not([selected]):not(:-moz-lwtheme) > .tab-stack > .tab-content > .tab-label-container,
32+
.tabmail-tab:not([selected]) > .tab-stack > .tab-content > .tab-label-container,
3333
.tabmail-tab > .tab-stack > .tab-content:not([selected=true]) > .tab-text {
3434
color: inherit;
3535
}

‎skin/mac/messenger.css‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
color: inherit;
66
}
77

8-
#messengerWindow:not(:-moz-lwtheme) > #titlebar {
8+
#messengerWindow > #titlebar {
99
-moz-appearance: none !important;
1010
}
1111

12-
#messengerWindow > #titlebar:not(:-moz-lwtheme):not(:-moz-window-inactive) {
12+
#messengerWindow > #titlebar:not(:-moz-window-inactive) {
1313
background-color: var(--background-color) !important;
1414
}
1515

16-
#messengerWindow > #titlebar:not(:-moz-lwtheme):-moz-window-inactive {
16+
#messengerWindow > #titlebar:-moz-window-inactive {
1717
background-color: var(--background-color-inactive);
1818
}
1919

20-
.tabmail-tab:not([selected]):not(:-moz-lwtheme) {
20+
.tabmail-tab:not([selected]) {
2121
color: inherit;
2222
text-shadow: none;
2323
}

‎skin/messenger.css‎

Lines changed: 65 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,69 @@
44
@import url(chrome://MonterailOverlay-OS/skin/messenger.css);
55
@import url(chrome://MonterailOverlay/skin/root.css);
66

7-
#threadTree > treechildren {
7+
#threadTree > treechildren::-moz-tree-cell-text,
8+
#threadCols {
89
color: #000 !important;
910
}
1011

11-
#messengerWindow>#navigation-toolbox:not(:-moz-lwtheme):not(:-moz-window-inactive) {
12+
#header-view-toolbox .toolbarbutton-icon {
13+
fill: #666;
14+
}
15+
16+
#tabbar-toolbar .toolbarbutton-icon {
17+
fill: #fff;
18+
}
19+
20+
#searchInput,
21+
.searchBox {
22+
background: #fff !important;
23+
color: #000 !important;
24+
}
25+
26+
#messengerWindow>#navigation-toolbox:not(:-moz-window-inactive) {
1227
color: #fff !important;
1328
background-color: var(--background-color) !important;
1429
}
1530

16-
#messengerWindow>#navigation-toolbox:not(:-moz-lwtheme):-moz-window-inactive {
31+
#messengerWindow>#navigation-toolbox:-moz-window-inactive {
1732
color: #ddd !important;
1833
background-color: var(--background-color-inactive) !important;
1934
}
2035

21-
#menubar-items>#mail-menubar>menu:not(:-moz-lwtheme) {
36+
#menubar-items>#mail-menubar>menu {
2237
-moz-appearance: none;
2338
border-style: none;
2439
color: inherit !important;
2540
}
2641

27-
#menubar-items>#mail-menubar>menu[_moz-menuactive="true"]:not([disabled="true"]):not(:-moz-lwtheme) {
42+
#menubar-items>#mail-menubar>menu[_moz-menuactive="true"]:not([disabled="true"]) {
2843
background-color: hsla(0, 0%, 0%, .12);
2944
}
3045

31-
#menubar-items>#mail-menubar>menu[_moz-menuactive="true"][open="true"]:not([disabled="true"]):not(:-moz-lwtheme) {
46+
#menubar-items>#mail-menubar>menu[_moz-menuactive="true"][open="true"]:not([disabled="true"]) {
3247
background-color: hsla(0, 0%, 0%, .22);
3348
}
3449

35-
.mail-toolbox:not(:-moz-lwtheme),
36-
#mailContent>#mail-toolbox:not(:-moz-lwtheme),
37-
.contentTabInstance>.contentTabToolbox:not(:-moz-lwtheme),
50+
.mail-toolbox,
51+
#mailContent>#mail-toolbox,
52+
.contentTabInstance>.contentTabToolbox,
3853
#folderpane-mode-selector-menulist,
39-
.contentTabToolbo {
54+
.contentTabToolbox {
4055
box-shadow: none;
4156
background-image: none;
4257
background-color: var(--background-color-light);
4358
color: var(--message-list-text-color);
4459
}
4560

61+
#quick-filter-bar,
62+
#status-bar,
63+
.tabmail-tab > .tab-stack > .tab-background[selected="true"],
64+
.tabmail-tab > .tab-stack > .tab-content[selected="true"] {
65+
background-color: var(--background-color-light) !important;
66+
color: var(--message-list-text-color) !important;
67+
background-image: none !important;
68+
}
69+
4670
#folderpane-mode-selector-menulist {
4771
border: 0;
4872
}
@@ -57,7 +81,7 @@
5781
--fgTabTexture: linear-gradient(transparent, transparent);
5882
}
5983

60-
.tabmail-tab:not([selected]):not(:-moz-lwtheme) {
84+
.tabmail-tab:not([selected]) {
6185
color: inherit !important;
6286
}
6387

@@ -67,20 +91,20 @@
6791
-moz-context-properties: fill;
6892
}
6993

70-
.toolbarbutton-1:not(:-moz-lwtheme),
71-
.toolbarbutton-menubutton-button:not(:-moz-lwtheme) {
94+
.toolbarbutton-1,
95+
.toolbarbutton-menubutton-button {
7296
color: #666;
7397
fill: #666;
7498
}
7599

76-
#navigation-toolbox .toolbarbutton-1:not(:-moz-lwtheme),
77-
#navigation-toolbox .toolbarbutton-menubutton-button:not(:-moz-lwtheme) {
100+
#navigation-toolbox .toolbarbutton-1,
101+
#navigation-toolbox .toolbarbutton-menubutton-button {
78102
color: #fff;
79103
fill: #fff;
80104
}
81105

82-
.tabmail-tab[selected]:not(:-moz-lwtheme):-moz-window-inactive .tab-icon-image,
83-
.tabmail-tab[selected]:not(:-moz-lwtheme):-moz-window-inactive .tab-label-container,
106+
.tabmail-tab[selected]:-moz-window-inactive .tab-icon-image,
107+
.tabmail-tab[selected]:-moz-window-inactive .tab-label-container,
84108
.toolbarbutton-1:-moz-window-inactive .toolbarbutton-icon,
85109
.toolbarbutton-1:-moz-window-inactive>.toolbarbutton-text,
86110
.toolbarbutton-menubutton-button:-moz-window-inactive>.toolbarbutton-icon,
@@ -110,7 +134,8 @@ toolbar[brighttext]>.toolbarbutton-1 {
110134
}
111135

112136
#singlemessage>#msgHeaderView {
113-
background-color: #fcfcfc;
137+
background-color: #fcfcfc !important;
138+
color: #000;
114139
}
115140

116141
/* foldertree & threadtree */
@@ -146,6 +171,7 @@ toolbar[brighttext]>.toolbarbutton-1 {
146171
background: var(--tree-background-color-hover) !important;
147172
}
148173

174+
#threadTree treechildren::-moz-tree-row(selected),
149175
#threadTree treechildren::-moz-tree-row(container, selected) {
150176
background: var(--tree-background-color-selected) !important;
151177
}
@@ -171,7 +197,7 @@ toolbar[brighttext]>.toolbarbutton-1 {
171197
.calendar-task-tree>treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text(selected, focus),
172198
#unifinder-search-results-tree>treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text(selected),
173199
#unifinder-search-results-tree>treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text(selected, focus) {
174-
color: #fff;
200+
color: #fff !important;
175201
}
176202

177203
#rssSubscriptionsList>treechildren::-moz-tree-image,
@@ -302,7 +328,7 @@ treechildren:-moz-tree-twisty {
302328
.agenda-container-box[selected="true"][current="true"],
303329
.agenda-allday-container-box[selected="true"][current="true"],
304330
.agenda-checkbox[selected="true"][current="true"] {
305-
background-color: var(--tree-background-color-selected);
331+
background-color: var(--tree-background-color-selected) !important;
306332
color: #fff;
307333
}
308334

@@ -316,14 +342,27 @@ treechildren:-moz-tree-twisty {
316342
}
317343

318344
/* Lightning */
345+
#calendar-toolbox-container,
346+
.mail-toolbox,
347+
#calendar-task-tree treechildren::-moz-tree-cell-text,
348+
#unifinder-todo-tree treechildren::-moz-tree-cell-text(hover),
349+
#calendar-task-tree treechildren::-moz-tree-cell-text(hover) {
350+
color: #000 !important;
351+
}
352+
353+
#calendar-toolbox-container .toolbarbutton-icon{
354+
fill: #666;
355+
}
319356

320-
#ltnSidebar, #unifinder-todo-tree > .calendar-task-tree,
357+
#ltnSidebar,
358+
#unifinder-todo-tree > .calendar-task-tree,
321359
#calendar-panel {
322360
background-color: var(--background-color);
323361
}
324362

325363
#unifinder-todo-tree treecols {
326364
background: var(--background-color-light);
365+
color: #000 !important;
327366
}
328367

329368
minimonth, #unifinder-searchBox, #task-addition-box {
@@ -398,36 +437,36 @@ calendar-list-tree > tree {
398437
#calendar-task-tree-detail treechildren::-moz-tree-row(selected, focus),
399438
#calendar-task-tree-detail treechildren::-moz-tree-row(dropOn) {
400439
border-color: var(--tree-background-color-selected);
401-
background-color: var(--tree-background-color-selected);
440+
background-color: var(--tree-background-color-selected) !important;
402441
}
403442

404443
#calendar-task-tree-detail treechildren::-moz-tree-row(selected, current, focus) {
405444
border-color: var(--tree-background-color-selected);
406-
background-color: var(--tree-background-color-selected);
445+
background-color: var(--tree-background-color-selected) !important;
407446
}
408447

409448
#calendar-task-tree-detail treechildren::-moz-tree-row(hover),
410449
#calendar-list-tree-widget treechildren::-moz-tree-row(hover),
411450
#calendar-task-tree treechildren::-moz-tree-row(hover),
412451
#unifinder-search-results-tree treechildren::-moz-tree-row(hover) {
413452
border-color: var(--tree-background-color-hover);
414-
background-color: var(--tree-background-color-hover);
453+
background-color: var(--tree-background-color-hover) !important;
415454
}
416455

417456
#calendar-task-tree-detail treechildren::-moz-tree-row(hover, current),
418457
#calendar-list-tree-widget treechildren::-moz-tree-row(hover, current),
419458
#calendar-task-tree treechildren::-moz-tree-row(hover, current),
420459
#unifinder-search-results-tree treechildren::-moz-tree-row(hover, current) {
421460
border-color: var(--tree-background-color-selected);
422-
background-image: var(--tree-background-color-selected);
461+
background-image: var(--tree-background-color-selected) !important;
423462
}
424463

425464
#calendar-task-tree-detail treechildren::-moz-tree-row(hover, selected),
426465
#calendar-list-tree-widget treechildren::-moz-tree-row(hover, selected),
427466
#calendar-task-tree treechildren::-moz-tree-row(hover, selected),
428467
#unifinder-search-results-tree treechildren::-moz-tree-row(hover, selected) {
429468
border-color: var(--tree-background-color-selected);
430-
background-color: var(--tree-background-color-selected);
469+
background-color: var(--tree-background-color-selected) !important;
431470
}
432471

433472
#calMinimonthBox {

0 commit comments

Comments
 (0)