morgan pushed to branch tor-browser-140.1.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 7b5671e7 by Henry Wilkes at 2025-07-31T11:09:17+00:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 43519: Use loading.svg. - - - - - 3ece2e83 by Henry Wilkes at 2025-07-31T11:09:17+00:00 fixup! Add purple tor version of the loading APNG. TB 43519: Drop tor loading PNGs. This should drop the entire target commit. - - - - - 7 changed files: - browser/components/torpreferences/content/torPreferences.css - toolkit/themes/shared/desktop-jar.inc.mn - − toolkit/themes/shared/icons/tor-dark-loading.png - − toolkit/themes/shared/icons/tor-dark-loading@2x.png - − toolkit/themes/shared/icons/tor-light-loading.png - − toolkit/themes/shared/icons/tor-light-loading@2x.png - − tools/torbrowser/generate_tor_loading_png.py Changes: ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -19,19 +19,9 @@ button.spoof-button-disabled { .tor-loading-icon { width: 16px; height: 16px; - content: image-set( - url("chrome://global/skin/icons/tor-light-loading.png"), - url("chrome://global/skin/icons/tor-light-loading@2x.png") 2x - ); -} - -@media (prefers-color-scheme: dark) { - .tor-loading-icon { - content: image-set( - url("chrome://global/skin/icons/tor-dark-loading.png"), - url("chrome://global/skin/icons/tor-dark-loading@2x.png") 2x - ); - } + -moz-context-properties: fill; + fill: var(--tor-accent-color); + content: url("chrome://global/skin/icons/loading.svg"); } .tor-toggle { ===================================== toolkit/themes/shared/desktop-jar.inc.mn ===================================== @@ -121,10 +121,6 @@ skin/classic/global/icons/security-warning.svg (../../shared/icons/security-warning.svg) skin/classic/global/icons/settings.svg (../../shared/icons/settings.svg) skin/classic/global/icons/sort-arrow.svg (../../shared/icons/sort-arrow.svg) - skin/classic/global/icons/tor-light-loading.png (../../shared/icons/tor-light-loading.png) - skin/classic/global/icons/tor-light-loading@2x.png (../../shared/icons/tor-light-loading@2x.png) - skin/classic/global/icons/tor-dark-loading.png (../../shared/icons/tor-dark-loading.png) - skin/classic/global/icons/tor-dark-loading@2x.png (../../shared/icons/tor-dark-loading@2x.png) skin/classic/global/icons/trending.svg (../../shared/icons/trending.svg) skin/classic/global/icons/trophy.svg (../../shared/icons/trophy.svg) skin/classic/global/icons/thumbs-down-20.svg (../../shared/icons/thumbs-down-20.svg) ===================================== toolkit/themes/shared/icons/tor-dark-loading.png deleted ===================================== Binary files a/toolkit/themes/shared/icons/tor-dark-loading.png and /dev/null differ ===================================== toolkit/themes/shared/icons/tor-dark-loading@2x.png deleted ===================================== Binary files a/toolkit/themes/shared/icons/tor-dark-loading@2x.png and /dev/null differ ===================================== toolkit/themes/shared/icons/tor-light-loading.png deleted ===================================== Binary files a/toolkit/themes/shared/icons/tor-light-loading.png and /dev/null differ ===================================== toolkit/themes/shared/icons/tor-light-loading@2x.png deleted ===================================== Binary files a/toolkit/themes/shared/icons/tor-light-loading@2x.png and /dev/null differ ===================================== tools/torbrowser/generate_tor_loading_png.py deleted ===================================== @@ -1,74 +0,0 @@ -""" -Script to convert the loading.png and loading@2x.png blue spinners to purple -spinners for Tor Browser, for both the light and dark themes. -""" - -import argparse -import colorsys -import os - -from PIL import ExifTags, Image, ImageFilter - -parser = argparse.ArgumentParser(description="Convert the loading APNG to be purple.") -parser.add_argument("loading_png", help="The loading png to convert") -parser.add_argument( - "--light", required=True, help="The name of the light-theme purple output image" -) -parser.add_argument( - "--dark", required=True, help="The name of the dark-theme purple output image" -) - -parsed_args = parser.parse_args() - -orig_im = Image.open(parsed_args.loading_png) - - -def filter_to_light_theme(r, g, b): - h, s, v = colorsys.rgb_to_hsv(r, g, b) - # Convert from HSV 0.58, 1.0, 255 (start of the circle) - # to --purple-60 #8000d7 HSV 0.766, 1.0, 215 - h = 0.766 - v = v * 215 / 255 - return colorsys.hsv_to_rgb(h, s, v) - - -def filter_to_dark_theme(r, g, b): - h, s, v = colorsys.rgb_to_hsv(r, g, b) - # Convert from HSV 0.58, 1.0, 255 (start of the circle) - # to --purple-30 #c069ff HSV 0.766, 0.59, 255 - h = 0.766 - s = s * 0.59 / 1.0 - return colorsys.hsv_to_rgb(h, s, v) - - -filt_light = ImageFilter.Color3DLUT.generate(65, filter_to_light_theme) -filt_dark = ImageFilter.Color3DLUT.generate(65, filter_to_dark_theme) - -transformed_light = [] -transformed_dark = [] -duration = orig_im.info["duration"] - -# Transform each APNG frame individually. -for frame in range(orig_im.n_frames): - orig_im.seek(frame) - transformed_light.append(orig_im.filter(filt_light)) - transformed_dark.append(orig_im.filter(filt_dark)) - -exif = Image.Exif() -exif[ExifTags.Base.ImageDescription] = f"Generated by {os.path.basename(__file__)}" - -transformed_light[0].save( - parsed_args.light, - save_all=True, - append_images=transformed_light[1:], - duration=duration, - exif=exif, -) - -transformed_dark[0].save( - parsed_args.dark, - save_all=True, - append_images=transformed_dark[1:], - duration=duration, - exif=exif, -) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d116014... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d116014... You're receiving this email because of your account on gitlab.torproject.org.