Attachment #832955: theme-preprocess.patch for bug #916766

View | Details | Raw Unified | Return to bug 916766
Collapse All | Expand All

(-)a/browser/themes/osx/jar.mn (-2 / +2 lines)
Line     Link Here 
 Lines 211-228   browser.jar: Link Here 
211
  skin/classic/browser/tabbrowser/tabDragIndicator@2x.png                (tabbrowser/tabDragIndicator@2x.png)
211
  skin/classic/browser/tabbrowser/tabDragIndicator@2x.png                (tabbrowser/tabDragIndicator@2x.png)
212
  skin/classic/browser/tabview/close.png                    (tabview/close.png)
212
  skin/classic/browser/tabview/close.png                    (tabview/close.png)
213
  skin/classic/browser/tabview/edit-light.png               (tabview/edit-light.png)
213
  skin/classic/browser/tabview/edit-light.png               (tabview/edit-light.png)
214
  skin/classic/browser/tabview/search.png                   (tabview/search.png)
214
  skin/classic/browser/tabview/search.png                   (tabview/search.png)
215
  skin/classic/browser/tabview/stack-expander.png           (tabview/stack-expander.png)
215
  skin/classic/browser/tabview/stack-expander.png           (tabview/stack-expander.png)
216
  skin/classic/browser/tabview/tabview.png                  (tabview/tabview.png)
216
  skin/classic/browser/tabview/tabview.png                  (tabview/tabview.png)
217
  skin/classic/browser/tabview/tabview.css                  (tabview/tabview.css)
217
  skin/classic/browser/tabview/tabview.css                  (tabview/tabview.css)
218
* skin/classic/browser/devtools/common.css                  (devtools/common.css)
218
* skin/classic/browser/devtools/common.css                  (devtools/common.css)
219
  skin/classic/browser/devtools/dark-theme.css              (../shared/devtools/dark-theme.css)
219
*  skin/classic/browser/devtools/dark-theme.css              (../shared/devtools/dark-theme.css)
220
  skin/classic/browser/devtools/light-theme.css             (../shared/devtools/light-theme.css)
220
*  skin/classic/browser/devtools/light-theme.css             (../shared/devtools/light-theme.css)
221
  skin/classic/browser/devtools/controls.png                (../shared/devtools/controls.png)
221
  skin/classic/browser/devtools/controls.png                (../shared/devtools/controls.png)
222
* skin/classic/browser/devtools/widgets.css                 (devtools/widgets.css)
222
* skin/classic/browser/devtools/widgets.css                 (devtools/widgets.css)
223
  skin/classic/browser/devtools/commandline-icon.png        (devtools/commandline-icon.png)
223
  skin/classic/browser/devtools/commandline-icon.png        (devtools/commandline-icon.png)
224
  skin/classic/browser/devtools/command-paintflashing.png   (devtools/command-paintflashing.png)
224
  skin/classic/browser/devtools/command-paintflashing.png   (devtools/command-paintflashing.png)
225
  skin/classic/browser/devtools/command-responsivemode.png  (devtools/command-responsivemode.png)
225
  skin/classic/browser/devtools/command-responsivemode.png  (devtools/command-responsivemode.png)
226
  skin/classic/browser/devtools/command-scratchpad.png      (devtools/command-scratchpad.png)
226
  skin/classic/browser/devtools/command-scratchpad.png      (devtools/command-scratchpad.png)
227
  skin/classic/browser/devtools/command-tilt.png            (devtools/command-tilt.png)
227
  skin/classic/browser/devtools/command-tilt.png            (devtools/command-tilt.png)
228
  skin/classic/browser/devtools/alerticon-warning.png       (devtools/alerticon-warning.png)
228
  skin/classic/browser/devtools/alerticon-warning.png       (devtools/alerticon-warning.png)
(-)a/browser/themes/shared/devtools/dark-theme-colors.inc (+24 lines)
Line     Link Here 
Line 0    Link Here 
1
%if 0
2
/* This Source Code Form is subject to the terms of the Mozilla Public
3
 * License, v. 2.0. If a copy of the MPL was not distributed with this
4
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.*/
5
6
/* View list of colors online with previews:
7
 * https://developer.mozilla.org/en-US/docs/Tools/DevToolsColors; */
8
%endif
9
%define mainBackgroundColor #131c26
10
%define textColor #8fa1b2
11
%define separatorColor #303b47
12
%define darkerBackgroundColor rgba(0,0,0,0.5)
13
%define contrastBackgroundColor #a18650
14
%define selectedColor #26394D
15
%define linkColor #3689b2
16
%define linkVisitedColor #3689b2
17
%define commentColor #5c6773
18
%define fg1Color #5c9966
19
%define fg2Color #3689b2
20
%define fg3Color #a673bf
21
%define fg4Color #6270b2
22
%define fg5Color #a18650
23
%define fg6Color #b26b47
24
%define fg7Color #bf5656
(-)a/browser/themes/shared/devtools/dark-theme.css (-17 / +21 lines)
Line     Link Here 
 Lines 1-19    Link Here 
1
/* vim:set ts=2 sw=2 sts=2 et: */
1
/* vim:set ts=2 sw=2 sts=2 et: */
2
/* This Source Code Form is subject to the terms of the Mozilla Public
2
/* This Source Code Form is subject to the terms of the Mozilla Public
3
 * License, v. 2.0. If a copy of the MPL was not distributed with this
3
 * License, v. 2.0. If a copy of the MPL was not distributed with this
4
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
5
5
6
/* According to:
6
/* According to:
7
 * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
7
 * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
8
 */
8
 */
9
10
%include dark-theme-colors.inc
11
%filter substitution
12
9
.theme-body {
13
.theme-body {
10
  background: #131c26;
14
  background: @mainBackgroundColor@;
11
  color: #8fa1b2;
15
  color: @textColor@;
12
}
16
}
13
17
14
.theme-twisty {
18
.theme-twisty {
15
  cursor: pointer;
19
  cursor: pointer;
16
  width: 14px;
20
  width: 14px;
17
  height: 14px;
21
  height: 14px;
18
  background-repeat: no-repeat;
22
  background-repeat: no-repeat;
19
  background-image: url("chrome://browser/skin/devtools/controls.png");
23
  background-image: url("chrome://browser/skin/devtools/controls.png");
 Lines 39-140    Link Here 
39
  background-position: -28px 0;
43
  background-position: -28px 0;
40
}
44
}
41
45
42
.theme-checkbox[checked] {
46
.theme-checkbox[checked] {
43
  background-position: -42px 0;
47
  background-position: -42px 0;
44
}
48
}
45
49
46
.theme-selected {
50
.theme-selected {
47
  background: #26394D;
51
  background: @selectedColor@;
48
}
52
}
49
53
50
.theme-bg-darker,
54
.theme-bg-darker,
51
.cm-s-mozilla .CodeMirror-gutters {
55
.cm-s-mozilla .CodeMirror-gutters {
52
  background-color: rgba(0,0,0,0.5);
56
  background-color: @darkerBackgroundColor@;
53
}
57
}
54
58
55
.theme-bg-contrast { /* contrast bg color to attract attention on a container */
59
.theme-bg-contrast { /* contrast bg color to attract attention on a container */
56
  background: #a18650;
60
  background: @contrastBackgroundColor@;
57
}
61
}
58
62
59
.theme-link,
63
.theme-link,
60
.cm-s-mozilla .cm-link { /* blue */
64
.cm-s-mozilla .cm-link { /* blue */
61
  color: #3689b2;
65
  color: @linkColor@;
62
}
66
}
63
67
64
/*
68
/*
65
 * FIXME: http://bugzil.la/575675 CSS links without :visited set cause assertion
69
 * FIXME: http://bugzil.la/575675 CSS links without :visited set cause assertion
66
 * failures in debug builds.
70
 * failures in debug builds.
67
 */
71
 */
68
.theme-link:visited,
72
.theme-link:visited,
69
.cm-s-mozilla .cm-link:visited { /* blue */
73
.cm-s-mozilla .cm-link:visited { /* blue */
70
  color: #3689b2;
74
  color: @linkVisitedColor@;
71
}
75
}
72
76
73
77
74
.theme-comment,
78
.theme-comment,
75
.cm-s-mozilla .cm-meta,
79
.cm-s-mozilla .cm-meta,
76
.cm-s-mozilla .cm-hr,
80
.cm-s-mozilla .cm-hr,
77
.cm-s-mozilla .cm-comment { /* grey */
81
.cm-s-mozilla .cm-comment { /* grey */
78
  color: #5c6773;
82
  color: @commentColor@;
79
}
83
}
80
84
81
.theme-gutter {
85
.theme-gutter {
82
  background-color: #0f171f;
86
  background-color: #0f171f;
83
  color: #667380;
87
  color: #667380;
84
  border-color: #303b47;
88
  border-color: @separatorColor@;
85
}
89
}
86
90
87
.theme-separator { /* grey */
91
.theme-separator { /* grey */
88
  border-color: #303b47;
92
  border-color: @separatorColor@;
89
}
93
}
90
94
91
.theme-fg-color1,
95
.theme-fg-color1,
92
.cm-s-mozilla .cm-number { /* green */
96
.cm-s-mozilla .cm-number { /* green */
93
  color: #5c9966;
97
  color: @fg1Color@;
94
}
98
}
95
99
96
.theme-fg-color2,
100
.theme-fg-color2,
97
.cm-s-mozilla .cm-attribute,
101
.cm-s-mozilla .cm-attribute,
98
.cm-s-mozilla .cm-variable,
102
.cm-s-mozilla .cm-variable,
99
.cm-s-mozilla .cm-def,
103
.cm-s-mozilla .cm-def,
100
.cm-s-mozilla .cm-property,
104
.cm-s-mozilla .cm-property,
101
.cm-s-mozilla .cm-qualifier { /* blue */
105
.cm-s-mozilla .cm-qualifier { /* blue */
102
  color: #3689b2;
106
  color: @fg2Color@;
103
}
107
}
104
108
105
.theme-fg-color3,
109
.theme-fg-color3,
106
.cm-s-mozilla .cm-builtin,
110
.cm-s-mozilla .cm-builtin,
107
.cm-s-mozilla .cm-tag,
111
.cm-s-mozilla .cm-tag,
108
.cm-s-mozilla .cm-header { /* pink/lavender */
112
.cm-s-mozilla .cm-header { /* pink/lavender */
109
  color: #a673bf;
113
  color: @fg3Color@;
110
}
114
}
111
115
112
.theme-fg-color4 { /* purple/violet */
116
.theme-fg-color4 { /* purple/violet */
113
  color: #6270b2;
117
  color: @fg4Color@;
114
}
118
}
115
119
116
.theme-fg-color5,
120
.theme-fg-color5,
117
.cm-s-mozilla .cm-bracket,
121
.cm-s-mozilla .cm-bracket,
118
.cm-s-mozilla .cm-keyword { /* Yellow */
122
.cm-s-mozilla .cm-keyword { /* Yellow */
119
  color: #a18650;
123
  color: @fg5Color@;
120
}
124
}
121
125
122
.theme-fg-color6,
126
.theme-fg-color6,
123
.cm-s-mozilla .cm-string,
127
.cm-s-mozilla .cm-string,
124
.cm-s-mozilla .cm-string-2 { /* Orange */
128
.cm-s-mozilla .cm-string-2 { /* Orange */
125
  color: #b26b47;
129
  color: @fg6Color@;
126
}
130
}
127
131
128
.theme-fg-color7,
132
.theme-fg-color7,
129
.cm-s-mozilla .cm-atom,
133
.cm-s-mozilla .cm-atom,
130
.cm-s-mozilla .cm-quote,
134
.cm-s-mozilla .cm-quote,
131
.cm-s-mozilla .cm-error { /* Red */
135
.cm-s-mozilla .cm-error { /* Red */
132
  color: #bf5656;
136
  color: @fg7Color@;
133
}
137
}
134
138
135
.theme-toolbar,
139
.theme-toolbar,
136
.devtools-toolbar { /* General toolbar styling */
140
.devtools-toolbar { /* General toolbar styling */
137
  color: hsl(210,30%,85%);
141
  color: hsl(210,30%,85%);
138
  background-image: url(background-noise-toolbar.png), linear-gradient(#3e4750, #3e4750);
142
  background-image: url(background-noise-toolbar.png), linear-gradient(#3e4750, #3e4750);
139
  border-color: #060a0d;
143
  border-color: #060a0d;
140
  box-shadow: 0 1px 0 hsla(204,45%,98%,.05) inset, -1px 0 0 hsla(204,45%,98%,.05) inset, 0 -1px 0 hsla(204,45%,98%,.05) inset;
144
  box-shadow: 0 1px 0 hsla(204,45%,98%,.05) inset, -1px 0 0 hsla(204,45%,98%,.05) inset, 0 -1px 0 hsla(204,45%,98%,.05) inset;
(-)a/browser/themes/shared/devtools/light-theme-colors.inc (+24 lines)
Line     Link Here 
Line 0    Link Here 
1
%if 0
2
/* This Source Code Form is subject to the terms of the Mozilla Public
3
 * License, v. 2.0. If a copy of the MPL was not distributed with this
4
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.*/
5
6
/* View list of colors online with previews:
7
 * https://developer.mozilla.org/en-US/docs/Tools/DevToolsColors; */
8
%endif
9
%define mainBackgroundColor white
10
%define textColor black
11
%define separatorColor #cddae5
12
%define darkerBackgroundColor #EFEFEF
13
%define contrastBackgroundColor black
14
%define selectedColor #CCC
15
%define linkColor hsl(208,56%,40%)
16
%define linkVisitedColor hsl(208,56%,40%)
17
%define commentColor hsl(90,2%,46%)
18
%define fg1Color hsl(72,100%,27%)
19
%define fg2Color hsl(208,56%,40%)
20
%define fg3Color hsl(208,81%,21%)
21
%define fg4Color hsl(24,85%,39%)
22
%define fg5Color #a18650
23
%define fg6Color hsl(24,85%,39%)
24
%define fg7Color #bf5656
(-)a/browser/themes/shared/devtools/light-theme.css (-15 / +19 lines)
Line     Link Here 
 Lines 1-19    Link Here 
1
/* vim:set ts=2 sw=2 sts=2 et: */
1
/* vim:set ts=2 sw=2 sts=2 et: */
2
/* This Source Code Form is subject to the terms of the Mozilla Public
2
/* This Source Code Form is subject to the terms of the Mozilla Public
3
 * License, v. 2.0. If a copy of the MPL was not distributed with this
3
 * License, v. 2.0. If a copy of the MPL was not distributed with this
4
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
5
5
6
/* According to:
6
/* According to:
7
 * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
7
 * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
8
 */
8
 */
9
10
%include light-theme-colors.inc
11
%filter substitution
12
9
.theme-body {
13
.theme-body {
10
  background: white;
14
  background: @mainBackgroundColor@;
11
  color: black;
15
  color: @textColor@;
12
}
16
}
13
17
14
.theme-twisty {
18
.theme-twisty {
15
  cursor: pointer;
19
  cursor: pointer;
16
  width: 14px;
20
  width: 14px;
17
  height: 14px;
21
  height: 14px;
18
  background-repeat: no-repeat;
22
  background-repeat: no-repeat;
19
  background-image: url("chrome://browser/skin/devtools/controls.png");
23
  background-image: url("chrome://browser/skin/devtools/controls.png");
 Lines 39-139    Link Here 
39
  background-position: 0 0;
43
  background-position: 0 0;
40
}
44
}
41
45
42
.theme-checkbox[checked] {
46
.theme-checkbox[checked] {
43
  background-position: -14px 0;
47
  background-position: -14px 0;
44
}
48
}
45
49
46
.theme-selected {
50
.theme-selected {
47
  background-color: #CCC;
51
  background: @selectedColor@;
48
}
52
}
49
53
50
.theme-bg-darker,
54
.theme-bg-darker,
51
.cm-s-mozilla .CodeMirror-gutters {
55
.cm-s-mozilla .CodeMirror-gutters {
52
  background: #EFEFEF;
56
  background: @darkerBackgroundColor@;
53
}
57
}
54
58
55
.theme-bg-contrast { /* contrast bg color to attract attention on a container */
59
.theme-bg-contrast { /* contrast bg color to attract attention on a container */
56
  background: #a18650;
60
  background: @contrastBackgroundColor@;
57
}
61
}
58
62
59
.theme-link,
63
.theme-link,
60
.cm-s-mozilla .cm-link { /* blue */
64
.cm-s-mozilla .cm-link { /* blue */
61
  color: hsl(208,56%,40%);
65
  color: @linkColor@;
62
}
66
}
63
67
64
/*
68
/*
65
 * FIXME: http://bugzil.la/575675 CSS links without :visited set cause assertion
69
 * FIXME: http://bugzil.la/575675 CSS links without :visited set cause assertion
66
 * failures in debug builds.
70
 * failures in debug builds.
67
 */
71
 */
68
.theme-link:visited,
72
.theme-link:visited,
69
.cm-s-mozilla .cm-link:visited { /* blue */
73
.cm-s-mozilla .cm-link:visited { /* blue */
70
  color: hsl(208,56%,40%);
74
  color: @linkVisitedColor@;
71
}
75
}
72
76
73
.theme-comment,
77
.theme-comment,
74
.cm-s-mozilla .cm-meta,
78
.cm-s-mozilla .cm-meta,
75
.cm-s-mozilla .cm-hr,
79
.cm-s-mozilla .cm-hr,
76
.cm-s-mozilla .cm-comment { /* grey */
80
.cm-s-mozilla .cm-comment { /* grey */
77
  color: hsl(90,2%,46%);
81
  color: @commentColor@;
78
}
82
}
79
83
80
.theme-gutter {
84
.theme-gutter {
81
  background-color: hsl(0,0%,90%);
85
  background-color: hsl(0,0%,90%);
82
  color: #667380;
86
  color: #667380;
83
  border-color: hsl(0,0%,65%);
87
  border-color: hsl(0,0%,65%);
84
}
88
}
85
89
86
.theme-separator { /* grey */
90
.theme-separator { /* grey */
87
  border-color: #cddae5;
91
  border-color: #cddae5;
88
}
92
}
89
93
90
.theme-fg-color1,
94
.theme-fg-color1,
91
.cm-s-mozilla .cm-number { /* green */
95
.cm-s-mozilla .cm-number { /* green */
92
  color: hsl(72,100%,27%);
96
  color: @fg1Color@;
93
}
97
}
94
98
95
.theme-fg-color2,
99
.theme-fg-color2,
96
.cm-s-mozilla .cm-attribute,
100
.cm-s-mozilla .cm-attribute,
97
.cm-s-mozilla .cm-builtin,
101
.cm-s-mozilla .cm-builtin,
98
.cm-s-mozilla .cm-def,
102
.cm-s-mozilla .cm-def,
99
.cm-s-mozilla .cm-property,
103
.cm-s-mozilla .cm-property,
100
.cm-s-mozilla .cm-qualifier { /* blue */
104
.cm-s-mozilla .cm-qualifier { /* blue */
101
  color: hsl(208,56%,40%);
105
  color: @fg2Color@;
102
}
106
}
103
107
104
.theme-fg-color3,
108
.theme-fg-color3,
105
.cm-s-mozilla .cm-variable,
109
.cm-s-mozilla .cm-variable,
106
.cm-s-mozilla .cm-tag,
110
.cm-s-mozilla .cm-tag,
107
.cm-s-mozilla .cm-header { /* dark blue */
111
.cm-s-mozilla .cm-header { /* dark blue */
108
  color: hsl(208,81%,21%)
112
  color: @fg3Color@;
109
}
113
}
110
114
111
.theme-fg-color4 { /* Orange */
115
.theme-fg-color4 { /* Orange */
112
  color: hsl(24,85%,39%);
116
  color: @fg4Color@;
113
}
117
}
114
118
115
.theme-fg-color5,
119
.theme-fg-color5,
116
.cm-s-mozilla .cm-bracket,
120
.cm-s-mozilla .cm-bracket,
117
.cm-s-mozilla .cm-keyword { /* Yellow */
121
.cm-s-mozilla .cm-keyword { /* Yellow */
118
  color: #a18650;
122
  color: @fg5Color@;
119
}
123
}
120
124
121
.theme-fg-color6,
125
.theme-fg-color6,
122
.cm-s-mozilla .cm-string,
126
.cm-s-mozilla .cm-string,
123
.cm-s-mozilla .cm-string-2 { /* Orange */
127
.cm-s-mozilla .cm-string-2 { /* Orange */
124
  color: hsl(24,85%,39%);
128
  color: @fg6Color@;
125
}
129
}
126
130
127
.theme-fg-color7,
131
.theme-fg-color7,
128
.cm-s-mozilla .cm-atom,
132
.cm-s-mozilla .cm-atom,
129
.cm-s-mozilla .cm-quote,
133
.cm-s-mozilla .cm-quote,
130
.cm-s-mozilla .cm-error { /* Red */
134
.cm-s-mozilla .cm-error { /* Red */
131
  color: #bf5656;
135
  color: @fg7Color@;
132
}
136
}
133
137
134
.theme-fg-contrast { /* To be used for text on theme-bg-contrast */
138
.theme-fg-contrast { /* To be used for text on theme-bg-contrast */
135
  color: black;
139
  color: black;
136
}
140
}
137
141
138
.theme-toolbar,
142
.theme-toolbar,
139
.devtools-toolbar { /* General toolbar styling */
143
.devtools-toolbar { /* General toolbar styling */

Return to bug 916766