richard pushed to branch tor-browser-102.12.0esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits: 8b558745 by Dan Ballard at 2023-06-06T21:52:27+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser

Bug 41623: Update connection assist's iconography

- - - - - 975fe2aa by Dan Ballard at 2023-06-06T21:52:27+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

Bug 41623: Update connection assist's iconography

- - - - - c2d6837d by Dan Ballard at 2023-06-06T21:52:27+00:00 fixup! fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser

Bug 41623: Update connection assist's iconography

- - - - -

12 changed files:

- browser/components/torconnect/content/aboutTorConnect.css - browser/components/torconnect/content/connection-failure.svg - browser/components/torconnect/content/connection-location.svg - − browser/components/torconnect/content/onion-slash-fillable.svg - − browser/components/torconnect/content/onion.svg - + browser/components/torconnect/content/tor-connect-broken.svg - + browser/components/torconnect/content/tor-connect.svg - browser/components/torconnect/content/torConnectTitlebarStatus.js - browser/components/torconnect/jar.mn - browser/components/torpreferences/content/torPreferences.css - − browser/components/torpreferences/content/torPreferencesIcon.svg - browser/components/torpreferences/jar.mn

Changes:

===================================== browser/components/torconnect/content/aboutTorConnect.css ===================================== @@ -105,11 +105,11 @@ input[type="checkbox"]:focus, select:focus { }

#connect-to-tor-icon { - list-style-image: url("chrome://browser/content/torconnect/onion.svg"); + list-style-image: url("chrome://browser/content/torconnect/tor-connect.svg"); }

#connection-assist-icon { - list-style-image: url("chrome://browser/content/torconnect/onion-slash-fillable.svg"); + list-style-image: url("chrome://browser/content/torconnect/tor-connect-broken.svg"); }

#location-settings-icon { @@ -311,7 +311,7 @@ body { }

.title { - background-image: url("chrome://browser/content/torconnect/onion.svg"); + background-image: url("chrome://browser/content/torconnect/tor-connect.svg"); -moz-context-properties: stroke, fill, fill-opacity; fill-opacity: var(--onion-opacity); fill: var(--onion-color);

===================================== browser/components/torconnect/content/connection-failure.svg ===================================== @@ -1,5 +1,18 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg fill="none" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg"> - <path fill="context-fill" d="M 30,1.875 C 14.467,1.875 1.875,14.467 1.875,30 c 0,6.725546 2.3647525,12.894963 6.3027344,17.734375 l -4.7636719,4.763672 c -0.7834743,0.783474 -0.7834743,2.044651 0,2.828125 0.7834743,0.783474 2.0446507,0.783474 2.828125,0 C 21.046044,40.52782 34.415343,27.146014 47.546875,14.023438 v -0.002 l 6.779297,-6.7792965 c 0.783474,-0.7834743 0.783474,-2.0446507 0,-2.828125 -0.783474,-0.7834743 -2.044651,-0.7834743 -2.828125,0 L 47.734375,8.1777344 C 42.894963,4.2397525 36.725546,1.875 30,1.875 Z m 0,4.3945312 c 5.511128,0 10.579364,1.8833224 14.607422,5.0351568 l -2.88086,2.880859 C 38.450945,11.752724 34.393751,10.3125 30,10.3125 Z m 23.171875,7.7851568 -3.169922,3.169921 c 2.3606,3.688 3.728516,8.071691 3.728516,12.775391 0,1.1686 -0.08495,2.318106 -0.248047,3.441406 L 56.625,39.085938 c 0.9722,-2.8501 1.5,-5.906738 1.5,-9.085938 0,-5.9206 -1.828625,-11.413713 -4.953125,-15.945312 z M 30,14.707031 c 3.177831,0 6.128683,0.969877 8.574219,2.628907 l -2.931641,2.933593 C 33.98338,19.305214 32.05732,18.75 30,18.75 Z m 17.058594,5.458985 -3.25,3.251953 c 0.6734,1.4099 1.135809,2.938675 1.349609,4.546875 1.5363,-0.1698 3.117694,0.126925 4.496094,0.890625 -0.1807,-3.1525 -1.103403,-6.106153 -2.595703,-8.689453 z M 30,23.144531 c 0.826564,0 1.617815,0.147937 2.351562,0.416016 L 30,25.912109 Z m 10.703125,3.378907 -3.857422,3.857421 c -0.1905,3.4833 -2.981544,6.274344 -6.464844,6.464844 L 30,37.224609 v 0.002 c -5.415919,5.416107 -11.224329,11.222894 -15.945312,15.945313 1.319718,0.909937 2.719791,1.709665 4.189453,2.386719 3.233255,1.489519 6.798228,2.383028 10.552734,2.541015 -1.196895,-2.322912 -1.228443,-4.952483 0.02739,-7.248052 1.05453,-1.896289 2.110388,-3.79184 3.165973,-5.687542 C 31.338834,45.248762 30.6744,45.292969 30,45.292969 V 41.25 c 1.6992,0 3.309606,-0.376281 4.753906,-1.050781 l 4.69336,-8.429688 c 0.4837,-0.8688 1.097775,-1.589162 1.796875,-2.164062 -0.037,-1.0721 -0.224316,-2.106431 -0.541016,-3.082031 z" /> - <path fill="context-stroke" d="m59.5328 52.4973-10.261-18.5715c-.7112-1.2833-1.9917-1.9258-3.2722-1.9258-1.2806 0-2.5611.6425-3.2704 1.9258l-10.261 18.5715c-1.3701 2.4755.4312 5.5027 3.2704 5.5027h20.5238c2.8373 0 4.6387-3.0272 3.2704-5.5027zm-12.3666-.533-.4666.4642h-1.4l-.4667-.4642v-1.3929l.4667-.4643h1.4l.4666.4643zm0-4.992c0 .3078-.1229.603-.3417.8207s-.5155.34-.8249.34-.6062-.1223-.825-.34-.3417-.5129-.3417-.8207v-6.383c0-.3079.1229-.6031.3417-.8208s.5156-.34.825-.34.6061.1223.8249.34.3417.5129.3417.8208z" /> +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<g clip-path="url(#clip0_2970_12650)"> +<path d="M3.32745 2.13476C4.60904 1.11242 6.23317 0.501331 8 0.501331C12.1414 0.501331 15.4987 3.85866 15.4987 8C15.4987 9.76709 14.8876 11.3911 13.8652 12.6725L13.0315 11.8388C13.8448 10.7747 14.328 9.44438 14.328 8C14.328 4.50401 11.496 1.672 8 1.672C6.5562 1.672 5.22564 2.15503 4.16105 2.96836L3.32745 2.13476Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +<path d="M2.35636 3.06235C1.20135 4.38144 0.501343 6.10899 0.501343 8C0.501343 11.5867 3.01868 14.584 6.38401 15.3227C6.73601 15.4 7.09333 15.4533 7.46134 15.4773V9.74933C6.71467 9.52 6.17068 8.82401 6.17068 8C6.17068 7.67615 6.25474 7.37202 6.40223 7.10822L5.55539 6.26138C5.20574 6.75196 5.00001 7.3521 5.00001 8C5.00001 9.06133 5.55201 9.99466 6.38401 10.528V14.1173C3.67201 13.4053 1.67201 10.9387 1.67201 8C1.67201 6.43179 2.24187 4.99718 3.18588 3.89187L2.35636 3.06235Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +<path d="M6.56041 5.36771L7.44804 6.25534C7.62219 6.20033 7.80762 6.17067 8.00001 6.17067C9.01067 6.17067 9.82934 6.98934 9.82934 8C9.82934 8.19242 9.79968 8.37785 9.7447 8.552L10.6324 9.43967C10.8667 9.01221 11 8.52156 11 8C11 6.34399 9.65601 5 8.00001 5C7.47845 5 6.98783 5.13332 6.56041 5.36771Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +<path d="M9.73889 10.4449L8.89214 9.59813C8.78095 9.66036 8.6626 9.71127 8.53868 9.74933V15.4773C8.90668 15.4533 9.26401 15.4 9.61601 15.3227C10.8695 15.0475 12.0054 14.459 12.9374 13.6434L12.1076 12.8136C11.396 13.4207 10.5481 13.8726 9.61601 14.1173V10.528C9.65768 10.5013 9.69865 10.4736 9.73889 10.4449Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +<path d="M12.2609 11.0682C12.8837 10.2055 13.2507 9.14573 13.2507 8C13.2507 5.10133 10.8987 2.74933 7.99999 2.74933C6.85488 2.74933 5.79508 3.11639 4.9319 3.73921L5.77475 4.58207C6.41445 4.16498 7.1787 3.92267 7.99999 3.92267C10.2533 3.92267 12.0773 5.74666 12.0773 8C12.0773 8.82056 11.8348 9.58497 11.4175 10.2248L12.2609 11.0682Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +<path d="M10.5086 11.2146L11.3423 12.0483C10.8375 12.4651 10.2534 12.7892 9.616 12.9947V11.744C9.93702 11.6057 10.2367 11.4271 10.5086 11.2146Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +<path d="M4.78492 5.49092L3.95137 4.65737C3.20058 5.56555 2.74933 6.73033 2.74933 8C2.74933 10.336 4.27467 12.3147 6.384 12.9947V11.744C4.936 11.12 3.92267 9.67733 3.92267 8C3.92267 7.05341 4.24455 6.18259 4.78492 5.49092Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +<path d="M7.16918 7.8752L8.12478 8.83079C8.08406 8.83686 8.04238 8.84 7.99997 8.84C7.53605 8.84 7.15997 8.46392 7.15997 8C7.15997 7.95759 7.16312 7.91592 7.16918 7.8752Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +<path d="M1.15533 1.85684L14.0906 14.7921C14.3511 15.0527 14.3511 15.4751 14.0906 15.7357L14.0906 15.7357C13.83 15.9963 13.4075 15.9963 13.1469 15.7357L0.211679 2.8005C-0.048903 2.53992 -0.0489032 2.11743 0.211682 1.85684C0.472265 1.59626 0.894753 1.59626 1.15533 1.85684Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +</g> +<defs> +<clipPath id="clip0_2970_12650"> +<rect width="16" height="16" fill="white"/> +</clipPath> +</defs> </svg>

===================================== browser/components/torconnect/content/connection-location.svg ===================================== @@ -1,5 +1,11 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg fill="none" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg"> - <path fill="context-fill" d="M 30,1.875 C 14.467,1.875 1.875,14.467 1.875,30 c 0,6.725546 2.3647429,12.894963 6.3027344,17.734375 l -4.7636719,4.763672 c -0.7834743,0.783474 -0.7834743,2.044651 0,2.828125 0.7834743,0.783474 2.0446507,0.783474 2.828125,0 C 21.049647,40.524244 34.416498,27.144859 47.546875,14.023438 v -0.002 l 6.779297,-6.7792965 c 0.783474,-0.7834743 0.783474,-2.0446507 0,-2.828125 -0.783474,-0.7834743 -2.044651,-0.7834743 -2.828125,0 L 47.734375,8.1777344 C 42.894963,4.2397429 36.725546,1.875 30,1.875 Z m 0,4.3945312 c 5.511049,0 10.579367,1.8833675 14.607422,5.0351568 l -2.88086,2.880859 C 38.450922,11.752724 34.393676,10.3125 30,10.3125 Z m 23.171875,7.7851568 -3.169922,3.169921 c 2.0599,3.2183 3.363209,6.965941 3.662109,10.994141 1.6451,0.9052 3.133663,2.060563 4.414063,3.414062 C 58.109025,31.092612 58.125,30.5479 58.125,30 c 0,-5.9207 -1.828725,-11.413612 -4.953125,-15.945312 z M 30,14.707031 c 3.177763,0 6.128689,0.96991 8.574219,2.628907 l -2.931641,2.933593 C 33.983382,19.305242 32.057261,18.75 30,18.75 Z m 17.058594,5.458985 -3.25,3.251953 c 0.3932,0.8233 0.714831,1.687384 0.957031,2.583984 C 44.843925,26.000953 44.9215,26 45,26 c 1.5121,0 2.981466,0.186009 4.384766,0.537109 -0.4052,-2.2842 -1.205872,-4.431893 -2.326172,-6.371093 z M 30,23.144531 c 0.826528,0 1.61783,0.147942 2.351562,0.416016 L 30,25.912109 Z M 27.513672,39.710938 C 22.924606,44.301329 18.153439,49.072905 14.054688,53.171875 18.586388,56.296275 24.0793,58.125 30,58.125 c 1.2074,0 2.397153,-0.07701 3.564453,-0.224609 -1.405046,-1.157246 -2.630299,-2.523304 -3.630859,-4.050782 -1.074704,-1.73735 -1.733781,-3.296 -2.273434,-5.009765 C 27.215587,47.179488 27.041393,45.619 27,44 c 0,-1.105 0.100333,-2.186283 0.291016,-3.236328 5.91e-4,-0.0033 0.0014,-0.0065 0.002,-0.0098 0.06395,-0.351034 0.136703,-0.699344 0.220703,-1.042968 z" /> - <path fill="context-stroke" d="m45 30c-3.713 0-7.274 1.475-9.8995 4.1005s-4.1005 6.1865-4.1005 9.8995 1.475 7.274 4.1005 9.8995 6.1865 4.1005 9.8995 4.1005 7.274-1.475 9.8995-4.1005 4.1005-6.1865 4.1005-9.8995-1.475-7.274-4.1005-9.8995-6.1865-4.1005-9.8995-4.1005zm4.5677 3.2667c1.9167.8229 3.5778 2.1443 4.8108 3.8267 1.233 1.6825 1.9928 3.6644 2.2004 5.7399h-4.1608c-.2298-3.4759-1.4862-6.8054-3.6101-9.5666zm-3.8248 0c2.5257 2.5792 4.06 5.967 4.3326 9.5666h-10.151c.2726-3.5996 1.8069-6.9874 4.3326-9.5666zm-5.3125 0h.7616c-2.1231 2.7616-3.3794 6.0909-3.6101 9.5666h-4.1608c.2072-2.0753.9667-4.0573 2.1993-5.7397 1.2327-1.6824 2.8936-3.0039 4.81-3.8269zm0 21.4666c-1.9166-.8227-3.5777-2.1441-4.8105-3.8266-1.2327-1.6825-1.992-3.6646-2.1988-5.74h4.1608c.2298 3.4759 1.4862 6.8054 3.6101 9.5666zm3.8267 0c-2.5257-2.5792-4.06-5.967-4.3326-9.5666h10.1491c-.2725 3.5996-1.8068 6.9874-4.3325 9.5666zm5.3125 0h-.7635c2.1247-2.7607 3.3812-6.0905 3.6102-9.5666h4.1608c-.2069 2.0752-.966 4.0571-2.1984 5.7395-1.2323 1.6824-2.8929 3.004-4.8091 3.8271z" /> +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<g clip-path="url(#clip0_1827_6570)"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M7.73334 11.442C7.73334 9.541 9.34511 8.00001 11.3333 8.00001C13.3216 8.00001 14.9333 9.541 14.9333 11.442C14.9333 12.801 13.0948 14.729 12.0456 15.7185C11.855 15.899 11.5994 16 11.3333 16C11.0672 16 10.8117 15.899 10.6211 15.7185C9.57191 14.729 7.73334 12.8005 7.73334 11.442ZM10.7466 9.98339C10.9326 9.90634 11.132 9.86667 11.3333 9.86667C11.74 9.86667 12.13 10.0282 12.4176 10.3158C12.7051 10.6033 12.8667 10.9933 12.8667 11.4C12.8667 11.8067 12.7051 12.1967 12.4176 12.4842C12.13 12.7718 11.74 12.9333 11.3333 12.9333C11.132 12.9333 10.9326 12.8937 10.7466 12.8166C10.5605 12.7396 10.3915 12.6266 10.2491 12.4842C10.1067 12.3419 9.99378 12.1728 9.91672 11.9868C9.83966 11.8008 9.8 11.6014 9.8 11.4C9.8 11.1986 9.83966 10.9993 9.91672 10.8132C9.99378 10.6272 10.1067 10.4582 10.2491 10.3158C10.3915 10.1734 10.5605 10.0604 10.7466 9.98339Z" fill="#FFA436"/> +<path d="M15.4042 9.15991C15.489 8.70846 15.5333 8.24275 15.5333 7.76667C15.5333 3.62454 12.1755 0.26667 8.03332 0.26667C3.89119 0.26667 0.533325 3.62454 0.533325 7.76667C0.533325 11.9088 3.89119 15.2667 8.03332 15.2667C8.33067 15.2667 8.62398 15.2494 8.91229 15.2157C7.77562 13.9767 6.66666 12.467 6.66666 11.2932C6.66666 10.0893 7.18892 8.99941 8.03333 8.21045V5.93855C8.83962 5.93855 9.52399 6.46053 9.76697 7.185C10.1327 7.06327 10.5195 6.98297 10.9209 6.95013C10.5653 5.69011 9.40713 4.76667 8.03333 4.76667L8.03332 3.68854C10.0174 3.68854 11.6705 5.10537 12.0361 6.98245C12.4679 7.04338 12.8804 7.1596 13.2649 7.32314C13.0397 4.63121 10.7834 2.51667 8.03332 2.51666V1.43855C11.5283 1.43855 14.3615 4.27174 14.3615 7.76667C14.3615 7.83574 14.3604 7.90454 14.3582 7.97308C14.7773 8.30672 15.1325 8.70843 15.4042 9.15991Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +</g> +<defs> +<clipPath id="clip0_1827_6570"> +<rect width="16" height="16" fill="white"/> +</clipPath> +</defs> </svg>

===================================== browser/components/torconnect/content/onion-slash-fillable.svg deleted ===================================== @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <path d="m14.1161 15.6245c-.0821.0001-.1634-.016-.2393-.0474-.0758-.0314-.1447-.0775-.2027-.1356l-12.749984-12.749c-.109266-.11882-.168406-.27526-.165071-.43666.003335-.16139.068886-.31525.182967-.42946.114078-.11421.267868-.17994.429258-.18345.16139-.00352.3179.05544.43685.16457l12.74998 12.75c.1168.1176.1824.2767.1824.4425s-.0656.3249-.1824.4425c-.058.058-.1269.1039-.2028.1352-.0759.0312-.1571.0471-.2392.0468z" fill-opacity="context-fill-opacity" fill="context-fill" /> - <path d="m 8,0.5000002 c -1.61963,0 -3.1197431,0.5137987 -4.3457031,1.3867188 l 0.84375,0.8417968 0.7792969,0.78125 0.8613281,0.8613282 0.8164062,0.8164062 0.9863281,0.984375 h 0.058594 c 1.00965,0 1.828125,0.818485 1.828125,1.828125 0,0.01968 6.2e-4,0.039074 0,0.058594 L 10.8125,9.0449221 C 10.9334,8.7195921 11,8.3674002 11,8.0000002 c 0,-1.65685 -1.34314,-3 -3,-3 v -1.078125 c 2.25231,0 4.078125,1.825845 4.078125,4.078125 0,0.67051 -0.162519,1.3033281 -0.449219,1.8613281 l 0.861328,0.8613277 C 12.972434,9.9290067 13.25,8.9965102 13.25,8.0000002 c 0,-2.89949 -2.35049,-5.25 -5.25,-5.25 v -1.078125 c 3.4949,0 6.328125,2.833195 6.328125,6.328125 0,1.29533 -0.388841,2.4990528 -1.056641,3.5019528 l 0.841797,0.84375 C 14.986181,11.119703 15.5,9.6196302 15.5,8.0000002 c 0,-4.14214 -3.3579,-7.5 -7.5,-7.5 z m -6.1113281,3.15625 C 1.0154872,4.8821451 0.5,6.3803304 0.5,8.0000002 0.5,12.1421 3.85786,15.5 8,15.5 c 1.6198027,0 3.117896,-0.515441 4.34375,-1.388672 L 11.501953,13.269531 C 10.498787,13.937828 9.295838,14.328125 8,14.328125 V 13.25 c 0.9967306,0 1.9287093,-0.277621 2.722656,-0.759766 L 9.859375,11.626953 C 9.3016226,11.913918 8.6705338,12.078125 8,12.078125 V 11 C 8.3664751,11 8.716425,10.93088 9.0410156,10.810547 6.6639891,8.4300416 4.2743195,6.0418993 1.8886719,3.6562502 Z" fill-opacity="context-fill-opacity" fill="context-fill"/> -</svg>

===================================== browser/components/torconnect/content/onion.svg deleted ===================================== @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <path d="M 8 0.5 C 3.85786 0.5 0.5 3.85786 0.5 8 C 0.5 12.1421 3.85786 15.5 8 15.5 C 12.1421 15.5 15.5 12.1421 15.5 8 C 15.5 3.85786 12.1421 0.5 8 0.5 z M 8 1.671875 C 11.4949 1.671875 14.328125 4.50507 14.328125 8 C 14.328125 11.4949 11.4949 14.328125 8 14.328125 L 8 13.25 C 10.89951 13.25 13.25 10.89951 13.25 8 C 13.25 5.10051 10.89951 2.75 8 2.75 L 8 1.671875 z M 8 3.921875 C 10.25231 3.921875 12.078125 5.74772 12.078125 8 C 12.078125 10.25231 10.25231 12.078125 8 12.078125 L 8 11 C 9.65686 11 11 9.65686 11 8 C 11 6.34315 9.65686 5 8 5 L 8 3.921875 z M 8 6.171875 C 9.00965 6.171875 9.828125 6.99036 9.828125 8 C 9.828125 9.00965 9.00965 9.828125 8 9.828125 L 8 6.171875 z " clip-rule="evenodd" fill-rule="evenodd" fill="context-fill" fill-opacity="context-fill-opacity"/> -</svg>

===================================== browser/components/torconnect/content/tor-connect-broken.svg ===================================== @@ -0,0 +1 @@ +<svg fill="none" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><clipPath id="a"><path d="m0 0h16v16h-16z"/></clipPath><g clip-path="url(#a)" fill-opacity="context-fill-opacity" fill="context-fill"><rect height="1.22295" rx=".611475" transform="matrix(-.707107 -.707107 -.707107 .707107 14.9464 14.1921)" width="18.6565"/><g clip-rule="evenodd" fill-rule="evenodd"><path d="m3.9498 1.68761c1.19924-.769433 2.60316-1.18761 4.0502-1.18761 1.98912 0 3.8968.79018 5.3033 2.1967s2.1967 3.31418 2.1967 5.3033c0 1.44704-.4182 2.851-1.1876 4.0502l-.9179-.9179c.4428-.7667.7192-1.62112.8075-2.5073h-2.229c-.0215.32648-.0599.65056-.1148.971l-2.22101-2.221h1.08181c-.146-1.92835-.96795-3.74329-2.321-5.125h-.796c-.52113.53217-.96348 1.12861-1.31877 1.77104l-.9115-.9115c.17951-.29615.37579-.58315.58827-.85954h-.408c-.23805.10224-.46875.21884-.69093.34888zm9.0744 2.61245c-.6605-.90129-1.5504-1.60918-2.5772-2.05006h-.407c1.1378 1.47922 1.8109 3.26288 1.934 5.125h2.229c-.1112-1.11187-.5182-2.17365-1.1788-3.07494z"/><path d="m3.08673 2.33343c-.13383.11605-.26395.23718-.39003.36327-1.40652 1.40652-2.1967 3.31418-2.1967 5.3033s.79018 3.8968 2.1967 5.3033 3.31418 2.1967 5.3033 2.1967 3.8968-.7902 5.3033-2.1967c.1261-.1261.2472-.2562.3633-.39l-.8933-.8933c-.6277.7494-1.4237 1.3427-2.3253 1.73h-.409c.6819-.8861 1.1969-1.8815 1.5266-2.9377l-1.0208-1.02083c-.3313 1.48633-1.07154 2.85943-2.1478 3.95853h-.795c-1.35305-1.3817-2.175-3.1966-2.321-5.125h4.09731l-1.25-1.25h-2.84731c.06073-.80217.23844-1.58472.52269-2.32462l-.95329-.95329c-.46748 1.02882-.74878 2.13867-.8244 3.27791h-2.229c.11102-1.1118.51787-2.17355 1.17823-3.07484.29198-.39851.62881-.75922 1.00248-1.07575zm-.11176 9.36657c.66039.9014 1.55027 1.6092 2.57703 2.05h.408c-1.13778-1.4792-1.81088-3.2629-1.934-5.125h-2.229c.11081 1.11186.51758 2.1737 1.17797 3.075z"/></g></g></svg>

===================================== browser/components/torconnect/content/tor-connect.svg ===================================== @@ -0,0 +1,7 @@ +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<g> +<path fill-rule="evenodd" clip-rule="evenodd" d="M8.00001 0.501331C3.85867 0.501331 0.501343 3.85866 0.501343 8C0.501343 11.5867 3.01868 14.584 6.38401 15.3227C6.73601 15.4 7.09333 15.4533 7.46134 15.4773V9.74933C6.71467 9.52 6.17068 8.82401 6.17068 8C6.17068 6.98934 6.98935 6.17067 8.00001 6.17067C9.01067 6.17067 9.82934 6.98934 9.82934 8C9.82934 8.82401 9.28534 9.52 8.53868 9.74933V15.4773C8.90668 15.4533 9.26401 15.4 9.61601 15.3227C12.9813 14.584 15.4987 11.5867 15.4987 8C15.4987 3.85866 12.1414 0.501331 8.00001 0.501331ZM9.61601 14.1173V10.528C10.448 9.99466 11 9.06133 11 8C11 6.344 9.65601 5 8.00001 5C6.344 5 5.00001 6.344 5.00001 8C5.00001 9.06133 5.55201 9.99466 6.38401 10.528V14.1173C3.67201 13.4053 1.67201 10.9387 1.67201 8C1.67201 4.504 4.50401 1.67201 8.00001 1.67201C11.496 1.67201 14.328 4.50401 14.328 8C14.328 10.9387 12.328 13.4053 9.61601 14.1173Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M7.99999 2.74933C5.10133 2.74933 2.74933 5.10134 2.74933 8C2.74933 10.336 4.27467 12.3147 6.384 12.9947V11.744C4.936 11.12 3.92267 9.67733 3.92267 8C3.92267 5.74666 5.74666 3.92267 7.99999 3.92267C10.2533 3.92267 12.0773 5.74666 12.0773 8C12.0773 9.67733 11.064 11.12 9.61599 11.744V12.9947C11.7253 12.3147 13.2507 10.336 13.2507 8C13.2507 5.10133 10.8987 2.74933 7.99999 2.74933Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +<path d="M7.99997 8.84C8.46389 8.84 8.83997 8.46392 8.83997 8C8.83997 7.53608 8.46389 7.16 7.99997 7.16C7.53605 7.16 7.15997 7.53608 7.15997 8C7.15997 8.46392 7.53605 8.84 7.99997 8.84Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +</g> +</svg>

===================================== browser/components/torconnect/content/torConnectTitlebarStatus.js ===================================== @@ -94,8 +94,8 @@ var gTorConnectTitlebarStatus = { this.icon.setAttribute( "src", connected - ? "chrome://browser/content/torconnect/onion.svg" - : "chrome://browser/content/torconnect/onion-slash-fillable.svg" + ? "chrome://browser/content/torconnect/tor-connect.svg" + : "chrome://browser/content/torconnect/tor-connect-broken.svg" ); this.icon.classList.toggle("tor-connect-status-connected", connected); this.icon.classList.toggle(

===================================== browser/components/torconnect/jar.mn ===================================== @@ -9,5 +9,5 @@ browser.jar: content/browser/torconnect/bridge.svg (content/bridge.svg) content/browser/torconnect/connection-failure.svg (content/connection-failure.svg) content/browser/torconnect/connection-location.svg (content/connection-location.svg) - content/browser/torconnect/onion.svg (content/onion.svg) - content/browser/torconnect/onion-slash-fillable.svg (content/onion-slash-fillable.svg) + content/browser/torconnect/tor-connect.svg (content/tor-connect.svg) + content/browser/torconnect/tor-connect-broken.svg (content/tor-connect-broken.svg)

===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -2,7 +2,7 @@

#category-connection > .category-icon { - list-style-image: url("chrome://browser/content/torpreferences/torPreferencesIcon.svg"); + list-style-image: url("chrome://browser/content/torconnect/tor-connect.svg"); }

html:dir(rtl) input[type="checkbox"].toggle-button::before { @@ -58,7 +58,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before {

#torPreferences-connectMessageBox.error #torPreferences-connectMessageBox-icon { - mask: url("chrome://browser/content/torconnect/onion-slash-fillable.svg"); + mask: url("chrome://browser/content/torconnect/tor-connect-broken.svg"); background-color: white; }

===================================== browser/components/torpreferences/content/torPreferencesIcon.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/components/torpreferences/jar.mn ===================================== @@ -17,7 +17,6 @@ browser.jar: content/browser/torpreferences/connectionPane.js (content/connectionPane.js) content/browser/torpreferences/connectionPane.xhtml (content/connectionPane.xhtml) content/browser/torpreferences/torPreferences.css (content/torPreferences.css) - content/browser/torpreferences/torPreferencesIcon.svg (content/torPreferencesIcon.svg) content/browser/torpreferences/bridgemoji/bridge-emojis.json (content/bridgemoji/bridge-emojis.json) content/browser/torpreferences/bridgemoji/annotations.json (content/bridgemoji/annotations.json) content/browser/torpreferences/bridgemoji/svgs/ (content/bridgemoji/svgs/*.svg)

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