-
Notifications
You must be signed in to change notification settings - Fork 16
/
0018-Ghostery-Theme.patch
444 lines (431 loc) · 12.6 KB
/
0018-Ghostery-Theme.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
From: Krzysztof Jan Modras <chrmod@chrmod.net>
Date: Tue, 9 Mar 2021 15:08:27 +0100
Subject: Ghostery Theme
Fix theme
X
---
toolkit/modules/LightweightThemeConsumer.jsm | 2 +-
.../extensions/default-theme/experiment10.css | 257 ++++++++++++++++++
.../extensions/default-theme/manifest.json | 57 +---
.../extensions/internal/XPIProvider.jsm | 20 +-
toolkit/mozapps/extensions/jar.mn | 1 +
5 files changed, 293 insertions(+), 44 deletions(-)
create mode 100644 toolkit/mozapps/extensions/default-theme/experiment10.css
diff --git a/toolkit/modules/LightweightThemeConsumer.jsm b/toolkit/modules/LightweightThemeConsumer.jsm
index a12dfc7746..f80f2c9db3 100644
--- a/toolkit/modules/LightweightThemeConsumer.jsm
+++ b/toolkit/modules/LightweightThemeConsumer.jsm
@@ -41,7 +41,7 @@ XPCOMUtils.defineLazyPreferenceGetter(
false
);
-const DEFAULT_THEME_ID = "default-theme@mozilla.org";
+const DEFAULT_THEME_ID = "__DOES_NOT_APPLY__"; // in Ghostery Browser default theme is a lightweight theme
// On Linux, the default theme picks up the right colors from dark GTK themes.
const DEFAULT_THEME_RESPECTS_SYSTEM_COLOR_SCHEME =
diff --git a/toolkit/mozapps/extensions/default-theme/experiment10.css b/toolkit/mozapps/extensions/default-theme/experiment10.css
new file mode 100644
index 0000000000..4aac8cba8e
--- /dev/null
+++ b/toolkit/mozapps/extensions/default-theme/experiment10.css
@@ -0,0 +1,257 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+:root {
+ --tab-min-height: 34px !important;
+ --urlbar-height: 34px !important;
+ --urlbar-toolbar-height: 34px !important;
+ --urlbar-container-height: 34px !important;
+ --toolbarbutton-inner-padding: 9px;
+ --toolbarbutton-border-radius: 17px;
+ --tab-border-radius: 17px;
+ --urlbar-icon-padding: 9px !important;
+}
+
+#urlbar-container,
+#search-container {
+ min-height: 34px !important;
+ padding-block: 0px !important;
+}
+
+#urlbar-background {
+ border: 2px solid transparent;
+ border-radius: 17px;
+ padding: 0;
+ background-clip: padding-box;
+ box-sizing: border-box;
+}
+
+#urlbar-background:before {
+ content: ' ';
+ position: absolute;
+ top: 0; right: 0; bottom: 0; left: 0;
+ z-index: -1;
+ margin: -2px;
+ border-radius: inherit;
+ z-index: -1;
+ box-shadow: none;
+}
+
+#urlbar:not([focused="true"]):hover > #urlbar-background,
+#searchbar:not(:focus-within):hover {
+ background-color: #53565B;
+}
+
+#urlbar[focused="true"]:not([suppress-focus-border]) > #urlbar-background {
+ border-color: #42414d;
+}
+
+#urlbar:not([focused="true"]):-moz-lwtheme:hover > #urlbar-background, #navigator-toolbox #searchbar:not(:focus-within):-moz-lwtheme:hover {
+ border-color: #53565B;
+}
+
+#urlbar[focused="true"]:not([suppress-focus-border]) > #urlbar-background, #searchbar:focus-within {
+ outline-color: #53565B
+}
+
+#urlbar[focused="true"] > #urlbar-background {
+ border-radius: 17px;
+ border-color: transparent;
+}
+
+#urlbar[focused="true"] > #urlbar-background:before {
+ background: #53565B;
+}
+
+/*
+ this should not be necessary but animation flashes the :before element background
+*/
+#urlbar[breakout][breakout-extend][breakout-extend-animate] > #urlbar-background {
+ animation-duration: 0ms;
+}
+
+.urlbarView-row:not([type="tip"]):not([type="dynamic"])[selected] > .urlbarView-row-inner {
+ background: #202225;
+}
+
+.urlbarView-url {
+ background: linear-gradient(to right, #74F2B8, #00AEF0);
+ background-clip: text;
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+}
+
+#urlbar, #searchbar {
+ min-height: 34px;
+}
+
+:root[uidensity="compact"] #urlbar, :root[uidensity="compact"] #searchbar {
+ min-height: 28px;
+}
+
+#urlbar-container, #search-container {
+ padding-block: 0;
+}
+
+:root:not([uidensity="compact"]) #back-button {
+ padding-block: 0;
+}
+
+#urlbar[breakout] {
+ top: 0px;
+}
+
+#urlbar[breakout][breakout-extend] > #urlbar-input-container {
+ padding-block: 0;
+ padding-inline: 0;
+}
+
+#urlbar[breakout][breakout-extend] {
+ width: 100%;
+ left: unset;
+}
+
+#navigator-toolbox {
+ border-bottom: none;
+}
+
+:root:not([inFullscreen], [tabsintitlebar]) #nav-bar:not([tabs-hidden="true"]), #nav-bar:not([tabs-hidden="true"]):-moz-lwtheme {
+ box-shadow: none;
+}
+
+#TabsToolbar .toolbarbutton-1, #tabbrowser-arrowscrollbox::part(scrollbutton-up), #tabbrowser-arrowscrollbox::part(scrollbutton-down) {
+ margin: 1px 0 0 0 !important;
+}
+
+#tabbrowser-arrowscrollbox::part(scrollbutton-up), #tabbrowser-arrowscrollbox::part(scrollbutton-down) {
+ border: 0;
+ width: 34px
+}
+
+toolbar .toolbarbutton-1 {
+ padding: 0;
+}
+
+#nav-bar {
+ border-bottom: 0.5px solid rgba(0, 0, 0, 0.15);
+}
+
+#urlbar-input {
+ margin-top: -1px;
+}
+
+.close-icon {
+ opacity: 0.5;
+}
+
+.close-icon:hover {
+ opacity: 1;
+}
+
+.tab-line {
+ height: 0;
+}
+
+:where(#reload-button, #stop-button) > .toolbarbutton-icon, :where(#reload-button, #stop-button) > .toolbarbutton-animatable-box {
+ translate: none !important;
+}
+
+toolbarbutton toolbarbutton-badge-stack {
+ padding: 0 !important;
+}
+
+#urlbar-input-container {
+ border: 0px solid transparent;
+ padding: 0px;
+}
+
+#urlbar-input-container, #searchbar {
+ border-radius: none;
+ height: 34px;
+}
+
+#urlbar[breakout][breakout-extend] > #urlbar-input-container {
+ height: 34px !important;
+}
+
+.identity-box-button {
+ padding: 9px;
+}
+
+.tab-background {
+ border-radius: 0;
+ margin-block: 0;
+}
+
+.urlbarView {
+ margin-inline: 2px;
+ border-inline: unset;
+ width: calc(100% - 4px);
+ padding-bottom: 17px;
+ margin-top: 17px;
+}
+
+#urlbar[open] > .urlbarView > .urlbarView-body-outer > .urlbarView-body-inner {
+ border-top: unset
+}
+
+.urlbarView-results {
+ padding-block: 2px;
+}
+
+.urlbarView-row-inner {
+ padding-inline: 40px;
+}
+
+.urlbarView-results[wrap] > .urlbarView-row[has-url] > .urlbarView-row-inner > .urlbarView-url:-moz-locale-dir(ltr) {
+ padding-left: 30px;
+}
+
+.urlbarView-title {
+ margin-left: 4px;
+}
+
+.urlbarView-row-inner {
+ border-radius: 0;
+}
+
+#urlbar .search-one-offs:not([hidden]) {
+ display: none;
+}
+
+.tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected="true"], [multiselected]) {
+ background-color: #2A2A33;
+}
+
+.tab-label {
+ margin: 0;
+}
+
+.tab-close-button {
+ margin-top: 1px;
+}
+
+toolbar .toolbarbutton-1 > .toolbarbutton-icon {
+ border-radius: 0;
+}
+
+toolbar#nav-bar .toolbarbutton-1 {
+ border-radius: 17px;
+ overflow: clip;
+}
+
+#tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[pinned] {
+ margin-top: 1px !important;
+}
+
+#nav-bar-customization-target > :is(toolbarbutton, toolbaritem):first-child, #nav-bar-customization-target > toolbarpaletteitem:first-child > :is(toolbarbutton, toolbaritem) {
+ padding-inline-start: unset;
+ margin-left: 8px;
+}
+
+.toolbarbutton-badge {
+ border-radius: 4px;
+ margin: -5px 0 0 !important;
+ margin-inline-end: -6px !important;
+}
diff --git a/toolkit/mozapps/extensions/default-theme/manifest.json b/toolkit/mozapps/extensions/default-theme/manifest.json
index 5f62671c5f..87c2c5d049 100644
--- a/toolkit/mozapps/extensions/default-theme/manifest.json
+++ b/toolkit/mozapps/extensions/default-theme/manifest.json
@@ -7,35 +7,32 @@
}
},
- "name": "System theme — auto",
- "description": "Follow the operating system setting for buttons, menus, and windows.",
- "author": "Mozilla",
- "version": "1.3",
+ "name": "Ghostery Private Theme",
+ "description": "",
+ "author": "Ghostery",
+ "version": "1.11",
"icons": {"32": "icon.svg"},
"theme": {
- },
-
- "dark_theme": {
"colors": {
"tab_background_text": "#fbfbfe",
- "tab_selected": "rgb(66,65,77)",
+ "tab_selected": "#36393f",
"tab_text": "rgb(251,251,254)",
"icons": "rgb(251,251,254)",
"frame": "#1c1b22",
- "popup": "rgb(66,65,77)",
+ "popup": "#36393f",
"popup_text": "rgb(251,251,254)",
"popup_border": "rgb(82,82,94)",
"popup_highlight": "rgb(43,42,51)",
- "tab_line": "transparent",
- "toolbar": "#2b2a33",
- "toolbar_top_separator": "transparent",
- "toolbar_bottom_separator": "hsl(240, 5%, 5%)",
- "toolbar_field": "rgb(28,27,34)",
- "toolbar_field_border": "transparent",
+ "tab_line": "#36393f",
+ "toolbar": "#36393f",
+ "toolbar_top_separator": "#12121c",
+ "toolbar_bottom_separator": "#12121c",
+ "toolbar_field": "#45484E",
+ "toolbar_field_border": "#45484E",
"toolbar_field_text": "rgb(251,251,254)",
- "toolbar_field_focus": "rgb(66,65,77)",
+ "toolbar_field_focus": "#36393f",
"toolbar_text": "rgb(251, 251, 254)",
"ntp_background": "rgb(43, 42, 51)",
"ntp_text": "rgb(251, 251, 254)",
@@ -56,7 +53,7 @@
"autocomplete_popup_separator": "rgb(82,82,94)",
"appmenu_update_icon_color": "#54FFBD",
"appmenu_info_icon_color": "#80EBFF",
- "tab_icon_overlay_stroke": "rgb(66,65,77)",
+ "tab_icon_overlay_stroke": "#36393f",
"tab_icon_overlay_fill": "rgb(251,251,254)"
},
"properties": {
@@ -69,30 +66,6 @@
},
"theme_experiment": {
- "colors": {
- "button": "--button-bgcolor",
- "button_hover": "--button-hover-bgcolor",
- "button_active": "--button-active-bgcolor",
- "button_primary": "--button-primary-bgcolor",
- "button_primary_hover": "--button-primary-hover-bgcolor",
- "button_primary_active": "--button-primary-active-bgcolor",
- "button_primary_color": "--button-primary-color",
- "error_text_color": "--error-text-color",
- "input_background": "--input-bgcolor",
- "input_color": "--input-color",
- "input_border": "--input-border-color",
- "autocomplete_popup_separator": "--autocomplete-popup-separator-color",
- "appmenu_update_icon_color": "--panel-banner-item-update-supported-bgcolor",
- "appmenu_info_icon_color": "--panel-banner-item-info-icon-bgcolor",
- "tab_icon_overlay_stroke": "--tab-icon-overlay-stroke",
- "tab_icon_overlay_fill": "--tab-icon-overlay-fill"
- },
- "properties": {
- "panel_hover": "--panel-item-hover-bgcolor",
- "panel_active": "--arrowpanel-dimmed-further",
- "panel_active_darker": "--panel-item-active-bgcolor",
- "toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity",
- "zap_gradient": "--panel-separator-zap-gradient"
- }
+ "stylesheet": "experiment10.css"
}
}
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 39fa8b4208..8b620a3e16 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -2518,7 +2518,7 @@ var XPIProvider = {
}
this.maybeInstallBuiltinAddon(
"default-theme@mozilla.org",
- "1.3",
+ "1.11",
"resource://default-theme/"
);
@@ -2697,6 +2697,10 @@ var XPIProvider = {
logger.error("startup failed", e);
AddonManagerPrivate.recordException("XPI", "startup failed", e);
}
+
+ this.maybeUninstallBuiltinAddon("firefox-compact-light@mozilla.org");
+ this.maybeUninstallBuiltinAddon("firefox-compact-dark@mozilla.org");
+ this.maybeUninstallBuiltinAddon("firefox-alpenglow@mozilla.org");
},
/**
@@ -2977,6 +2981,20 @@ var XPIProvider = {
return installed;
},
+ async maybeUninstallBuiltinAddon(aID) {
+ if (enabledScopes & BuiltInLocation.scope) {
+ let existing = BuiltInLocation.get(aID);
+ if (existing) {
+ (async () => {
+ const addon = await lazy.XPIDatabase.getVisibleAddonForID(aID);
+ XPIStates.removeAddon(XPIInternal.BuiltInLocation, addon);
+ XPIStates.save();
+ lazy.XPIDatabase.removeAddonMetadata(addon);
+ })();
+ }
+ }
+ },
+
getDependentAddons(aAddon) {
return Array.from(lazy.XPIDatabase.getAddons()).filter(addon =>
addon.dependencies.includes(aAddon.id)
diff --git a/toolkit/mozapps/extensions/jar.mn b/toolkit/mozapps/extensions/jar.mn
index 58f25876f2..d8d8008b39 100644
--- a/toolkit/mozapps/extensions/jar.mn
+++ b/toolkit/mozapps/extensions/jar.mn
@@ -25,4 +25,5 @@ toolkit.jar:
% resource default-theme %content/mozapps/extensions/default-theme/
content/mozapps/extensions/default-theme (default-theme/*.svg)
content/mozapps/extensions/default-theme/manifest.json (default-theme/manifest.json)
+ content/mozapps/extensions/default-theme/experiment10.css (default-theme/experiment10.css)
#endif
--
2.37.2