Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits: 24e44e33 by Richard Pospesel at 2023-03-02T16:41:37+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

- - - - - d643fcd1 by Richard Pospesel at 2023-03-02T17:00:38+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

- - - - - e74b4acd by Richard Pospesel at 2023-03-02T17:12:25+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

- - - - - 068750f3 by Richard Pospesel at 2023-03-02T17:12:26+00:00 fixup! Bug 30237: Add v3 onion services client authentication prompt

Bug 41659: Add canonical color definitions to base-browser

- - - - - 157540ad by Richard Pospesel at 2023-03-02T17:12:26+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser

Bug 41659: Add canonical color definitions to base-browser

- - - - - 715ba5fa by Richard Pospesel at 2023-03-02T17:12:26+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:

- browser/base/content/browser.xhtml - browser/branding/tb-alpha/content/jar.mn - browser/branding/tb-alpha/content/tor-styles.css - browser/branding/tb-nightly/content/jar.mn - browser/branding/tb-nightly/content/tor-styles.css - browser/branding/tb-release/content/jar.mn - browser/branding/tb-release/content/tor-styles.css - browser/components/onionservices/content/authPreferences.css - browser/components/torconnect/content/aboutTorConnect.css - browser/components/torpreferences/content/torPreferences.css - browser/branding/tor-styles.inc.css → browser/themes/shared/browser-colors.css - browser/themes/shared/browser-shared.css - browser/themes/shared/jar.inc.mn

Changes:

===================================== browser/base/content/browser.xhtml ===================================== @@ -10,7 +10,6 @@ override rules using selectors with the same specificity. This applies to both "content" and "skin" packages, which bug 1385444 will unify later. --> <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> -<?xml-stylesheet href="chrome://branding/content/tor-styles.css" type="text/css"?>

<!-- While these stylesheets are defined in Toolkit, they are only used in the main browser window, so we can load them here. Bug 1474241 is on file to

===================================== browser/branding/tb-alpha/content/jar.mn ===================================== @@ -18,4 +18,4 @@ browser.jar: content/branding/icon256.png (../default256.png) content/branding/identity-icons-brand.svg content/branding/aboutDialog.css -* content/branding/tor-styles.css + content/branding/tor-styles.css

===================================== browser/branding/tb-alpha/content/tor-styles.css ===================================== @@ -1,5 +1,3 @@ -%include ../../tor-styles.inc.css - /* default theme*/ :root { --tor-branding-color: var(--teal-70);

===================================== browser/branding/tb-nightly/content/jar.mn ===================================== @@ -18,4 +18,4 @@ browser.jar: content/branding/icon256.png (../default256.png) content/branding/identity-icons-brand.svg content/branding/aboutDialog.css -* content/branding/tor-styles.css + content/branding/tor-styles.css

===================================== browser/branding/tb-nightly/content/tor-styles.css ===================================== @@ -1,5 +1,3 @@ -%include ../../tor-styles.inc.css - /* default theme*/ :root { --tor-branding-color: var(--blue-60);

===================================== browser/branding/tb-release/content/jar.mn ===================================== @@ -18,4 +18,4 @@ browser.jar: content/branding/icon256.png (../default256.png) content/branding/identity-icons-brand.svg content/branding/aboutDialog.css -* content/branding/tor-styles.css + content/branding/tor-styles.css

===================================== browser/branding/tb-release/content/tor-styles.css ===================================== @@ -1,5 +1,3 @@ -%include ../../tor-styles.inc.css - /* default theme*/ :root { --tor-branding-color: var(--purple-60);

===================================== browser/components/onionservices/content/authPreferences.css ===================================== @@ -1,6 +1,6 @@ /* Copyright (c) 2020, The Tor Project, Inc. */

-@import url("chrome://branding/content/tor-styles.css"); +@import url("chrome://browser/skin/browser-colors.css");

#torOnionServiceKeys-overview-container { margin-right: 30px; @@ -19,6 +19,6 @@ margin-right: 4px; list-style-image: url("chrome://global/skin/icons/warning.svg"); -moz-context-properties: fill; - fill: var(--torbrowser-warning); + fill: var(--warning-color); visibility: hidden; }

===================================== browser/components/torconnect/content/aboutTorConnect.css ===================================== @@ -2,7 +2,7 @@ /* Copyright (c) 2021, The Tor Project, Inc. */

@import url("chrome://browser/skin/error-pages.css"); -@import url("chrome://branding/content/tor-styles.css"); +@import url("chrome://browser/skin/browser-colors.css");

:root { --onion-opacity: 1; @@ -317,5 +317,5 @@ body {

.title.location { background-image: url("chrome://browser/content/torconnect/connection-location.svg"); - stroke: var(--torbrowser-warning); + stroke: var(--warning-color); }

===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -1,4 +1,5 @@ -@import url("chrome://branding/content/tor-styles.css"); +@import url("chrome://browser/skin/browser-colors.css"); +

#category-connection > .category-icon { list-style-image: url("chrome://browser/content/torpreferences/torPreferencesIcon.svg"); @@ -170,7 +171,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before {

#torPreferences-status-internet-statusIcon.offline, #torPreferences-status-tor-statusIcon:not(.connected) { list-style-image: url("chrome://global/skin/icons/warning.svg"); - fill: var(--torbrowser-warning); + fill: var(--warning-color); }

#torPreferences-status-tor-statusIcon.blocked { @@ -563,7 +564,7 @@ hbox#torPreferences-requestBridge-incorrectCaptchaHbox { image#torPreferences-requestBridge-errorIcon { list-style-image: url("chrome://global/skin/icons/warning.svg"); -moz-context-properties: fill; - fill: var(--torbrowser-warning); + fill: var(--warning-color); }

groupbox#torPreferences-bridges-group textarea {

===================================== browser/branding/tor-styles.inc.css → browser/themes/shared/browser-colors.css ===================================== @@ -87,11 +87,11 @@

/* TODO: Switch to some Firefox variable, once Mozilla adds one for this color. Matches --warning-icon-bgcolor (but not on the dark theme variant). */ - --torbrowser-warning: #ffa436; + --warning-color: #ffa436; }

@media (prefers-color-scheme: dark) { :root { - --torbrowser-warning: #ffbd4f; + --warning-color: #ffbd4f; } -} +} \ No newline at end of file

===================================== browser/themes/shared/browser-shared.css ===================================== @@ -23,6 +23,8 @@ @import url("chrome://browser/skin/UITour.css"); @import url("chrome://browser/skin/torconnect-urlbar.css"); @import url("chrome://browser/skin/onionlocation.css"); +@import url("chrome://browser/skin/browser-colors.css"); +@import url("chrome://branding/content/tor-styles.css");

@namespace html url("http://www.w3.org/1999/xhtml");

===================================== browser/themes/shared/jar.inc.mn ===================================== @@ -17,6 +17,7 @@ skin/classic/browser/autocomplete.css (../shared/autocomplete.css) skin/classic/browser/blockedSite.css (../shared/blockedSite.css) skin/classic/browser/browser-shared.css (../shared/browser-shared.css) + skin/classic/browser/browser-colors.css (../shared/browser-colors.css) skin/classic/browser/ctrlTab.css (../shared/ctrlTab.css) skin/classic/browser/light-dark-overrides.css (../shared/light-dark-overrides.css) skin/classic/browser/error-pages.css (../shared/error-pages.css)

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6518ee5...