[tbb-commits] [Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 2176: Rebrand Firefox to TorBrowser

18 Sep 2023


      Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
2760a7b8 by Henry Wilkes at 2023-09-18T17:00:13+01:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 41957: Use full tor browser icon for site identity button for internal pages.
Also remove colors in tor-styles.css.
- - - - -
11 changed files:
- − browser/branding/tb-alpha/content/identity-icons-brand.svg
- browser/branding/tb-alpha/content/jar.mn
- − browser/branding/tb-alpha/content/tor-styles.css
- − browser/branding/tb-nightly/content/identity-icons-brand.svg
- browser/branding/tb-nightly/content/jar.mn
- − browser/branding/tb-nightly/content/tor-styles.css
- − browser/branding/tb-release/content/identity-icons-brand.svg
- browser/branding/tb-release/content/jar.mn
- − browser/branding/tb-release/content/tor-styles.css
- browser/themes/shared/browser-shared.css
- browser/themes/shared/identity-block/identity-block.css
Changes:
=====================================
browser/branding/tb-alpha/content/identity-icons-brand.svg deleted
=====================================
@@ -1,8 +0,0 @@
-<svg fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg">
-  <g clip-rule="evenodd" fill-rule="evenodd">
-    <path d="m11 8c0 1.65686-1.34314 3-3 3-1.65685 0-3-1.34314-3-3 0-1.65685 1.34315-3 3-3 1.65686 0 3 1.34315 3 3zm-1.17187 0c0 1.00965-.81848 1.82813-1.82813 1.82813-1.00964 0-1.82812-.81848-1.82812-1.82813 0-1.00964.81848-1.82812 1.82812-1.82812 1.00965 0 1.82813.81848 1.82813 1.82812z"/>
-    <path d="m7.99999 13.25c2.89951 0 5.25001-2.3505 5.25001-5.25001 0-2.89949-2.3505-5.25-5.25001-5.25-2.89949 0-5.25 2.35051-5.25 5.25 0 2.89951 2.35051 5.25001 5.25 5.25001zm0-1.1719c2.25231 0 4.07811-1.8258 4.07811-4.07811 0-2.25228-1.8258-4.07812-4.07811-4.07812-2.25228 0-4.07812 1.82584-4.07812 4.07812 0 2.25231 1.82584 4.07811 4.07812 4.07811z"/>
-    <path d="m8 15.5c4.1421 0 7.5-3.3579 7.5-7.5 0-4.14214-3.3579-7.5-7.5-7.5-4.14214 0-7.5 3.35786-7.5 7.5 0 4.1421 3.35786 7.5 7.5 7.5zm0-1.1719c3.4949 0 6.3281-2.8332 6.3281-6.3281 0-3.49493-2.8332-6.32812-6.3281-6.32812-3.49493 0-6.32812 2.83319-6.32812 6.32812 0 3.4949 2.83319 6.3281 6.32812 6.3281z"/>
-  </g>
-  <path d="m.5 8c0 4.1421 3.35786 7.5 7.5 7.5v-15c-4.14214 0-7.5 3.35786-7.5 7.5z"/>
-</svg>
\ No newline at end of file
=====================================
browser/branding/tb-alpha/content/jar.mn
=====================================
@@ -16,7 +16,5 @@ browser.jar:
   content/branding/icon64.png                    (../default64.png)
   content/branding/icon128.png                   (../default128.png)
   content/branding/icon256.png                   (../default256.png)
-  content/branding/identity-icons-brand.svg
   content/branding/aboutDialog.css
   content/branding/tor-browser-logo.svg
-  content/branding/tor-styles.css
=====================================
browser/branding/tb-alpha/content/tor-styles.css deleted
=====================================
@@ -1,11 +0,0 @@
-/* default theme*/
-:root {
-  --tor-branding-color: var(--teal-70);
-}
-
-/* dark theme */
-@media (prefers-color-scheme: dark) {
-  :root {
-    --tor-branding-color: var(--teal-60);
-  }
-}
=====================================
browser/branding/tb-nightly/content/identity-icons-brand.svg deleted
=====================================
@@ -1,8 +0,0 @@
-<svg fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg">
-  <g clip-rule="evenodd" fill-rule="evenodd">
-    <path d="m11 8c0 1.65686-1.34314 3-3 3-1.65685 0-3-1.34314-3-3 0-1.65685 1.34315-3 3-3 1.65686 0 3 1.34315 3 3zm-1.17187 0c0 1.00965-.81848 1.82813-1.82813 1.82813-1.00964 0-1.82812-.81848-1.82812-1.82813 0-1.00964.81848-1.82812 1.82812-1.82812 1.00965 0 1.82813.81848 1.82813 1.82812z"/>
-    <path d="m7.99999 13.25c2.89951 0 5.25001-2.3505 5.25001-5.25001 0-2.89949-2.3505-5.25-5.25001-5.25-2.89949 0-5.25 2.35051-5.25 5.25 0 2.89951 2.35051 5.25001 5.25 5.25001zm0-1.1719c2.25231 0 4.07811-1.8258 4.07811-4.07811 0-2.25228-1.8258-4.07812-4.07811-4.07812-2.25228 0-4.07812 1.82584-4.07812 4.07812 0 2.25231 1.82584 4.07811 4.07812 4.07811z"/>
-    <path d="m8 15.5c4.1421 0 7.5-3.3579 7.5-7.5 0-4.14214-3.3579-7.5-7.5-7.5-4.14214 0-7.5 3.35786-7.5 7.5 0 4.1421 3.35786 7.5 7.5 7.5zm0-1.1719c3.4949 0 6.3281-2.8332 6.3281-6.3281 0-3.49493-2.8332-6.32812-6.3281-6.32812-3.49493 0-6.32812 2.83319-6.32812 6.32812 0 3.4949 2.83319 6.3281 6.32812 6.3281z"/>
-  </g>
-  <path d="m.5 8c0 4.1421 3.35786 7.5 7.5 7.5v-15c-4.14214 0-7.5 3.35786-7.5 7.5z"/>
-</svg>
\ No newline at end of file
=====================================
browser/branding/tb-nightly/content/jar.mn
=====================================
@@ -16,7 +16,5 @@ browser.jar:
   content/branding/icon64.png                    (../default64.png)
   content/branding/icon128.png                   (../default128.png)
   content/branding/icon256.png                   (../default256.png)
-  content/branding/identity-icons-brand.svg
   content/branding/aboutDialog.css
   content/branding/tor-browser-logo.svg
-  content/branding/tor-styles.css
=====================================
browser/branding/tb-nightly/content/tor-styles.css deleted
=====================================
@@ -1,11 +0,0 @@
-/* default theme*/
-:root {
-  --tor-branding-color: var(--blue-60);
-}
-
-/* dark theme */
-@media (prefers-color-scheme: dark) {
-  :root {
-    --tor-branding-color: var(--blue-40);
-  }
-}
=====================================
browser/branding/tb-release/content/identity-icons-brand.svg deleted
=====================================
@@ -1,8 +0,0 @@
-<svg fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg">
-  <g clip-rule="evenodd" fill-rule="evenodd">
-    <path d="m11 8c0 1.65686-1.34314 3-3 3-1.65685 0-3-1.34314-3-3 0-1.65685 1.34315-3 3-3 1.65686 0 3 1.34315 3 3zm-1.17187 0c0 1.00965-.81848 1.82813-1.82813 1.82813-1.00964 0-1.82812-.81848-1.82812-1.82813 0-1.00964.81848-1.82812 1.82812-1.82812 1.00965 0 1.82813.81848 1.82813 1.82812z"/>
-    <path d="m7.99999 13.25c2.89951 0 5.25001-2.3505 5.25001-5.25001 0-2.89949-2.3505-5.25-5.25001-5.25-2.89949 0-5.25 2.35051-5.25 5.25 0 2.89951 2.35051 5.25001 5.25 5.25001zm0-1.1719c2.25231 0 4.07811-1.8258 4.07811-4.07811 0-2.25228-1.8258-4.07812-4.07811-4.07812-2.25228 0-4.07812 1.82584-4.07812 4.07812 0 2.25231 1.82584 4.07811 4.07812 4.07811z"/>
-    <path d="m8 15.5c4.1421 0 7.5-3.3579 7.5-7.5 0-4.14214-3.3579-7.5-7.5-7.5-4.14214 0-7.5 3.35786-7.5 7.5 0 4.1421 3.35786 7.5 7.5 7.5zm0-1.1719c3.4949 0 6.3281-2.8332 6.3281-6.3281 0-3.49493-2.8332-6.32812-6.3281-6.32812-3.49493 0-6.32812 2.83319-6.32812 6.32812 0 3.4949 2.83319 6.3281 6.32812 6.3281z"/>
-  </g>
-  <path d="m.5 8c0 4.1421 3.35786 7.5 7.5 7.5v-15c-4.14214 0-7.5 3.35786-7.5 7.5z"/>
-</svg>
\ No newline at end of file
=====================================
browser/branding/tb-release/content/jar.mn
=====================================
@@ -16,7 +16,5 @@ browser.jar:
   content/branding/icon64.png                    (../default64.png)
   content/branding/icon128.png                   (../default128.png)
   content/branding/icon256.png                   (../default256.png)
-  content/branding/identity-icons-brand.svg
   content/branding/aboutDialog.css
   content/branding/tor-browser-logo.svg
-  content/branding/tor-styles.css
=====================================
browser/branding/tb-release/content/tor-styles.css deleted
=====================================
@@ -1,11 +0,0 @@
-/* default theme*/
-:root {
-  --tor-branding-color: var(--purple-60);
-}
-
-/* dark theme */
-@media (prefers-color-scheme: dark) {
-  :root {
-    --tor-branding-color: var(--purple-30);
-  }
-}
=====================================
browser/themes/shared/browser-shared.css
=====================================
@@ -23,7 +23,6 @@
 @import url("chrome://browser/skin/customizableui/customizeMode.css");
 @import url("chrome://browser/skin/UITour.css");
 @import url("chrome://browser/skin/browser-colors.css");
-@import url("chrome://branding/content/tor-styles.css");
 @import url("chrome://browser/skin/tor-urlbar-button.css");
 @import url("chrome://browser/skin/onionlocation.css");
=====================================
browser/themes/shared/identity-block/identity-block.css
=====================================
@@ -53,10 +53,6 @@
   border-radius: var(--urlbar-icon-border-radius);
 }
-#identity-box[pageproxystate="valid"].chromeUI #identity-icon-label {
-  color: var(--tor-branding-color);
-}
-
 #identity-icon-label {
   padding-inline-start: 4px;
 }
@@ -151,9 +147,12 @@
 }
#identity-box[pageproxystate="valid"].chromeUI #identity-icon {
-  list-style-image: url(chrome://branding/content/identity-icons-brand.svg);
-  fill: var(--tor-branding-color);
-  fill-opacity: 1;
+  list-style-image: url(chrome://branding/content/icon16.png);
+}
+@media (min-resolution: 1.1dppx) {
+  #identity-box[pageproxystate="valid"].chromeUI #identity-icon {
+    list-style-image: url(chrome://branding/content/icon32.png);
+  }
 }
#identity-box[pageproxystate="valid"].localResource #identity-icon {
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2760a7b8...
-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2760a7b8...
You're receiving this email because of your account on gitlab.torproject.org.





    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

[tbb-commits] [Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 2176: Rebrand Firefox to TorBrowser