commit 6a9a4f528d8b8254402802a7a86cd722b747a5a6 Author: Arthur Edelstein arthuredelstein@gmail.com Date: Fri Nov 2 10:03:35 2018 -0700

Bug 28187: Change tor circuit icon to torbutton.svg

Also, introduce a "new circuit" icon (designed by Antonela Debiasi) to hamburger menu. --- src/chrome/content/menu-items-overlay.xul | 2 ++ src/chrome/skin/new_circuit.svg | 8 ++++++++ src/chrome/skin/relay.svg | 10 ---------- src/chrome/skin/tor-circuit-display.css | 6 +++--- src/chrome/skin/torbutton.css | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/chrome/content/menu-items-overlay.xul b/src/chrome/content/menu-items-overlay.xul index 274c9c71..b2e862b3 100644 --- a/src/chrome/content/menu-items-overlay.xul +++ b/src/chrome/content/menu-items-overlay.xul @@ -15,10 +15,12 @@ label="&torbutton.context_menu.new_circuit;" oncommand="torbutton_new_circuit();"/> <toolbarbutton id="appMenuNewIdentity" + class="subviewbutton subviewbutton-iconic" key="torbutton-new-identity-key" label="&torbutton.context_menu.new_identity;" oncommand="torbutton_new_identity();"/> <toolbarbutton id="appMenuNewCircuit" + class="subviewbutton subviewbutton-iconic" key="torbutton-new-circuit-key" label="&torbutton.context_menu.new_circuit;" oncommand="torbutton_new_circuit();"/> diff --git a/src/chrome/skin/new_circuit.svg b/src/chrome/skin/new_circuit.svg new file mode 100644 index 00000000..e0a93cc8 --- /dev/null +++ b/src/chrome/skin/new_circuit.svg @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <title>Icon / New Circuit@1.5x</title> + <g id="Icon-/-New-Circuit" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <path d="M13.4411138,10.1446317 L9.5375349,10.1446317 C8.99786512,10.1446317 8.56164018,10.5818326 8.56164018,11.1205264 C8.56164018,11.6592203 8.99786512,12.0964212 9.5375349,12.0964212 L11.4571198,12.0964212 C10.7554515,13.0479185 9.73466563,13.692009 8.60067597,13.9359827 C8.41818366,13.9720908 8.23276366,14.0033194 8.04734366,14.0218614 C7.97219977,14.0277168 7.89803177,14.0306445 7.82288788,14.0335722 C6.07506044,14.137017 4.290149,13.4499871 3.38647049,11.857327 C2.52280367,10.3349312 2.77263271,8.15966189 3.93687511,6.87343267 C5.12453898,5.56183017 7.44814431,5.04363008 8.21226987,3.38558497 C9.01738301,4.92847451 9.60682342,5.02801577 10.853041,6.15029468 C11.2892659,6.54455615 11.9704404,7.55558307 12.1861132,8.10501179 C12.3051723,8.40949094 12.5013272,9.17947187 12.5013272,9.17947187 L14.2862386,9.17947187 C14.2091429,7.59754654 13.439162,5.96877827 12.2261248,4.93628166 C11.279507,4.13116853 10.5065984,3.84718317 9.77662911,2.8088312 C9.63219669,2.60194152 9.599 99216,2.4565332 9.56290816,2.21646311 C9.53851079,2.00762164 9.54143848,1.78511764 9.62048595,1.53919218 C9.65952174,1.41720534 9.59804037,1.28545955 9.47702943,1.23764071 L6.40296106,0.0167964277 C6.32391359,-0.0134563083 6.23413128,-0.00272146652 6.16679454,0.0480250584 L5.95502539,0.206120002 C5.85743592,0.280288 5.82815908,0.416913259 5.89159223,0.523285783 C6.70060895,1.92564648 6.36978064,2.82542141 5.8984235,3.20211676 C5.4914754,3.4900057 4.99084141,3.72226864 4.63366394,3.95453159 C3.82367132,4.47956294 3.03222071,5.02508808 2.40374451,5.76774396 C0.434388969,8.09427695 0.519291809,12.0046871 2.77165682,14.1077402 C3.65288975,14.9284676 4.70295247,15.4749686 5.81742423,15.7570022 C5.81742423,15.7570022 6.13556591,15.833122 6.21754107,15.8497122 C7.36616915,16.0829511 8.53529102,16.0146384 9.62243774,15.6672199 C9.67416016,15.6525815 9.77174963,15.620377 9.76784605,15.6154975 C10.7730176,15.2700308 11.7049971,14.7010841 12.4652191,13.90573 L12.4652191,15.0241053 C12.4652191, 15.5627992 12.901444,16 13.4411138,16 C13.9798077,16 14.4170085,15.5627992 14.4170085,15.0241053 L14.4170085,11.1205264 C14.4170085,10.5818326 13.9798077,10.1446317 13.4411138,10.1446317" id="Fill-3" fill="context-fill" fill-opacity="context-fill-opacity"></path> + <path d="M5.107,7.462 C4.405,8.078 4,8.946 4,9.839 C4,10.712 4.422,11.57 5.13,12.132 C5.724,12.607 6.627,12.898 7.642,12.949 L7.642,5.8 C7.39,6.029 7.103,6.227 6.791,6.387 C5.993,6.812 5.489,7.133 5.107,7.462" id="Fill-1" fill="context-fill" fill-opacity="context-fill-opacity"></path> + </g> +</svg> diff --git a/src/chrome/skin/relay.svg b/src/chrome/skin/relay.svg deleted file mode 100644 index b2f5f16c..00000000 --- a/src/chrome/skin/relay.svg +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <!-- Generator: Sketch 48.1 (47250) - http://www.bohemiancoding.com/sketch --> - <title>relay</title> - <desc>Created with Sketch.</desc> - <defs></defs> - <g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="translate(-448.000000, -65.000000)"> - <path d="M462.904942,71.0268217 L467.575247,74.1403583 C468.095041,73.9073638 468.671277,73.7777778 469.277778,73.7777778 C471.57895,73.7777778 473.444444,75.6432726 473.444444,77.9444444 C473.444444,80.2456163 471.57895,82.1111111 469.277778,82.1111111 C468.296528,82.1111111 467.394661,81.7717448 466.682726,81.2041667 L462.234549,83.9842882 C462.366276,84.5801474 462.366276,85.197587 462.234549,85.7934462 L466.682726,88.5735677 C467.394661,88.006033 468.296528,87.6666667 469.277778,87.6666667 C471.57895,87.6666667 473.444444,89.5321615 473.444444,91.8333333 C473.444444,94.1345052 471.57895,96 469.277778,96 C466.976606,96 465.111111,94.1345052 465.111111,91.8333333 C465.111023,91.5291178 465.144147,91.2258017 465.209896,90.928776 L460.761719,88.1486545 C460.049783,88.7161892 459.147917,89.0555556 458.166667,89.0555556 C455.865495,89.0555556 454,87.1900608 454,84.8888889 C454,82.587717 455.865495,80.7222222 458.166667,80.7222222 C459.147917,80.7222222 460.049783,81.0615885 46 0.761719,81.6291233 L465.209896,78.8490017 C465.145399,78.5577257 465.111111,78.2551215 465.111111,77.9444444 C465.111111,77.2224682 465.29474,76.5433776 465.617841,75.95133 L461.36038,73.1130222 C460.739536,73.5327021 459.990981,73.7777778 459.185185,73.7777778 C457.037411,73.7777778 455.296296,72.0366629 455.296296,69.8888889 C455.296296,67.7411149 457.037411,66 459.185185,66 C461.332959,66 463.074074,67.7411149 463.074074,69.8888889 C463.074074,70.2848045 463.01491,70.6669018 462.904942,71.0268217 Z" id="Line-2" fill="#000000" fill-rule="nonzero"></path> - </g> -</svg> \ No newline at end of file diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index ed17f91d..576590a4 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -8,12 +8,12 @@ and lines drawn between them to represent Tor network inter-relay connections.

#circuit-display-content { - background-image: url(chrome://torbutton/skin/relay.svg); + background-image: url(chrome://torbutton/skin/torbutton.svg); background-position: 1em 1em; background-repeat: no-repeat; background-size: 24px auto; - background-color: rgba(255,255,255,0.4); - background-blend-mode: lighten; + background-color: rgba(255,255,255,0.15); + background-blend-mode: overlay; cursor: default; padding: 0.5em 0px 0.5em; padding-inline-end: 1em; diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index 928ba93d..28333874 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -80,5 +80,5 @@ svg#tor-circuit circle.node-circle { }

#appMenuNewCircuit { - list-style-image: url("chrome://torbutton/skin/relay.svg"); + list-style-image: url("chrome://torbutton/skin/new_circuit.svg"); }