March 2023 - tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.5-1] Bug 41659: Add canonical color definitions to base-browser !!! 102.9.0esr...
by Richard Pospesel (＠richard) 02 Mar '23

02 Mar '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 7d26a0ae by Richard Pospesel at 2023-03-02T17:19:05+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 - - - - - 3 changed files: - + browser/themes/shared/browser-colors.css - browser/themes/shared/browser-shared.css - browser/themes/shared/jar.inc.mn Changes: ===================================== browser/themes/shared/browser-colors.css ===================================== @@ -0,0 +1,97 @@ +:root { + /* photon colors, not all of them are available for whatever reason + in firefox, so here they are */ + + --magenta-50: #ff1ad9; + --magenta-60: #ed00b5; + --magenta-70: #b5007f; + --magenta-80: #7d004f; + --magenta-90: #440027; + + --purple-30: #c069ff; + --purple-40: #ad3bff; + --purple-50: #9400ff; + --purple-60: #8000d7; + --purple-70: #6200a4; + --purple-80: #440071; + --purple-90: #25003e; + + --blue-40: #45a1ff; + --blue-50: #0a84ff; + --blue-50-a30: rgba(10, 132, 255, 0.3); + --blue-60: #0060df; + --blue-70: #003eaa; + --blue-80: #002275; + --blue-90: #000f40; + + --teal-50: #00feff; + --teal-60: #00c8d7; + --teal-70: #008ea4; + --teal-80: #005a71; + --teal-90: #002d3e; + + --green-50: #30e60b; + --green-60: #12bc00; + --green-70: #058b00; + --green-80: #006504; + --green-90: #003706; + + --yellow-50: #ffe900; + --yellow-60: #d7b600; + --yellow-70: #a47f00; + --yellow-80: #715100; + --yellow-90: #3e2800; + + --red-50: #ff0039; + --red-60: #d70022; + --red-70: #a4000f; + --red-80: #5a0002; + --red-90: #3e0200; + + --orange-50: #ff9400; + --orange-60: #d76e00; + --orange-70: #a44900; + --orange-80: #712b00; + --orange-90: #3e1300; + + --grey-10: #f9f9fa; + --grey-10-a10: rgba(249, 249, 250, 0.1); + --grey-10-a20: rgba(249, 249, 250, 0.2); + --grey-10-a40: rgba(249, 249, 250, 0.4); + --grey-10-a60: rgba(249, 249, 250, 0.6); + --grey-10-a80: rgba(249, 249, 250, 0.8); + --grey-20: #ededf0; + --grey-30: #d7d7db; + --grey-40: #b1b1b3; + --grey-50: #737373; + --grey-60: #4a4a4f; + --grey-70: #38383d; + --grey-80: #2a2a2e; + --grey-90: #0c0c0d; + --grey-90-a05: rgba(12, 12, 13, 0.05); + --grey-90-a10: rgba(12, 12, 13, 0.1); + --grey-90-a20: rgba(12, 12, 13, 0.2); + --grey-90-a30: rgba(12, 12, 13, 0.3); + --grey-90-a40: rgba(12, 12, 13, 0.4); + --grey-90-a50: rgba(12, 12, 13, 0.5); + --grey-90-a60: rgba(12, 12, 13, 0.6); + --grey-90-a70: rgba(12, 12, 13, 0.7); + --grey-90-a80: rgba(12, 12, 13, 0.8); + --grey-90-a90: rgba(12, 12, 13, 0.9); + + --ink-70: #363959; + --ink-80: #202340; + --ink-90: #0f1126; + + --white-100: #ffffff; + + /* TODO: Switch to some Firefox variable, once Mozilla adds one for this + color. Matches --warning-icon-bgcolor (but not on the dark theme variant). */ + --warning-color: #ffa436; +} + +@media (prefers-color-scheme: dark) { + :root { + --warning-color: #ffbd4f; + } +} \ No newline at end of file ===================================== browser/themes/shared/browser-shared.css ===================================== @@ -21,6 +21,7 @@ @import url("chrome://browser/skin/ctrlTab.css"); @import url("chrome://browser/skin/customizableui/customizeMode.css"); @import url("chrome://browser/skin/UITour.css"); +@import url("chrome://browser/skin/browser-colors.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/-/commit/7d26a0a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7d26a0a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] 6 commits: fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by Richard Pospesel (＠richard) 02 Mar '23

02 Mar '23

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/6518ee… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6518ee… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-android-service][main] Bug 40800: Add WebTunnel support
by boklm (＠boklm) 02 Mar '23

02 Mar '23

boklm pushed to branch main at The Tor Project / Applications / tor-android-service Commits: 0438a9a4 by Shelikhoo at 2023-03-02T13:11:36+00:00 Bug 40800: Add WebTunnel support - - - - - 1 changed file: - service/src/main/java/org/torproject/android/service/TorService.java Changes: ===================================== service/src/main/java/org/torproject/android/service/TorService.java ===================================== @@ -379,8 +379,10 @@ public final class TorService extends Service implements TorServiceConstants, Or if(!pluggableTransportSnow.canExecute()) pluggableTransportSnow.setExecutable(true); File pluggableTransportConjure = new File(nativeDir, "libConjure.so"); if(!pluggableTransportConjure.canExecute()) pluggableTransportConjure.setExecutable(true); + File pluggableTransportWebtunnel = new File(nativeDir, "libWebtunnel.so"); + if(!pluggableTransportWebtunnel.canExecute()) pluggableTransportWebtunnel.setExecutable(true); - builder.configurePluggableTransportsFromSettings(pluggableTransportObfs, pluggableTransportSnow, pluggableTransportConjure); + builder.configurePluggableTransportsFromSettings(pluggableTransportObfs, pluggableTransportSnow, pluggableTransportConjure, pluggableTransportWebtunnel); mDataService.updateConfigBuilder(builder); onionProxyManager.getTorInstaller().updateTorConfigCustom (builder.asString()); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-android-service/-/commit… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-android-service/-/commit… You're receiving this email because of your account on gitlab.torproject.org.

1 0