Commits:
-
ab9dccd4
by Richard Pospesel at 2023-03-02T12:46:22+00:00
fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
Bug 41659: Add canonical color definitions to base-browser
- commit removes tor-styles.css browser.xhtml so that the base-browser rebase applies correctly
-
60e29559
by Richard Pospesel at 2023-03-02T16:54:12+00:00
Bug 41659: Add canonical color definitions to base-browser !!! 102.9.0esr REBASE NOTE: this commit should appear relatively early in the base-browser branch
-
eaf290eb
by Richard Pospesel at 2023-03-02T16:54:12+00:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 41659: Add canonical color definitions to base-browser
- backout the tor-styles.inc.css additions
- add tor-styles.css to browser-shared.css which is included everywhere
-
b05238e4
by Richard Pospesel at 2023-03-02T16:54:13+00:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Bug 41659: Add canonical color definitions to base-browser
-
0e2be626
by Richard Pospesel at 2023-03-02T16:54:13+00:00
fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
Bug 41659: Add canonical color definitions to base-browser
-
486cbe1f
by Richard Pospesel at 2023-03-02T16:54:13+00:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41659: Add canonical color definitions to base-browser
13 changed files:
Changes:
browser/base/content/browser.xhtml
| ... |
... |
@@ -10,7 +10,6 @@ |
|
10
|
10
|
override rules using selectors with the same specificity. This applies to
|
|
11
|
11
|
both "content" and "skin" packages, which bug 1385444 will unify later. -->
|
|
12
|
12
|
<?xml-stylesheet href="" type="text/css"?>
|
|
13
|
|
-<?xml-stylesheet href="" type="text/css"?>
|
|
14
|
13
|
|
|
15
|
14
|
<!-- While these stylesheets are defined in Toolkit, they are only used in the
|
|
16
|
15
|
main browser window, so we can load them here. Bug 1474241 is on file to
|
browser/branding/alpha/content/jar.mn
| ... |
... |
@@ -20,4 +20,4 @@ browser.jar: |
|
20
|
20
|
content/branding/icon512.png (../default512.png)
|
|
21
|
21
|
content/branding/identity-icons-brand.svg
|
|
22
|
22
|
content/branding/aboutDialog.css
|
|
23
|
|
-* content/branding/tor-styles.css |
|
|
23
|
+ content/branding/tor-styles.css |
browser/branding/alpha/content/tor-styles.css
|
1
|
|
-%include ../../tor-styles.inc.css
|
|
2
|
|
-
|
|
3
|
1
|
/* default theme*/
|
|
4
|
2
|
:root {
|
|
5
|
3
|
--tor-branding-color: var(--teal-70);
|
browser/branding/nightly/content/jar.mn
| ... |
... |
@@ -19,4 +19,4 @@ browser.jar: |
|
19
|
19
|
content/branding/icon512.png (../default512.png)
|
|
20
|
20
|
content/branding/identity-icons-brand.svg
|
|
21
|
21
|
content/branding/aboutDialog.css
|
|
22
|
|
-* content/branding/tor-styles.css |
|
|
22
|
+ content/branding/tor-styles.css |
browser/branding/nightly/content/tor-styles.css
|
1
|
|
-%include ../../tor-styles.inc.css
|
|
2
|
|
-
|
|
3
|
1
|
/* default theme*/
|
|
4
|
2
|
:root {
|
|
5
|
3
|
--tor-branding-color: var(--blue-60);
|
browser/branding/official/content/jar.mn
| ... |
... |
@@ -19,4 +19,4 @@ browser.jar: |
|
19
|
19
|
content/branding/icon512.png (../default512.png)
|
|
20
|
20
|
content/branding/identity-icons-brand.svg
|
|
21
|
21
|
content/branding/aboutDialog.css
|
|
22
|
|
-* content/branding/tor-styles.css |
|
|
22
|
+ content/branding/tor-styles.css |
browser/branding/official/content/tor-styles.css
|
1
|
|
-%include ../../tor-styles.inc.css
|
|
2
|
|
-
|
|
3
|
1
|
/* default theme*/
|
|
4
|
2
|
:root {
|
|
5
|
3
|
--tor-branding-color: var(--purple-60);
|
browser/components/onionservices/content/authPreferences.css
|
1
|
1
|
/* Copyright (c) 2020, The Tor Project, Inc. */
|
|
2
|
2
|
|
|
3
|
|
-@import url("chrome://branding/content/tor-styles.css");
|
|
|
3
|
+@import url("chrome://browser/skin/browser-colors.css");
|
|
4
|
4
|
|
|
5
|
5
|
#torOnionServiceKeys-overview-container {
|
|
6
|
6
|
margin-right: 30px;
|
| ... |
... |
@@ -19,6 +19,6 @@ |
|
19
|
19
|
margin-right: 4px;
|
|
20
|
20
|
list-style-image: url("chrome://global/skin/icons/warning.svg");
|
|
21
|
21
|
-moz-context-properties: fill;
|
|
22
|
|
- fill: var(--torbrowser-warning);
|
|
|
22
|
+ fill: var(--warning-color);
|
|
23
|
23
|
visibility: hidden;
|
|
24
|
24
|
} |
browser/components/torconnect/content/aboutTorConnect.css
| ... |
... |
@@ -2,7 +2,7 @@ |
|
2
|
2
|
/* Copyright (c) 2021, The Tor Project, Inc. */
|
|
3
|
3
|
|
|
4
|
4
|
@import url("chrome://browser/skin/error-pages.css");
|
|
5
|
|
-@import url("chrome://branding/content/tor-styles.css");
|
|
|
5
|
+@import url("chrome://browser/skin/browser-colors.css");
|
|
6
|
6
|
|
|
7
|
7
|
:root {
|
|
8
|
8
|
--onion-opacity: 1;
|
| ... |
... |
@@ -305,5 +305,5 @@ body { |
|
305
|
305
|
|
|
306
|
306
|
.title.location {
|
|
307
|
307
|
background-image: url("chrome://browser/content/torconnect/connection-location.svg");
|
|
308
|
|
- stroke: var(--torbrowser-warning);
|
|
|
308
|
+ stroke: var(--warning-color);
|
|
309
|
309
|
} |
browser/components/torpreferences/content/torPreferences.css
|
1
|
|
-@import url("chrome://branding/content/tor-styles.css");
|
|
|
1
|
+@import url("chrome://browser/skin/browser-colors.css");
|
|
|
2
|
+
|
|
2
|
3
|
|
|
3
|
4
|
#category-connection > .category-icon {
|
|
4
|
5
|
list-style-image: url("chrome://browser/content/torpreferences/torPreferencesIcon.svg");
|
| ... |
... |
@@ -170,7 +171,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { |
|
170
|
171
|
|
|
171
|
172
|
#torPreferences-status-internet-statusIcon.offline, #torPreferences-status-tor-statusIcon:not(.connected) {
|
|
172
|
173
|
list-style-image: url("chrome://global/skin/icons/warning.svg");
|
|
173
|
|
- fill: var(--torbrowser-warning);
|
|
|
174
|
+ fill: var(--warning-color);
|
|
174
|
175
|
}
|
|
175
|
176
|
|
|
176
|
177
|
#torPreferences-status-tor-statusIcon.blocked {
|
| ... |
... |
@@ -557,7 +558,7 @@ hbox#torPreferences-requestBridge-incorrectCaptchaHbox { |
|
557
|
558
|
image#torPreferences-requestBridge-errorIcon {
|
|
558
|
559
|
list-style-image: url("chrome://global/skin/icons/warning.svg");
|
|
559
|
560
|
-moz-context-properties: fill;
|
|
560
|
|
- fill: var(--torbrowser-warning);
|
|
|
561
|
+ fill: var(--warning-color);
|
|
561
|
562
|
}
|
|
562
|
563
|
|
|
563
|
564
|
groupbox#torPreferences-bridges-group textarea {
|
browser/branding/tor-styles.inc.css
→
browser/themes/shared/browser-colors.css
| ... |
... |
@@ -87,11 +87,11 @@ |
|
87
|
87
|
|
|
88
|
88
|
/* TODO: Switch to some Firefox variable, once Mozilla adds one for this
|
|
89
|
89
|
color. Matches --warning-icon-bgcolor (but not on the dark theme variant). */
|
|
90
|
|
- --torbrowser-warning: #ffa436;
|
|
|
90
|
+ --warning-color: #ffa436;
|
|
91
|
91
|
}
|
|
92
|
92
|
|
|
93
|
93
|
@media (prefers-color-scheme: dark) {
|
|
94
|
94
|
:root {
|
|
95
|
|
- --torbrowser-warning: #ffbd4f;
|
|
|
95
|
+ --warning-color: #ffbd4f;
|
|
96
|
96
|
}
|
|
97
|
|
-} |
|
|
97
|
+} |
|
|
\ No newline at end of file |
browser/themes/shared/browser-shared.css
| ... |
... |
@@ -23,6 +23,8 @@ |
|
23
|
23
|
@import url("chrome://browser/skin/UITour.css");
|
|
24
|
24
|
@import url("chrome://browser/skin/torconnect-urlbar.css");
|
|
25
|
25
|
@import url("chrome://browser/skin/onionlocation.css");
|
|
|
26
|
+@import url("chrome://browser/skin/browser-colors.css");
|
|
|
27
|
+@import url("chrome://branding/content/tor-styles.css");
|
|
26
|
28
|
|
|
27
|
29
|
@namespace html url("http://www.w3.org/1999/xhtml");
|
|
28
|
30
|
|
browser/themes/shared/jar.inc.mn
| ... |
... |
@@ -17,6 +17,7 @@ |
|
17
|
17
|
skin/classic/browser/autocomplete.css (../shared/autocomplete.css)
|
|
18
|
18
|
skin/classic/browser/blockedSite.css (../shared/blockedSite.css)
|
|
19
|
19
|
skin/classic/browser/browser-shared.css (../shared/browser-shared.css)
|
|
|
20
|
+ skin/classic/browser/browser-colors.css (../shared/browser-colors.css)
|
|
20
|
21
|
skin/classic/browser/ctrlTab.css (../shared/ctrlTab.css)
|
|
21
|
22
|
skin/classic/browser/light-dark-overrides.css (../shared/light-dark-overrides.css)
|
|
22
|
23
|
skin/classic/browser/error-pages.css (../shared/error-pages.css)
|
|