morgan pushed to branch tor-browser-153.1.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: 08c0751c by Henry Wilkes at 2026-08-18T12:29:25+00:00 fixup! TB 2176: Rebrand Firefox to TorBrowser TB 44998: Tidy up branding assets. + We drop the assets that we expect to be unused. + We update `about-logo.png` and `about-logo@2x.png` based on `about-logo.svg` using `rsvg-convert`. + We drop our override of the about dialog logo. + We add `about-logo-small.svg`, which is a copy of `about-logo.svg` excluding the "alpha" and "moon" bitmaps. And we use this in place of `about-logo.png` in `about:preferences`, `about:addons`, and other consumers of `moz-page-nav`. - - - - - 22 changed files: - + browser/branding/tb-alpha/content/about-logo-small.svg - browser/branding/tb-alpha/content/about-logo.png - browser/branding/tb-alpha/content/about-logo@2x.png - − browser/branding/tb-alpha/content/about.png - browser/branding/tb-alpha/content/aboutDialog.css - − browser/branding/tb-alpha/content/firefox-wordmark.svg - browser/branding/tb-alpha/content/jar.mn - + browser/branding/tb-nightly/content/about-logo-small.svg - browser/branding/tb-nightly/content/about-logo.png - browser/branding/tb-nightly/content/about-logo@2x.png - − browser/branding/tb-nightly/content/about.png - browser/branding/tb-nightly/content/aboutDialog.css - − browser/branding/tb-nightly/content/firefox-wordmark.svg - browser/branding/tb-nightly/content/jar.mn - + browser/branding/tb-release/content/about-logo-small.svg - browser/branding/tb-release/content/about-logo.png - browser/branding/tb-release/content/about-logo@2x.png - − browser/branding/tb-release/content/about.png - browser/branding/tb-release/content/aboutDialog.css - − browser/branding/tb-release/content/firefox-wordmark.svg - browser/branding/tb-release/content/jar.mn - toolkit/content/widgets/moz-page-nav/moz-page-nav.css Changes: ===================================== browser/branding/tb-alpha/content/about-logo-small.svg ===================================== @@ -0,0 +1,20 @@ +<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> +<path d="M24 46.5C36.4264 46.5 46.5 36.4264 46.5 24C46.5 11.5736 36.4264 1.5 24 1.5C11.5736 1.5 1.5 11.5736 1.5 24C1.5 36.4264 11.5736 46.5 24 46.5Z" fill="url(#paint0_linear_1920_3895)"/> +<path d="M24 5.54297C34.1935 5.54297 42.457 13.8065 42.457 24C42.457 34.1935 34.1935 42.457 24 42.457V39.6445C32.6402 39.6445 39.6445 32.6402 39.6445 24C39.6445 15.3598 32.6402 8.35547 24 8.35547V5.54297Z" fill="#CCFFEE"/> +<path d="M24 12.4424C30.3831 12.4424 35.5576 17.6169 35.5576 24C35.5576 30.3831 30.3831 35.5576 24 35.5576V32.7451C28.8298 32.7451 32.7451 28.8298 32.7451 24C32.7451 19.1702 28.8298 15.2549 24 15.2549V12.4424Z" fill="#CCFFEE"/> +<path d="M24 19.21C26.6455 19.21 28.79 21.3545 28.79 24C28.79 26.6455 26.6455 28.79 24 28.79V19.21Z" fill="#CCFFEE"/> +<path d="M24 1.5C12.7386 1.5 3.60938 10.6685 3.60938 21.9785C3.60938 33.2885 12.7386 42.457 24 42.457V1.5Z" fill="#0BDA95" fill-opacity="0.4"/> +<path d="M24 1.5C32.2194 1.5 39.4094 5.90728 43.3357 12.4875V21.9785C43.3892 33.2884 34.6788 42.457 24 42.457L24 1.5Z" fill="url(#paint1_linear_1920_3895)"/> +<defs> +<linearGradient id="paint0_linear_1920_3895" x1="24" y1="46.5" x2="24" y2="1.5" gradientUnits="userSpaceOnUse"> +<stop offset="0.333333" stop-color="#08917A"/> +<stop offset="1" stop-color="#17CF91"/> +</linearGradient> +<linearGradient id="paint1_linear_1920_3895" x1="24" y1="21.9785" x2="43.3359" y2="21.9785" gradientUnits="userSpaceOnUse"> +<stop stop-color="#008055" stop-opacity="0.4"/> +<stop offset="0.166667" stop-color="#008055" stop-opacity="0.4"/> +<stop offset="0.333333" stop-color="#008055" stop-opacity="0.2"/> +<stop offset="0.5" stop-color="#008055" stop-opacity="0"/> +</linearGradient> +</defs> +</svg> ===================================== browser/branding/tb-alpha/content/about-logo.png ===================================== Binary files a/browser/branding/tb-alpha/content/about-logo.png and b/browser/branding/tb-alpha/content/about-logo.png differ ===================================== browser/branding/tb-alpha/content/about-logo@2x.png ===================================== Binary files a/browser/branding/tb-alpha/content/about-logo@2x.png and b/browser/branding/tb-alpha/content/about-logo@2x.png differ ===================================== browser/branding/tb-alpha/content/about.png deleted ===================================== Binary files a/browser/branding/tb-alpha/content/about.png and /dev/null differ ===================================== browser/branding/tb-alpha/content/aboutDialog.css ===================================== @@ -9,8 +9,3 @@ --about-dialog-background-color-bottom: hsla(235, 43%, 10%, 0.5); --about-dialog-text-color-trademark: #999999; } - -#leftBox { - background-image: url("chrome://branding/content/icon256.png"); - background-position-y: 0; -} ===================================== browser/branding/tb-alpha/content/firefox-wordmark.svg deleted ===================================== @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="172" height="42"><path fill="context-fill #20123a" d="M.19 2.82h25.72v7H7.57v9.43h18.34v6.9H7.57v15.14H.19zM34.65.13a4.14 4.14 0 0 1 4.27 4.33 4.12 4.12 0 0 1-4.32 4.32 4.09 4.09 0 0 1-4.27-4.22A4.27 4.27 0 0 1 34.65.13zM31 12.83h7.27v28.46H31zm28.35 7.91a5.89 5.89 0 0 0-3.53-1.27c-3 0-4.64 1.9-4.64 6.06v15.76H44V12.83h6.9v4.11a6.79 6.79 0 0 1 6.8-4.37A8.69 8.69 0 0 1 62.53 14zm3 6.48c0-8.17 6.06-15 14.65-15s14.59 6.06 14.59 14.49v3H69.48c.79 3.58 3.58 6 7.85 6a7.62 7.62 0 0 0 7.06-4.21l6.06 3.63c-3 4.43-7.27 6.75-13.33 6.75-9.22-.01-14.75-6.18-14.75-14.66zM69.59 24h15c-.79-3.63-3.74-5.63-7.59-5.63A7.31 7.31 0 0 0 69.59 24zM93.4 12.83h5.11v-1.42c0-7.75 3.27-11 10.44-11h2.53v6.31h-2.06c-3.37 0-4.11 1.16-4.11 4.69v1.42h6.17v6.54h-6v21.92h-7V19.37H93.4zm19.45 14.23a14.56 14.56 0 0 1 14.85-14.81 14.81 14.81 0 1 1 0 29.62c-8.85 0-14.85-6.49-14.85-14.81zm22.65 0a7.8 7.8 0 1 0-15.59 0 7.8 7.8 0 1 0 15.59 0zm16.86-.32l-10.27-13.91h8.53l6.06 8.75 6.22-8.75h8.38l-10.43 13.86 11 14.6h-8.49L156.53 32l-6.59 9.28h-8.48z"/></svg> \ No newline at end of file ===================================== browser/branding/tb-alpha/content/jar.mn ===================================== @@ -4,14 +4,13 @@ browser.jar: % content branding %content/branding/ contentaccessible=yes - content/branding/about.png content/branding/about-logo.png content/branding/about-logo.svg + content/branding/about-logo-small.svg content/branding/about-logo@2x.png content/branding/about-wordmark.svg content/branding/document.ico (../document.ico) content/branding/document_pdf.svg - content/branding/firefox-wordmark.svg content/branding/icon16.png (../default16.png) content/branding/icon32.png (../default32.png) content/branding/icon48.png (../default48.png) ===================================== browser/branding/tb-nightly/content/about-logo-small.svg ===================================== @@ -0,0 +1,20 @@ +<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> +<path d="M24 46.5C36.4264 46.5 46.5 36.4264 46.5 24C46.5 11.5736 36.4264 1.5 24 1.5C11.5736 1.5 1.5 11.5736 1.5 24C1.5 36.4264 11.5736 46.5 24 46.5Z" fill="url(#paint0_linear_1920_3996)"/> +<path d="M24 5.54297C34.1935 5.54297 42.457 13.8065 42.457 24C42.457 34.1935 34.1935 42.457 24 42.457V39.6445C32.6402 39.6445 39.6445 32.6402 39.6445 24C39.6445 15.3598 32.6402 8.35547 24 8.35547V5.54297Z" fill="#D4CCFF"/> +<path d="M24 12.4424C30.3831 12.4424 35.5576 17.6169 35.5576 24C35.5576 30.3831 30.3831 35.5576 24 35.5576V32.7451C28.8298 32.7451 32.7451 28.8298 32.7451 24C32.7451 19.1702 28.8298 15.2549 24 15.2549V12.4424Z" fill="#D4CCFF"/> +<path d="M24 19.21C26.6455 19.21 28.79 21.3545 28.79 24C28.79 26.6455 26.6455 28.79 24 28.79V19.21Z" fill="#D4CCFF"/> +<path d="M24 1.5C12.7386 1.5 3.60938 10.6685 3.60938 21.9785C3.60938 33.2885 12.7386 42.457 24 42.457V1.5Z" fill="#7F66FF" fill-opacity="0.4"/> +<path d="M24 1.5C32.2194 1.5 39.4094 5.90728 43.3357 12.4875V21.9785C43.3892 33.2884 34.6788 42.457 24 42.457L24 1.5Z" fill="url(#paint1_linear_1920_3996)"/> +<defs> +<linearGradient id="paint0_linear_1920_3996" x1="24" y1="46.5" x2="24" y2="1.5" gradientUnits="userSpaceOnUse"> +<stop offset="0.333333" stop-color="#482DD2"/> +<stop offset="1" stop-color="#8B47EB"/> +</linearGradient> +<linearGradient id="paint1_linear_1920_3996" x1="24" y1="21.9785" x2="43.3359" y2="21.9785" gradientUnits="userSpaceOnUse"> +<stop stop-color="#150080" stop-opacity="0.4"/> +<stop offset="0.166667" stop-color="#150080" stop-opacity="0.4"/> +<stop offset="0.333333" stop-color="#150080" stop-opacity="0.2"/> +<stop offset="0.5" stop-color="#150080" stop-opacity="0"/> +</linearGradient> +</defs> +</svg> ===================================== browser/branding/tb-nightly/content/about-logo.png ===================================== Binary files a/browser/branding/tb-nightly/content/about-logo.png and b/browser/branding/tb-nightly/content/about-logo.png differ ===================================== browser/branding/tb-nightly/content/about-logo@2x.png ===================================== Binary files a/browser/branding/tb-nightly/content/about-logo@2x.png and b/browser/branding/tb-nightly/content/about-logo@2x.png differ ===================================== browser/branding/tb-nightly/content/about.png deleted ===================================== Binary files a/browser/branding/tb-nightly/content/about.png and /dev/null differ ===================================== browser/branding/tb-nightly/content/aboutDialog.css ===================================== @@ -9,8 +9,3 @@ --about-dialog-background-color-bottom: hsla(235, 43%, 10%, 0.5); --about-dialog-text-color-trademark: #999999; } - -#leftBox { - background-image: url("chrome://branding/content/icon256.png"); - background-position-y: 0; -} ===================================== browser/branding/tb-nightly/content/firefox-wordmark.svg deleted ===================================== @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="172" height="42"><path fill="context-fill #20123a" d="M.19 2.82h25.72v7H7.57v9.43h18.34v6.9H7.57v15.14H.19zM34.65.13a4.14 4.14 0 0 1 4.27 4.33 4.12 4.12 0 0 1-4.32 4.32 4.09 4.09 0 0 1-4.27-4.22A4.27 4.27 0 0 1 34.65.13zM31 12.83h7.27v28.46H31zm28.35 7.91a5.89 5.89 0 0 0-3.53-1.27c-3 0-4.64 1.9-4.64 6.06v15.76H44V12.83h6.9v4.11a6.79 6.79 0 0 1 6.8-4.37A8.69 8.69 0 0 1 62.53 14zm3 6.48c0-8.17 6.06-15 14.65-15s14.59 6.06 14.59 14.49v3H69.48c.79 3.58 3.58 6 7.85 6a7.62 7.62 0 0 0 7.06-4.21l6.06 3.63c-3 4.43-7.27 6.75-13.33 6.75-9.22-.01-14.75-6.18-14.75-14.66zM69.59 24h15c-.79-3.63-3.74-5.63-7.59-5.63A7.31 7.31 0 0 0 69.59 24zM93.4 12.83h5.11v-1.42c0-7.75 3.27-11 10.44-11h2.53v6.31h-2.06c-3.37 0-4.11 1.16-4.11 4.69v1.42h6.17v6.54h-6v21.92h-7V19.37H93.4zm19.45 14.23a14.56 14.56 0 0 1 14.85-14.81 14.81 14.81 0 1 1 0 29.62c-8.85 0-14.85-6.49-14.85-14.81zm22.65 0a7.8 7.8 0 1 0-15.59 0 7.8 7.8 0 1 0 15.59 0zm16.86-.32l-10.27-13.91h8.53l6.06 8.75 6.22-8.75h8.38l-10.43 13.86 11 14.6h-8.49L156.53 32l-6.59 9.28h-8.48z"/></svg> \ No newline at end of file ===================================== browser/branding/tb-nightly/content/jar.mn ===================================== @@ -4,14 +4,13 @@ browser.jar: % content branding %content/branding/ contentaccessible=yes - content/branding/about.png content/branding/about-logo.png content/branding/about-logo.svg + content/branding/about-logo-small.svg content/branding/about-logo@2x.png content/branding/about-wordmark.svg content/branding/document.ico (../document.ico) content/branding/document_pdf.svg - content/branding/firefox-wordmark.svg content/branding/icon16.png (../default16.png) content/branding/icon32.png (../default32.png) content/branding/icon48.png (../default48.png) ===================================== browser/branding/tb-release/content/about-logo-small.svg ===================================== @@ -0,0 +1,20 @@ +<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M24 46.5C36.4264 46.5 46.5 36.4264 46.5 24C46.5 11.5736 36.4264 1.5 24 1.5C11.5736 1.5 1.5 11.5736 1.5 24C1.5 36.4264 11.5736 46.5 24 46.5Z" fill="url(#paint0_linear_1920_3864)"/> +<path d="M24 5.54297C34.1935 5.54297 42.457 13.8065 42.457 24C42.457 34.1935 34.1935 42.457 24 42.457V39.6445C32.6402 39.6445 39.6445 32.6402 39.6445 24C39.6445 15.3598 32.6402 8.35547 24 8.35547V5.54297Z" fill="#EACCFF"/> +<path d="M24 12.4424C30.3831 12.4424 35.5576 17.6169 35.5576 24C35.5576 30.3831 30.3831 35.5576 24 35.5576V32.7451C28.8298 32.7451 32.7451 28.8298 32.7451 24C32.7451 19.1702 28.8298 15.2549 24 15.2549V12.4424Z" fill="#EACCFF"/> +<path d="M24 19.21C26.6455 19.21 28.79 21.3545 28.79 24C28.79 26.6455 26.6455 28.79 24 28.79V19.21Z" fill="#EACCFF"/> +<path d="M24 1.5C12.7386 1.5 3.60938 10.6685 3.60938 21.9785C3.60938 33.2885 12.7386 42.457 24 42.457V1.5Z" fill="#BE6EF7" fill-opacity="0.4"/> +<path d="M24 1.5C32.2194 1.5 39.4094 5.90728 43.3357 12.4875V21.9785C43.3892 33.2884 34.6788 42.457 24 42.457L24 1.5Z" fill="url(#paint1_linear_1920_3864)"/> +<defs> +<linearGradient id="paint0_linear_1920_3864" x1="24" y1="46.5" x2="24" y2="1.5" gradientUnits="userSpaceOnUse"> +<stop offset="0.333333" stop-color="#730BDA"/> +<stop offset="1" stop-color="#B83DF5"/> +</linearGradient> +<linearGradient id="paint1_linear_1920_3864" x1="24" y1="21.9785" x2="43.3357" y2="21.9785" gradientUnits="userSpaceOnUse"> +<stop stop-color="#550080" stop-opacity="0.4"/> +<stop offset="0.166667" stop-color="#550080" stop-opacity="0.4"/> +<stop offset="0.333333" stop-color="#550080" stop-opacity="0.2"/> +<stop offset="0.5" stop-color="#550080" stop-opacity="0"/> +</linearGradient> +</defs> +</svg> ===================================== browser/branding/tb-release/content/about-logo.png ===================================== Binary files a/browser/branding/tb-release/content/about-logo.png and b/browser/branding/tb-release/content/about-logo.png differ ===================================== browser/branding/tb-release/content/about-logo@2x.png ===================================== Binary files a/browser/branding/tb-release/content/about-logo@2x.png and b/browser/branding/tb-release/content/about-logo@2x.png differ ===================================== browser/branding/tb-release/content/about.png deleted ===================================== Binary files a/browser/branding/tb-release/content/about.png and /dev/null differ ===================================== browser/branding/tb-release/content/aboutDialog.css ===================================== @@ -9,8 +9,3 @@ --about-dialog-background-color-bottom: hsla(235, 43%, 10%, 0.5); --about-dialog-text-color-trademark: #999999; } - -#leftBox { - background-image: url("chrome://branding/content/icon256.png"); - background-position-y: 0; -} ===================================== browser/branding/tb-release/content/firefox-wordmark.svg deleted ===================================== @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="172" height="42"><path fill="context-fill #20123a" d="M.19 2.82h25.72v7H7.57v9.43h18.34v6.9H7.57v15.14H.19zM34.65.13a4.14 4.14 0 0 1 4.27 4.33 4.12 4.12 0 0 1-4.32 4.32 4.09 4.09 0 0 1-4.27-4.22A4.27 4.27 0 0 1 34.65.13zM31 12.83h7.27v28.46H31zm28.35 7.91a5.89 5.89 0 0 0-3.53-1.27c-3 0-4.64 1.9-4.64 6.06v15.76H44V12.83h6.9v4.11a6.79 6.79 0 0 1 6.8-4.37A8.69 8.69 0 0 1 62.53 14zm3 6.48c0-8.17 6.06-15 14.65-15s14.59 6.06 14.59 14.49v3H69.48c.79 3.58 3.58 6 7.85 6a7.62 7.62 0 0 0 7.06-4.21l6.06 3.63c-3 4.43-7.27 6.75-13.33 6.75-9.22-.01-14.75-6.18-14.75-14.66zM69.59 24h15c-.79-3.63-3.74-5.63-7.59-5.63A7.31 7.31 0 0 0 69.59 24zM93.4 12.83h5.11v-1.42c0-7.75 3.27-11 10.44-11h2.53v6.31h-2.06c-3.37 0-4.11 1.16-4.11 4.69v1.42h6.17v6.54h-6v21.92h-7V19.37H93.4zm19.45 14.23a14.56 14.56 0 0 1 14.85-14.81 14.81 14.81 0 1 1 0 29.62c-8.85 0-14.85-6.49-14.85-14.81zm22.65 0a7.8 7.8 0 1 0-15.59 0 7.8 7.8 0 1 0 15.59 0zm16.86-.32l-10.27-13.91h8.53l6.06 8.75 6.22-8.75h8.38l-10.43 13.86 11 14.6h-8.49L156.53 32l-6.59 9.28h-8.48z"/></svg> \ No newline at end of file ===================================== browser/branding/tb-release/content/jar.mn ===================================== @@ -4,14 +4,13 @@ browser.jar: % content branding %content/branding/ contentaccessible=yes - content/branding/about.png content/branding/about-logo.png content/branding/about-logo.svg + content/branding/about-logo-small.svg content/branding/about-logo@2x.png content/branding/about-wordmark.svg content/branding/document.ico (../document.ico) content/branding/document_pdf.svg - content/branding/firefox-wordmark.svg content/branding/icon16.png (../default16.png) content/branding/icon32.png (../default32.png) content/branding/icon48.png (../default48.png) ===================================== toolkit/content/widgets/moz-page-nav/moz-page-nav.css ===================================== @@ -51,7 +51,10 @@ nav { display: inline-block; height: var(--page-nav-heading-logo-size); width: var(--page-nav-heading-logo-size); - background: image-set(url("chrome://branding/content/about-logo.png"), url("chrome://branding/content/about-logo@2x.png") 2x) no-repeat center; + /* For Tor Browser, we want to use the "small" variant that does not include + * the "alpha" or "moon" bitmap, which does not render well at small + * resolutions (less than 48px). tor-browser#44998 and tor-browser#42088. */ + background: url("chrome://branding/content/about-logo-small.svg") no-repeat center; background-size: auto; background-size: var(--page-nav-heading-logo-size); /* heading logo should be centered above button icons */ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/08c0751c... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/08c0751c... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help
participants (1)
-
morgan (@morgan)