From 58f755254821cebccd0261012584d7184d38876b Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 17 Jan 2019 11:41:50 +0100 Subject: Improve toolbar icons for all DPIs Tag #576. - Redraw toolbar SVG images, pixel-aligning them as best as possible with manual node placement on the pixel grid. - Reintroduce PNG versions for < 1.33 dppx (with added glow arrow) - Make the css adaptive around the 1.33 dppx border, using PNG below that threshold and SVG above it. --- .../palemoon/themes/windows/Toolbar-glass.png | Bin 0 -> 18803 bytes .../palemoon/themes/windows/Toolbar-glass.svg | 3718 +++++++++++++------- .../palemoon/themes/windows/Toolbar-inverted.png | Bin 0 -> 7101 bytes application/palemoon/themes/windows/Toolbar.png | Bin 0 -> 16015 bytes application/palemoon/themes/windows/Toolbar.svg | 1677 +++++---- application/palemoon/themes/windows/browser.css | 15 +- application/palemoon/themes/windows/jar.mn | 3 + .../palemoon/themes/windows/places/organizer.css | 9 +- 8 files changed, 3242 insertions(+), 2180 deletions(-) create mode 100644 application/palemoon/themes/windows/Toolbar-glass.png create mode 100644 application/palemoon/themes/windows/Toolbar-inverted.png create mode 100644 application/palemoon/themes/windows/Toolbar.png diff --git a/application/palemoon/themes/windows/Toolbar-glass.png b/application/palemoon/themes/windows/Toolbar-glass.png new file mode 100644 index 000000000..f8aac2467 Binary files /dev/null and b/application/palemoon/themes/windows/Toolbar-glass.png differ diff --git a/application/palemoon/themes/windows/Toolbar-glass.svg b/application/palemoon/themes/windows/Toolbar-glass.svg index 5212e45e7..9feaac251 100644 --- a/application/palemoon/themes/windows/Toolbar-glass.svg +++ b/application/palemoon/themes/windows/Toolbar-glass.svg @@ -6,14 +6,14 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - enable-background="new 0 0 378 38" - viewBox="0 0 378 38" - height="38" - width="378" - y="0px" - x="0px" + version="1.1" id="PaleMoonToolbarSVG" - version="1.1"> + x="0px" + y="0px" + width="378" + height="38" + viewBox="0 0 378 38" + enable-background="new 0 0 378 38"> @@ -29,1972 +29,3016 @@ + cx="10.529827" + cy="14.778796" + fx="10.529827" + fy="14.778796" + r="7.1399999" + gradientTransform="matrix(1,0,0,1.1087088,0,-1.2351844)" + gradientUnits="userSpaceOnUse" /> + id="stop4631" /> + id="stop4633" /> + cx="11.063469" + cy="38.79744" + fx="11.063469" + fy="38.79744" + r="8.7600002" + gradientTransform="matrix(1,0,0,1.0853313,0,-3.029369)" + gradientUnits="userSpaceOnUse" /> + cx="34.841751" + cy="14.552581" + fx="34.841751" + fy="14.552581" + r="7.1399999" + gradientTransform="matrix(1,0,0,1.1003056,0,-1.1335797)" + gradientUnits="userSpaceOnUse" /> + cx="58.062626" + cy="12.761739" + fx="58.062626" + fy="12.761739" + r="7.6799994" + gradientTransform="matrix(1,0,0,0.99218759,0,0.09141507)" + gradientUnits="userSpaceOnUse" /> + id="stop4599" /> + id="stop4601" /> + cx="79.305222" + cy="13.939252" + fx="79.305222" + fy="13.939252" + r="7.8000002" + gradientTransform="matrix(1,0,0,1.0769231,0,-0.86932835)" + gradientUnits="userSpaceOnUse" /> + id="stop4519" /> + id="stop4521" /> + cx="103.23091" + cy="12.664675" + fx="103.23091" + fy="12.664675" + r="9.5995998" + gradientTransform="matrix(1,0,0,0.87507716,0,1.3868386)" + gradientUnits="userSpaceOnUse" /> + id="stop4523" /> + id="stop4525" /> + cx="125.30523" + cy="16.659737" + fx="125.30523" + fy="16.659737" + r="8.3726959" + gradientTransform="matrix(1,0,0,1.0032611,0,-0.03620244)" + gradientUnits="userSpaceOnUse" /> + id="stop4703" /> + id="stop4705" /> + cx="149.26262" + cy="12.784631" + fx="149.26262" + fy="12.784631" + r="8.6400051" + gradientTransform="matrix(1,0,0,0.993055,0,0.07848724)" + gradientUnits="userSpaceOnUse" /> + id="stop4723" /> + id="stop4725" /> + cx="466.94476" + cy="12.037849" + fx="466.94476" + fy="12.037849" + r="9.6007004" + gradientTransform="matrix(0.79035186,0,0,0.79508811,-0.14216924,6.9389816e-4)" + gradientUnits="userSpaceOnUse" /> + style="stop-color:#c6cdd2;stop-opacity:1" /> + style="stop-color:#9cabb4;stop-opacity:1" /> + cx="194.44176" + cy="13.746766" + fx="194.44176" + fy="13.746766" + r="9.5999947" + gradientTransform="matrix(1,0,0,0.87500048,0,1.3876528)" + gradientUnits="userSpaceOnUse" /> + cx="239.2" + cy="11.101265" + fx="239.2" + fy="11.101265" + r="9.6000004" + gradientTransform="matrix(1,0,0,0.87500002,0,1.3876579)" + gradientUnits="userSpaceOnUse" /> + cx="242.0894" + cy="12.418613" + fx="242.0894" + fy="12.418613" + r="3.5288758" + gradientTransform="matrix(0.79274533,0,0,0.78327978,-0.14435628,0.11758726)" + gradientUnits="userSpaceOnUse" /> + cx="466.39926" + cy="31.105829" + fx="466.39926" + fy="31.105829" + r="9.7507105" + gradientTransform="matrix(1,0,0,0.99992718,0,0.00247197)" + gradientUnits="userSpaceOnUse" /> + style="stop-color:#e8e1a1;stop-opacity:1" /> + style="stop-color:#baad3e;stop-opacity:1" /> + cx="217.95329" + cy="16.56296" + fx="217.95329" + fy="16.56296" + r="10.35937" + gradientTransform="matrix(1,0,0,0.8160434,0,2.0506693)" + gradientUnits="userSpaceOnUse" /> + cx="262.79288" + cy="15.840806" + fx="262.79288" + fy="15.840806" + r="8.5577164" + gradientTransform="matrix(1,0,0,0.9969072,0,0.03528241)" + gradientUnits="userSpaceOnUse" /> + cx="286.58698" + cy="14.171478" + fx="286.58698" + fy="14.171478" + r="8.53125" + gradientUnits="userSpaceOnUse" /> + cx="308.97141" + cy="14.457072" + fx="308.97141" + fy="14.457072" + r="6.09375" + gradientTransform="matrix(1,0,0,1.4,0,-4.4901397)" + gradientUnits="userSpaceOnUse" /> + cx="331.15933" + cy="13.119289" + fx="331.15933" + fy="13.119289" + r="8.53125" + gradientUnits="userSpaceOnUse" /> - + + id="radialGradient4949" + cx="375.97003" + cy="11.407905" + fx="375.97003" + fy="11.407905" + r="6.09375" + gradientUnits="userSpaceOnUse" /> + cx="400.5007" + cy="13.518586" + fx="400.5007" + fy="13.518586" + r="8.5350475" + gradientTransform="matrix(1,0,0,0.99701325,0,0.03407254)" + gradientUnits="userSpaceOnUse" /> + cx="417.02075" + cy="15.742972" + fx="417.02075" + fy="15.742972" + r="8.53125" + gradientTransform="matrix(1.357667,-0.02466618,0.02411975,1.3275908,-149.53429,5.1574131)" + gradientUnits="userSpaceOnUse" /> + id="stop4971" /> + id="stop4973" /> + cx="444.33652" + cy="11.316628" + fx="444.33652" + fy="11.316628" + r="8.53125" + gradientTransform="matrix(1,0,0,0.71428563,0,3.2333231)" + gradientUnits="userSpaceOnUse" /> + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)" + cx="134.97461" + cy="9" + fx="134.97461" + fy="9" + r="7.9746099" /> + id="stop4743" /> + id="stop4745" /> - + gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)" + cx="132.6468" + cy="9.0947113" + fx="132.6468" + fy="9.0947113" + r="7.9746099" /> + + cx="166.37157" + cy="11.485105" + fx="166.37157" + fy="11.485105" + r="0.31640625" + gradientTransform="matrix(1,0,0,28.000001,0,-310.09784)" + gradientUnits="userSpaceOnUse" /> + cx="125.30523" + cy="16.659737" + fx="125.30523" + fy="16.659737" + r="8.3726959" + gradientTransform="matrix(1,0,0,1.0032611,0.11563445,22.233158)" + gradientUnits="userSpaceOnUse" /> + style="stop-color:#22e23d;stop-opacity:1" /> + style="stop-color:#38a748;stop-opacity:1" /> + style="color-interpolation-filters:sRGB;" + id="filter4883"> + result="flood" + id="feFlood4873" /> + operator="out" + result="composite1" + id="feComposite4875" /> + result="blur" + id="feGaussianBlur4877" /> + result="offset" + id="feOffset4879" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite4881" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6673" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter4895"> + result="flood" + id="feFlood4885" /> + operator="out" + result="composite1" + id="feComposite4887" /> + result="blur" + id="feGaussianBlur4889" /> + result="offset" + id="feOffset4891" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite4893" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6685" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter4907"> + result="flood" + id="feFlood4897" /> + operator="out" + result="composite1" + id="feComposite4899" /> + result="blur" + id="feGaussianBlur4901" /> + result="offset" + id="feOffset4903" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite4905" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6697" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter4919"> + result="flood" + id="feFlood4909" /> + operator="out" + result="composite1" + id="feComposite4911" /> + result="blur" + id="feGaussianBlur4913" /> + result="offset" + id="feOffset4915" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite4917" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6709" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter4931"> + result="flood" + id="feFlood4921" /> + operator="out" + result="composite1" + id="feComposite4923" /> + result="blur" + id="feGaussianBlur4925" /> + result="offset" + id="feOffset4927" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite4929" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6721" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter4943"> + result="flood" + id="feFlood4933" /> + operator="out" + result="composite1" + id="feComposite4935" /> + result="blur" + id="feGaussianBlur4937" /> + result="offset" + id="feOffset4939" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite4941" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6733" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter4955"> + result="flood" + id="feFlood4945" /> + operator="out" + result="composite1" + id="feComposite4947" /> + result="blur" + id="feGaussianBlur4949" /> + result="offset" + id="feOffset4951" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite4953" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6745" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter4967"> + result="flood" + id="feFlood4957" /> + operator="out" + result="composite1" + id="feComposite4959" /> + result="blur" + id="feGaussianBlur4961" /> + result="offset" + id="feOffset4963" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite4965" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6757" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter4979"> + result="flood" + id="feFlood4969" /> + operator="out" + result="composite1" + id="feComposite4971" /> + result="blur" + id="feGaussianBlur4973" /> + result="offset" + id="feOffset4975" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite4977" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6769" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter4991"> + result="flood" + id="feFlood4981" /> + operator="out" + result="composite1" + id="feComposite4983" /> + result="blur" + id="feGaussianBlur4985" /> + result="offset" + id="feOffset4987" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite4989" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6781" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter5003"> + result="flood" + id="feFlood4993" /> + operator="out" + result="composite1" + id="feComposite4995" /> + result="blur" + id="feGaussianBlur4997" /> + result="offset" + id="feOffset4999" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite5001" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6793" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter5015"> + result="flood" + id="feFlood5005" /> + operator="out" + result="composite1" + id="feComposite5007" /> + result="blur" + id="feGaussianBlur5009" /> + result="offset" + id="feOffset5011" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite5013" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6805" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter5027"> + result="flood" + id="feFlood5017" /> + operator="out" + result="composite1" + id="feComposite5019" /> + result="blur" + id="feGaussianBlur5021" /> + result="offset" + id="feOffset5023" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite5025" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6817" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter5039"> + result="flood" + id="feFlood5029" /> + operator="out" + result="composite1" + id="feComposite5031" /> + result="blur" + id="feGaussianBlur5033" /> + result="offset" + id="feOffset5035" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite5037" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6829" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter5051"> + result="flood" + id="feFlood5041" /> + operator="out" + result="composite1" + id="feComposite5043" /> + result="blur" + id="feGaussianBlur5045" /> + result="offset" + id="feOffset5047" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite5049" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6841" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter5063"> + result="flood" + id="feFlood5053" /> + operator="out" + result="composite1" + id="feComposite5055" /> + result="blur" + id="feGaussianBlur5057" /> + result="offset" + id="feOffset5059" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite5061" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6853" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter5075"> + result="flood" + id="feFlood5065" /> + operator="out" + result="composite1" + id="feComposite5067" /> + result="blur" + id="feGaussianBlur5069" /> + result="offset" + id="feOffset5071" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite5073" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6865" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter5087"> + result="flood" + id="feFlood5077" /> + operator="out" + result="composite1" + id="feComposite5079" /> + result="blur" + id="feGaussianBlur5081" /> + result="offset" + id="feOffset5083" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite5085" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6877" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter5099"> + result="flood" + id="feFlood5089" /> + operator="out" + result="composite1" + id="feComposite5091" /> + result="blur" + id="feGaussianBlur5093" /> + result="offset" + id="feOffset5095" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite5097" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6889" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter5111"> + result="flood" + id="feFlood5101" /> + operator="out" + result="composite1" + id="feComposite5103" /> + result="blur" + id="feGaussianBlur5105" /> + result="offset" + id="feOffset5107" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite5109" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6901" /> + flood-color="rgb(255,255,255)" + result="flood" + in="fbSourceGraphic" /> + in="flood" + operator="in" + result="composite1" /> + stdDeviation="1" + result="blur" /> + dy="0" + result="offset" /> + in="fbSourceGraphic" + operator="over" + result="composite2" /> + style="color-interpolation-filters:sRGB;" + id="filter5123"> + result="flood" + id="feFlood5113" /> + operator="out" + result="composite1" + id="feComposite5115" /> + result="blur" + id="feGaussianBlur5117" /> + result="offset" + id="feOffset5119" /> + operator="atop" + result="fbSourceGraphic" + id="feComposite5121" /> + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6913" /> + + + + + + + + + + + + + + + + + + + + + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood5137" /> + + + + + + + + + + + + + + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite5151" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + stdDeviation="0.5" + result="blur" + id="feGaussianBlur4927" /> + result="offset" + id="feOffset4929" /> + id="feComposite4931" /> + + + + style="color-interpolation-filters:sRGB" + id="filter4969"> + result="flood" + id="feFlood4959" /> + operator="out" + result="composite1" + id="feComposite4961" /> + result="blur" + id="feGaussianBlur4963" /> + result="offset" + id="feOffset4965" /> - + operator="atop" + result="composite2" + id="feComposite4967" /> + + + + id="feFlood4979" /> + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4981" /> + stdDeviation="0.5" + result="blur" + id="feGaussianBlur4983" /> + result="offset" + id="feOffset4985" /> + id="feComposite4987" /> + + style="color-interpolation-filters:sRGB" + id="filter5009"> + result="flood" + id="feFlood4999" /> + operator="out" + result="composite1" + id="feComposite5001-8" /> + result="blur" + id="feGaussianBlur5003" /> + result="offset" + id="feOffset5005" /> - + operator="atop" + result="composite2" + id="feComposite5007-3" /> + + + + id="feFlood4719" /> + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4721" /> + stdDeviation="1" + result="blur" + id="feGaussianBlur4723" /> + dy="0" + result="offset" + id="feOffset4725" /> + id="feComposite4727" /> + + style="color-interpolation-filters:sRGB" + id="filter4774"> + result="flood" + id="feFlood4764" /> + operator="out" + result="composite1" + id="feComposite4766" /> + result="blur" + id="feGaussianBlur4768" /> + result="offset" + id="feOffset4770" /> - + operator="atop" + result="composite2" + id="feComposite4772" /> + + + + + + id="feFlood4834" /> + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4836" /> + stdDeviation="0.5" + result="blur" + id="feGaussianBlur4838" /> + dy="0" + result="offset" + id="feOffset4840" /> + id="feComposite4842" /> + @@ -2003,172 +3047,172 @@ result="flood" flood-color="rgb(255,255,255)" flood-opacity="1" - id="feFlood6963" /> + id="feFlood10221" /> + id="feGaussianBlur10225" /> + id="feOffset10227" /> + style="filter:url(#filter10217)" + id="g7757"> + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + style="display:inline;fill:url(#radialGradient4669-9);fill-opacity:1;stroke-width:1;filter:url(#filter4701)" + d="m 17.870749,13.841269 -6.303534,-0.0074 2.264363,2.148431 c 0.615648,0.584128 0.72,1.44 0.24,1.92 l -0.96,1.08 c -0.48,0.48 -1.32,0.36 -1.92,-0.24 0,0 -6.4200001,-6.6 -6.4800001,-6.6 -0.06,0 -0.36,-0.48 -0.48,-0.84 0,-0.359999 0.36,-0.719999 0.48,-0.839999 l 6.3600001,-6.48 c 0.6,-0.6000001 1.44,-0.7200001 1.92,-0.24 l 0.96,1.0799999 c 0.48,0.48 0.36,1.32 -0.24,1.9200001 l -2.144363,2.0610645 6.359451,0.043374 c 0.719983,0.00491 1.227959,0.50779 1.227959,1.2277905 v 2.483369 c 0,0.72 -0.563877,1.284215 -1.283876,1.28337 z" + id="path4" /> + d="m 19.187889,37.765372 -7.620674,-0.0365 3.352509,3.266174 c 0.515294,0.50108 0.829738,1.388534 0.443269,1.764345 l -1.759464,1.992905 c -0.356609,0.403923 -1.52102,-0.108922 -2.036314,-0.735274 L 3.9756591,36.471238 c 0,0 -0.7399492,-0.710192 -0.7399492,-1.211274 0,-0.501081 0.7399492,-1.303987 0.7399492,-1.303987 l 7.5915559,-7.545783 c 0.515294,-0.50108 1.613776,-1.093109 1.980397,-0.698138 l 1.815381,1.955768 c 0.386469,0.375811 0.172889,1.300401 -0.471228,1.801482 l -3.32455,3.229041 7.620674,0.02842 c 0.772936,0.0029 1.344153,0.417712 1.344153,1.169335 v 2.560987 c 0,0.751622 -0.571221,1.311987 -1.344153,1.308283 z" /> + d="m 26.776124,12.612425 v -2.53895 c 0,-0.7200003 0.480206,-1.3282747 1.2,-1.3111602 l 5.76,0.041051 L 31.66,6.7412646 c -0.602042,-0.5979755 -0.72,-1.4399999 -0.24,-1.92 l 0.96,-1.08 c 0.48,-0.48 1.32,-0.36 1.92,0.24 l 6.36,6.4800004 c 0.12,0.12 0.48,0.48 0.48,0.84 0,0.36 -0.36,0.84 -0.48,0.84 l -6.48,6.48 c -0.6,0.6 -1.44,0.72 -1.92,0.24 l -0.96,-1.08 c -0.48,-0.48 -0.36,-1.32 0.24,-1.92 L 33.736124,13.833888 28.06,13.868005 c -0.719987,0.0043 -1.283876,-0.53558 -1.283876,-1.25558 z" /> + d="m 64.708108,6.2881044 -5.061037,5.0305226 5.061037,5.030522 -2.530518,2.515261 -5.061038,-5.030522 -5.061037,5.030522 -2.530519,-2.515261 5.061037,-5.030522 -5.061037,-5.0305226 2.530519,-2.5152612 5.061037,5.0305223 5.061038,-5.0305223 z" /> + d="m 87.482777,11.318627 h -8.856816 l 3.13833,-3.0716727 C 81.15648,7.545735 80.363876,6.712205 79.283876,6.712205 c -2.64,0 -5.107543,1.9376803 -5.107543,4.577681 0,2.64 2.411627,5.050109 5.051627,5.050109 1.68,0 3.619039,-1.066107 4.459039,-2.506107 l 2.530518,1.25763 c -1.32,2.4 -3.961599,4.443007 -6.961599,4.443007 -4.32,0 -8.219378,-3.896849 -8.219378,-8.216849 0,-4.3200008 3.927337,-7.633261 8.247337,-7.633261 1.8,0 3.619792,0.8778997 5.059792,1.9578998 l 3.139108,-3.1271021 z" /> + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + style="display:inline;fill:url(#radialGradient4529-9);fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1;filter:url(#filter4783)" + d="M 102.66589,2.5152127 92.543814,11.318627 h 3.795778 v 7.545783 h 5.061038 v -5.030522 h 2.53052 v 5.030522 h 5.06104 v -7.545783 h 3.79577 z" + id="path4209" /> + d="m 133.03211,12.576257 -6.32629,6.288153 c -0.24,0.36 -0.82401,0.692435 -1.30401,0.692435 -0.48,0 -0.86651,-0.332435 -1.22651,-0.692435 l -6.3263,-6.288153 c -0.79571,-0.72 -0.93921,-1.286268 0.0208,-1.280462 l 3.77501,0.02283 -0.0107,-7.5841022 c -0.001,-0.7199993 0.50796,-1.1722101 1.22796,-1.1722101 h 5.10754 c 0.72,0 1.22426,0.4800094 1.22796,1.2 l 0.0388,7.5563123 3.80118,-0.05062 c 0.95992,-0.01278 0.71459,0.588252 -0.005,1.308252 z" /> + d="m 148.19571,20.103585 c -4.8,0 -8.89163,-3.97895 -8.89163,-8.77895 0,-4.6800005 4.11959,-8.7145303 8.91959,-8.7145303 4.8,0 8.80776,3.9511599 8.80776,8.7511603 0,4.68 -4.03572,8.74232 -8.83572,8.74232 z m 0.0559,-15.04801 c -3.36,0 -6.39142,2.9178996 -6.39142,6.2779 0,3.24 2.9755,6.22232 6.3355,6.22232 3.36,0 6.33551,-2.86232 6.33551,-6.22232 0,-3.3600004 -2.91959,-6.2779 -6.27959,-6.2779 z m -0.63959,7.520682 c -0.48,-0.12 -0.63716,-0.735044 -0.64429,-1.214992 l -0.0559,-3.7667402 c -0.0107,-0.7199217 0.53592,-1.28337 1.25592,-1.28337 0.72,0 1.27834,0.535601 1.28388,1.25558 l 0.0289,3.7518922 c 1.32,1.32 2.53051,3.772891 2.53051,3.772891 0,0 -3.07896,-1.195261 -4.39896,-2.515261 z" /> + d="m 369.00476,4.7878231 0.94842,1.9083504 0.47422,0.858758 0.94842,0.190835 2.18136,0.3816699 -1.61231,1.7175156 -0.6639,0.667923 0.0948,0.954175 0.37937,2.290022 -1.89685,-0.954178 -0.85358,-0.477086 -0.85358,0.477086 -1.89685,0.954178 0.37938,-2.290022 0.0948,-0.954175 -0.6639,-0.667923 -1.61232,-1.7175156 2.27622,-0.3816699 0.94842,-0.190835 0.37936,-0.858758 0.94843,-1.9083504 m 0,-3.4350309 c -0.28454,0 -0.56906,0.1908348 -0.75874,0.667922 l -1.89683,3.9121193 -4.07821,0.6679227 c -0.94842,0.190835 -1.13812,0.8587576 -0.47421,1.5266802 l 2.94011,3.1487776 -0.66391,4.389208 c -0.0948,0.572504 0.1897,0.954174 0.66391,0.954174 0.18967,0 0.37936,-0.09542 0.56905,-0.190835 l 3.69885,-2.003768 3.69884,2.003768 c 0.18969,0.09543 0.47421,0.190835 0.56906,0.190835 0.4742,0 0.75873,-0.38167 0.6639,-1.049592 l -0.6639,-4.389207 2.9401,-3.1487781 c 0.66391,-0.6679226 0.37938,-1.3358454 -0.4742,-1.5266803 L 371.66031,5.837416 369.76347,1.9252968 C 369.5738,1.543627 369.28926,1.3527922 369.00474,1.3527922 Z" /> + d="m 202.62125,17.648005 -2.53039,-0.04122 1.26526,2.515261 h -15.18311 l 1.26526,-2.515261 -2.51784,0.02249 c -0.71997,0.0064 -1.31817,-0.563397 -1.31184,-1.28337 l 0.0559,-6.3612693 c 0.006,-0.7199727 0.59192,-1.2112687 1.31183,-1.2000001 l 1.19667,0.018731 0.0313,-2.5298907 c 0.009,-0.7199457 0.51397,-1.243001 1.23397,-1.243001 l 0.022,-1.2403691 c 0.0127,-0.7198886 0.6198,-1.2535885 1.33979,-1.2555799 l 10.04733,-0.02779 c 0.72,-0.00199 1.21931,0.5078413 1.22796,1.22779 l 0.0156,1.295949 c 0.72,0 1.2692,0.5785813 1.26831,1.2985809 l -0.003,2.4743108 1.26513,-1e-7 c 0.71992,-0.010711 1.26205,0.5376375 1.26526,1.2576305 v 6.288153 c 0,0.729621 -0.61509,1.257631 -1.26526,1.257631 z m -15.18298,-0.04122 1.26526,-2.515262 h -1.26526 z m 0.6,-6.288153 h -0.6 -0.6 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.25348,-0.503016 -0.6,-0.6 z M 198.8256,5.0304738 c 0,-0.72 -0.54528,-1.2523398 -1.26526,-1.2576306 h -7.59155 c -0.71998,-0.00529 -1.28117,0.5378043 -1.26526,1.2576306 v 3.7728917 c 0.0159,0.7198264 0.54528,1.2629215 1.26526,1.2576305 h 7.59155 c 0.71999,-0.0053 1.24942,-0.5078188 1.25592,-1.2277899 z m -1.26526,10.0610482 h -7.59155 l -1.26526,3.772892 h 10.12207 z m 2.53052,0 h -1.26526 l 1.26526,2.515262 z" /> - + + d="m 248.17426,18.945466 -16.43876,-0.02779 c -0.96,-0.0016 -1.40468,-0.339789 -1.40858,-1.299781 l -0.0559,-13.7557998 c -0.004,-0.959992 0.47654,-1.3847678 1.43653,-1.3831504 l 16.49468,0.02779 c 0.96,0.00162 1.24473,0.3675784 1.24083,1.3275705 l -0.0559,13.7557997 c -0.004,0.959992 -0.25287,1.356983 -1.21287,1.355361 z M 239.88388,3.8178947 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 2.64346,0 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.36,0.6 0.6,0.6 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 3.72,0 h -1.2 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 0.65592,4.9945298 c 0.005,-0.7199803 -0.53592,-1.2538267 -1.25592,-1.2555798 l -11.41287,-0.02779 c -0.72,-0.00175 -1.22533,0.5077946 -1.22796,1.2277899 l -0.028,7.6724304 c -0.003,0.719994 0.50796,1.175707 1.22795,1.172209 l 11.44083,-0.05558 c 0.71999,-0.0035 1.19464,-0.507809 1.2,-1.227789 z" /> + + + + id="path6182" + style="display:inline;fill:url(#radialGradient5031-1);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5049)" /> + style="display:inline;fill:url(#radialGradient4813-2);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4825)" /> + id="path7886" + style="display:inline;fill:url(#radialGradient4861-6);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4873)" /> + style="display:inline;fill:url(#radialGradient4881-9);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4893)" /> + style="display:inline;fill:url(#radialGradient4901-6);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4913)" /> + style="display:inline;fill:url(#radialGradient4921-8);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4933)" /> + style="display:inline;fill:url(#radialGradient4941-9);fill-opacity:1;stroke-width:0.96615839" /> + style="display:inline;fill:url(#radialGradient4949-5);fill-opacity:1;stroke-width:0.96615839" /> + style="display:inline;fill:url(#radialGradient4957-2);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4969)" /> + style="display:inline;fill:url(#radialGradient4977-4);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4989)" /> + style="display:inline;fill:url(#radialGradient4997-5);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5009)" /> + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + style="display:inline" + id="g4779"> + id="bookmarks-star-4" + d="M 165.92886,2.5152127 V 20.122041 h 8.85681 1.26526 2.53052 c 1.26526,0 2.53052,-1.257631 2.53052,-2.515261 V 15.091518 7.545735 5.0304738 c 0,-1.2576306 -1.26526,-2.5152611 -2.53052,-2.5152611 h -2.53052 -1.26526 z m 7.59155,2.5152611 1.26526,2.5152612 c 0,0 0.39827,0.9972133 0.68613,1.1930622 0.26974,0.1834496 1.07417,0.064568 1.07417,0.064568 h 3.30074 l -2.53052,3.1379238 c 0,0 -0.38069,0.332603 -0.51773,0.634968 -0.20593,0.452534 -0.18971,0.518683 -0.12151,1.257631 0.10732,1.162403 0.63924,3.772892 0.63924,3.772892 l -2.53052,-1.257631 c 0,0 -0.77873,-0.42944 -1.26526,-0.430166 -0.5721,0 -1.26526,0.430166 -1.26526,0.430166 l -2.53051,1.257631 c 0,0 0.56012,-2.658345 0.73559,-3.772892 0.11606,-0.733074 0.10061,-0.753616 -0.15752,-1.257631 -0.13995,-0.274086 -0.57807,-0.782455 -0.57807,-0.782455 l -2.53052,-2.9904368 h 3.02161 c 0,0 0.91024,-0.099407 1.27135,-0.3263622 0.27408,-0.1711231 0.76807,-0.9312683 0.76807,-0.9312683 z" + style="fill:url(#radialGradient4710-4);fill-opacity:1;stroke-width:1.265625;filter:url(#filter4729)" /> + id="bookmarks-overlay-1" + d="m 163.39834,2.5152127 c -1.26526,0 -2.53052,1.2576305 -2.53052,2.5152611 v 2.5152612 7.545783 2.515262 c 0,1.25763 1.26526,2.515261 2.53052,2.515261 h 2.91839 l 0.0559,-4.840061 V 7.6882296 l 0.028,-5.1730169 z" + style="fill:url(#radialGradient4712-2);fill-opacity:1;stroke:none;stroke-width:1.265625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill;filter:url(#filter4774)" /> + id="bookmarks-divider-7" + d="M 165.92886,2.5152127 V 20.122041" + style="opacity:0.66300001;fill:url(#radialGradient4714-4);fill-opacity:1;stroke:url(#radialGradient4750-3);stroke-width:1.2614392;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 133.03211,35.213608 -6.32629,6.288153 c -0.24,0.36 -0.8202,0.518975 -1.3002,0.518975 -0.48,0 -0.87032,-0.158975 -1.23032,-0.518975 l -6.3263,-6.288153 c -0.6,-0.72 -0.96335,-1.29465 -0.003,-1.287183 l 3.79916,0.02955 -0.0908,-7.535242 c -0.009,-0.719949 0.67572,-1.307177 1.39571,-1.31116 l 5.02367,-0.02779 c 0.71999,-0.004 1.25401,0.619416 1.22796,1.33895 l 0.035,7.535242 3.80499,-0.02955 c 0.95998,-0.0075 0.71078,0.567183 -0.009,1.287183 z" /> diff --git a/application/palemoon/themes/windows/Toolbar-inverted.png b/application/palemoon/themes/windows/Toolbar-inverted.png new file mode 100644 index 000000000..54d83bf5f Binary files /dev/null and b/application/palemoon/themes/windows/Toolbar-inverted.png differ diff --git a/application/palemoon/themes/windows/Toolbar.png b/application/palemoon/themes/windows/Toolbar.png new file mode 100644 index 000000000..8ec756e03 Binary files /dev/null and b/application/palemoon/themes/windows/Toolbar.png differ diff --git a/application/palemoon/themes/windows/Toolbar.svg b/application/palemoon/themes/windows/Toolbar.svg index 314e020fb..7a68c0608 100644 --- a/application/palemoon/themes/windows/Toolbar.svg +++ b/application/palemoon/themes/windows/Toolbar.svg @@ -6,14 +6,14 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - enable-background="new 0 0 378 38" - viewBox="0 0 378 38" - height="38" - width="378" - y="0px" - x="0px" + version="1.1" id="PaleMoonToolbarSVG" - version="1.1"> + x="0px" + y="0px" + width="378" + height="38" + viewBox="0 0 378 38" + enable-background="new 0 0 378 38"> @@ -29,1329 +29,1328 @@ + id="globalGradient" + cy="0.69999999"> + style="stop-color:#87939b;stop-opacity:1" /> + style="stop-color:#45555f;stop-opacity:1" /> + result="flood" + id="feFlood1875" /> + operator="out" + result="composite1" + id="feComposite1877" /> + result="blur" + id="feGaussianBlur1879" /> + result="offset" + id="feOffset1881" /> + operator="atop" + result="composite2" + id="feComposite1883" /> + style="color-interpolation-filters:sRGB;" + id="filter2164"> + result="flood" + id="feFlood2154" /> + operator="out" + result="composite1" + id="feComposite2156" /> + result="blur" + id="feGaussianBlur2158" /> + result="offset" + id="feOffset2160" /> + operator="atop" + result="composite2" + id="feComposite2162" /> + fy="12.21416" + fx="95.643087" + cx="95.643087" + gradientTransform="matrix(1.0350983,0,0,0.96609178,0,18)" + id="globalGradient-8" + cy="12.21416"> + style="stop-color:#12d92d;stop-opacity:1" /> + style="stop-color:#01b222;stop-opacity:1" /> + cx="10.529827" + cy="14.778796" + fx="10.529827" + fy="14.778796" + r="7.1399999" + gradientTransform="matrix(1,0,0,1.1087088,0,-1.2351844)" + gradientUnits="userSpaceOnUse" /> + id="stop4631" /> + id="stop4633" /> + style="color-interpolation-filters:sRGB" + id="filter4701"> + result="flood" + id="feFlood4691" /> + operator="out" + result="composite1" + id="feComposite4693" /> + result="blur" + id="feGaussianBlur4695" /> + result="offset" + id="feOffset4697" /> + operator="atop" + result="composite2" + id="feComposite4699" /> + cx="11.063469" + cy="38.79744" + fx="11.063469" + fy="38.79744" + r="8.7600002" + gradientTransform="matrix(1,0,0,1.0853313,0,-3.029369)" + gradientUnits="userSpaceOnUse" /> + style="color-interpolation-filters:sRGB" + id="filter4661"> + result="flood" + id="feFlood4651" /> + operator="out" + result="composite1" + id="feComposite4653" /> + result="blur" + id="feGaussianBlur4655" /> + result="offset" + id="feOffset4657" /> + operator="atop" + result="composite2" + id="feComposite4659" /> + cx="34.841751" + cy="14.552581" + fx="34.841751" + fy="14.552581" + r="7.1399999" + gradientTransform="matrix(1,0,0,1.1003056,0,-1.1335797)" + gradientUnits="userSpaceOnUse" /> + style="color-interpolation-filters:sRGB" + id="filter4689"> + result="flood" + id="feFlood4679" /> + operator="out" + result="composite1" + id="feComposite4681" /> + result="blur" + id="feGaussianBlur4683" /> + result="offset" + id="feOffset4685" /> + operator="atop" + result="composite2" + id="feComposite4687" /> + cx="58.062626" + cy="12.761739" + fx="58.062626" + fy="12.761739" + r="7.6799994" + gradientTransform="matrix(1,0,0,0.99218759,0,0.09141507)" + gradientUnits="userSpaceOnUse" /> + id="stop4599" /> + id="stop4601" /> + style="color-interpolation-filters:sRGB" + id="filter4629"> + result="flood" + id="feFlood4619" /> + operator="out" + result="composite1" + id="feComposite4621" /> + result="blur" + id="feGaussianBlur4623" /> + result="offset" + id="feOffset4625" /> + operator="atop" + result="composite2" + id="feComposite4627" /> + cx="79.305222" + cy="13.939252" + fx="79.305222" + fy="13.939252" + r="7.8000002" + gradientTransform="matrix(1,0,0,1.0769231,0,-0.86932835)" + gradientUnits="userSpaceOnUse" /> + id="stop4519" /> + id="stop4521" /> + style="color-interpolation-filters:sRGB" + id="filter4597"> + result="flood" + id="feFlood4587" /> + operator="out" + result="composite1" + id="feComposite4589" /> + result="blur" + id="feGaussianBlur4591" /> + result="offset" + id="feOffset4593" /> + operator="atop" + result="composite2" + id="feComposite4595" /> + cx="103.23091" + cy="12.664675" + fx="103.23091" + fy="12.664675" + r="9.5995998" + gradientTransform="matrix(1,0,0,0.87507716,0,1.3868386)" + gradientUnits="userSpaceOnUse" /> + id="stop4523" /> + id="stop4525" /> + style="color-interpolation-filters:sRGB" + id="filter4783"> + result="flood" + id="feFlood4773" /> + operator="out" + result="composite1" + id="feComposite4775" /> + result="blur" + id="feGaussianBlur4777" /> + result="offset" + id="feOffset4779" /> + operator="atop" + result="composite2" + id="feComposite4781" /> + cx="125.30523" + cy="16.659737" + fx="125.30523" + fy="16.659737" + r="8.3726959" + gradientTransform="matrix(1,0,0,1.0032611,0,-0.03620244)" + gradientUnits="userSpaceOnUse" /> + id="stop4703" /> + id="stop4705" /> + style="color-interpolation-filters:sRGB" + id="filter4721"> + result="flood" + id="feFlood4711" /> + operator="out" + result="composite1" + id="feComposite4713" /> + result="blur" + id="feGaussianBlur4715" /> + result="offset" + id="feOffset4717" /> + operator="atop" + result="composite2" + id="feComposite4719" /> + cx="149.26262" + cy="12.784631" + fx="149.26262" + fy="12.784631" + r="8.6400051" + gradientTransform="matrix(1,0,0,0.993055,0,0.07848724)" + gradientUnits="userSpaceOnUse" /> + id="stop4723" /> + id="stop4725" /> + style="color-interpolation-filters:sRGB" + id="filter4741"> + result="flood" + id="feFlood4731" /> + operator="out" + result="composite1" + id="feComposite4733" /> + result="blur" + id="feGaussianBlur4735" /> + result="offset" + id="feOffset4737" /> + operator="atop" + result="composite2" + id="feComposite4739" /> + cx="466.94476" + cy="12.037849" + fx="466.94476" + fy="12.037849" + r="9.6007004" + gradientTransform="matrix(0.79035186,0,0,0.79508811,-0.14216924,6.9389816e-4)" + gradientUnits="userSpaceOnUse" /> + style="stop-color:#c6cdd2;stop-opacity:1" /> + style="stop-color:#9cabb4;stop-opacity:1" /> + cx="194.44176" + cy="13.746766" + fx="194.44176" + fy="13.746766" + r="9.5999947" + gradientTransform="matrix(1,0,0,0.87500048,0,1.3876528)" + gradientUnits="userSpaceOnUse" /> + style="color-interpolation-filters:sRGB" + id="filter4805"> + result="flood" + id="feFlood4795" /> + operator="out" + result="composite1" + id="feComposite4797" /> + result="blur" + id="feGaussianBlur4799" /> + result="offset" + id="feOffset4801" /> + operator="atop" + result="composite2" + id="feComposite4803" /> + cx="239.2" + cy="11.101265" + fx="239.2" + fy="11.101265" + r="9.6000004" + gradientTransform="matrix(1,0,0,0.87500002,0,1.3876579)" + gradientUnits="userSpaceOnUse" /> + style="color-interpolation-filters:sRGB" + id="filter4853"> + result="flood" + id="feFlood4843" /> + operator="out" + result="composite1" + id="feComposite4845" /> + result="blur" + id="feGaussianBlur4847" /> + result="offset" + id="feOffset4849" /> + operator="atop" + result="composite2" + id="feComposite4851" /> - + + cx="242.0894" + cy="12.418613" + fx="242.0894" + fy="12.418613" + r="3.5288758" + gradientTransform="matrix(1,0,0,0.9880597,0,0.14828194)" + gradientUnits="userSpaceOnUse" /> + cx="466.39926" + cy="31.105829" + fx="466.39926" + fy="31.105829" + r="9.7507105" + gradientTransform="matrix(1,0,0,0.99992718,0,0.00247197)" + gradientUnits="userSpaceOnUse" /> + style="stop-color:#e8e1a1;stop-opacity:1" /> + style="stop-color:#baad3e;stop-opacity:1" /> + style="color-interpolation-filters:sRGB" + id="filter5049"> + result="flood" + id="feFlood5039" /> + operator="out" + result="composite1" + id="feComposite5041" /> + result="blur" + id="feGaussianBlur5043" /> + result="offset" + id="feOffset5045" /> + operator="atop" + result="composite2" + id="feComposite5047" /> + cx="217.95329" + cy="16.56296" + fx="217.95329" + fy="16.56296" + r="10.35937" + gradientTransform="matrix(1,0,0,0.8160434,0,2.0506693)" + gradientUnits="userSpaceOnUse" /> + style="color-interpolation-filters:sRGB" + id="filter4825"> + result="flood" + id="feFlood4815" /> + operator="out" + result="composite1" + id="feComposite4817" /> + result="blur" + id="feGaussianBlur4819" /> + result="offset" + id="feOffset4821" /> + operator="atop" + result="composite2" + id="feComposite4823" /> + cx="262.79288" + cy="15.840806" + fx="262.79288" + fy="15.840806" + r="8.5577164" + gradientTransform="matrix(1,0,0,0.9969072,0,0.03528241)" + gradientUnits="userSpaceOnUse" /> + style="color-interpolation-filters:sRGB" + id="filter4873"> + result="flood" + id="feFlood4863" /> + operator="out" + result="composite1" + id="feComposite4865" /> + result="blur" + id="feGaussianBlur4867" /> + result="offset" + id="feOffset4869" /> + operator="atop" + result="composite2" + id="feComposite4871" /> + cx="286.58698" + cy="14.171478" + fx="286.58698" + fy="14.171478" + r="8.53125" + gradientUnits="userSpaceOnUse" /> + style="color-interpolation-filters:sRGB" + id="filter4893"> + result="flood" + id="feFlood4883" /> + operator="out" + result="composite1" + id="feComposite4885" /> + result="blur" + id="feGaussianBlur4887" /> + result="offset" + id="feOffset4889" /> + operator="atop" + result="composite2" + id="feComposite4891" /> + cx="308.97141" + cy="14.457072" + fx="308.97141" + fy="14.457072" + r="6.09375" + gradientTransform="matrix(1,0,0,1.4,0,-4.4901397)" + gradientUnits="userSpaceOnUse" /> + style="color-interpolation-filters:sRGB" + id="filter4913"> + result="flood" + id="feFlood4903" /> + operator="out" + result="composite1" + id="feComposite4905" /> + result="blur" + id="feGaussianBlur4907" /> + result="offset" + id="feOffset4909" /> + operator="atop" + result="composite2" + id="feComposite4911" /> + cx="331.15933" + cy="13.119289" + fx="331.15933" + fy="13.119289" + r="8.53125" + gradientUnits="userSpaceOnUse" /> + style="color-interpolation-filters:sRGB" + id="filter4933"> + result="flood" + id="feFlood4923" /> + operator="out" + result="composite1" + id="feComposite4925" /> + result="blur" + id="feGaussianBlur4927" /> + result="offset" + id="feOffset4929" /> + operator="atop" + result="composite2" + id="feComposite4931" /> - + + id="radialGradient4949" + cx="375.97003" + cy="11.407905" + fx="375.97003" + fy="11.407905" + r="6.09375" + gradientUnits="userSpaceOnUse" /> + cx="400.5007" + cy="13.518586" + fx="400.5007" + fy="13.518586" + r="8.5350475" + gradientTransform="matrix(1,0,0,0.99701325,0,0.03407254)" + gradientUnits="userSpaceOnUse" /> + style="color-interpolation-filters:sRGB" + id="filter4969"> + result="flood" + id="feFlood4959" /> + operator="out" + result="composite1" + id="feComposite4961" /> + result="blur" + id="feGaussianBlur4963" /> + result="offset" + id="feOffset4965" /> + operator="atop" + result="composite2" + id="feComposite4967" /> + cx="417.02075" + cy="15.742972" + fx="417.02075" + fy="15.742972" + r="8.53125" + gradientTransform="matrix(1.357667,-0.02466618,0.02411975,1.3275908,-149.53429,5.1574131)" + gradientUnits="userSpaceOnUse" /> + id="stop4971" /> + id="stop4973" /> + style="color-interpolation-filters:sRGB" + id="filter4989"> + result="flood" + id="feFlood4979" /> + operator="out" + result="composite1" + id="feComposite4981" /> + result="blur" + id="feGaussianBlur4983" /> + result="offset" + id="feOffset4985" /> + operator="atop" + result="composite2" + id="feComposite4987" /> + cx="444.33652" + cy="11.316628" + fx="444.33652" + fy="11.316628" + r="8.53125" + gradientTransform="matrix(1,0,0,0.71428563,0,3.2333231)" + gradientUnits="userSpaceOnUse" /> + style="color-interpolation-filters:sRGB" + id="filter5009"> + result="flood" + id="feFlood4999" /> + operator="out" + result="composite1" + id="feComposite5001" /> + result="blur" + id="feGaussianBlur5003" /> + result="offset" + id="feOffset5005" /> + operator="atop" + result="composite2" + id="feComposite5007" /> + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)" + cx="134.97461" + cy="9" + fx="134.97461" + fy="9" + r="7.9746099" /> + id="stop4743" /> + id="stop4745" /> + style="color-interpolation-filters:sRGB" + id="filter4729"> + result="flood" + id="feFlood4719" /> + operator="out" + result="composite1" + id="feComposite4721" /> + result="blur" + id="feGaussianBlur4723" /> + result="offset" + id="feOffset4725" /> + operator="atop" + result="composite2" + id="feComposite4727" /> + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)" + cx="132.6468" + cy="9.0947113" + fx="132.6468" + fy="9.0947113" + r="7.9746099" /> + style="color-interpolation-filters:sRGB" + id="filter4774"> + result="flood" + id="feFlood4764" /> + operator="out" + result="composite1" + id="feComposite4766" /> + result="blur" + id="feGaussianBlur4768" /> + result="offset" + id="feOffset4770" /> + operator="atop" + result="composite2" + id="feComposite4772" /> - + + cx="166.37157" + cy="11.485105" + fx="166.37157" + fy="11.485105" + r="0.31640625" + gradientTransform="matrix(0.99998863,-0.00473886,0.08838422,18.426509,-1.0132111,-199.35688)" + gradientUnits="userSpaceOnUse" /> + cx="125.30523" + cy="16.659737" + fx="125.30523" + fy="16.659737" + r="8.3726959" + gradientTransform="matrix(1,0,0,1.0032611,0.11563445,22.233158)" + gradientUnits="userSpaceOnUse" /> + style="stop-color:#22e23d;stop-opacity:1" /> + style="stop-color:#38a748;stop-opacity:1" /> + style="color-interpolation-filters:sRGB" + id="filter4844"> + result="flood" + id="feFlood4834" /> + operator="out" + result="composite1" + id="feComposite4836" /> + result="blur" + id="feGaussianBlur4838" /> + result="offset" + id="feOffset4840" /> + operator="atop" + result="composite2" + id="feComposite4842" /> + id="g7757"> + d="m 17.870749,13.841269 -6.303534,-0.0074 2.264363,2.148431 c 0.615648,0.584128 0.72,1.44 0.24,1.92 l -0.96,1.08 c -0.48,0.48 -1.32,0.36 -1.92,-0.24 0,0 -6.4200001,-6.6 -6.4800001,-6.6 -0.06,0 -0.36,-0.48 -0.48,-0.84 0,-0.359999 0.36,-0.719999 0.48,-0.839999 l 6.3600001,-6.48 c 0.6,-0.6000001 1.44,-0.7200001 1.92,-0.24 l 0.96,1.0799999 c 0.48,0.48 0.36,1.32 -0.24,1.9200001 l -2.144363,2.0610645 6.359451,0.043374 c 0.719983,0.00491 1.227959,0.50779 1.227959,1.2277905 v 2.483369 c 0,0.72 -0.563877,1.284215 -1.283876,1.28337 z" + id="path4" /> + id="path4154" + d="m 19.187889,37.765372 -7.620674,-0.0365 3.352509,3.266174 c 0.515294,0.50108 0.829738,1.388534 0.443269,1.764345 l -1.759464,1.992905 c -0.356609,0.403923 -1.52102,-0.108922 -2.036314,-0.735274 L 3.9756591,36.471238 c 0,0 -0.7399492,-0.710192 -0.7399492,-1.211274 0,-0.501081 0.7399492,-1.303987 0.7399492,-1.303987 l 7.5915559,-7.545783 c 0.515294,-0.50108 1.613776,-1.093109 1.980397,-0.698138 l 1.815381,1.955768 c 0.386469,0.375811 0.172889,1.300401 -0.471228,1.801482 l -3.32455,3.229041 7.620674,0.02842 c 0.772936,0.0029 1.344153,0.417712 1.344153,1.169335 v 2.560987 c 0,0.751622 -0.571221,1.311987 -1.344153,1.308283 z" /> + id="path4165" + d="m 26.776124,12.612425 v -2.53895 c 0,-0.7200003 0.480206,-1.3282747 1.2,-1.3111602 l 5.76,0.041051 L 31.66,6.7412646 c -0.602042,-0.5979755 -0.72,-1.4399999 -0.24,-1.92 l 0.96,-1.08 c 0.48,-0.48 1.32,-0.36 1.92,0.24 l 6.36,6.4800004 c 0.12,0.12 0.48,0.48 0.48,0.84 0,0.36 -0.36,0.84 -0.48,0.84 l -6.48,6.48 c -0.6,0.6 -1.44,0.72 -1.92,0.24 l -0.96,-1.08 c -0.48,-0.48 -0.36,-1.32 0.24,-1.92 L 33.736124,13.833888 28.06,13.868005 c -0.719987,0.0043 -1.283876,-0.53558 -1.283876,-1.25558 z" /> + id="path4176" + d="m 64.708108,6.2881044 -5.061037,5.0305226 5.061037,5.030522 -2.530518,2.515261 -5.061038,-5.030522 -5.061037,5.030522 -2.530519,-2.515261 5.061037,-5.030522 -5.061037,-5.0305226 2.530519,-2.5152612 5.061037,5.0305223 5.061038,-5.0305223 z" /> + id="path4187" + d="m 87.482777,11.318627 h -8.856816 l 3.13833,-3.0716727 C 81.15648,7.545735 80.363876,6.712205 79.283876,6.712205 c -2.64,0 -5.107543,1.9376803 -5.107543,4.577681 0,2.64 2.411627,5.050109 5.051627,5.050109 1.68,0 3.619039,-1.066107 4.459039,-2.506107 l 2.530518,1.25763 c -1.32,2.4 -3.961599,4.443007 -6.961599,4.443007 -4.32,0 -8.219378,-3.896849 -8.219378,-8.216849 0,-4.3200008 3.927337,-7.633261 8.247337,-7.633261 1.8,0 3.619792,0.8778997 5.059792,1.9578998 l 3.139108,-3.1271021 z" /> + d="M 102.66589,2.5152127 92.543814,11.318627 h 3.795778 v 7.545783 h 5.061038 v -5.030522 h 2.53052 v 5.030522 h 5.06104 v -7.545783 h 3.79577 z" + id="path4209" /> + id="path4214" + d="m 133.03211,12.576257 -6.32629,6.288153 c -0.24,0.36 -0.82401,0.692435 -1.30401,0.692435 -0.48,0 -0.86651,-0.332435 -1.22651,-0.692435 l -6.3263,-6.288153 c -0.79571,-0.72 -0.93921,-1.286268 0.0208,-1.280462 l 3.77501,0.02283 -0.0107,-7.5841022 c -0.001,-0.7199993 0.50796,-1.1722101 1.22796,-1.1722101 h 5.10754 c 0.72,0 1.22426,0.4800094 1.22796,1.2 l 0.0388,7.5563123 3.80118,-0.05062 c 0.95992,-0.01278 0.71459,0.588252 -0.005,1.308252 z" /> + id="path4225" + d="m 148.19571,20.103585 c -4.8,0 -8.89163,-3.97895 -8.89163,-8.77895 0,-4.6800005 4.11959,-8.7145303 8.91959,-8.7145303 4.8,0 8.80776,3.9511599 8.80776,8.7511603 0,4.68 -4.03572,8.74232 -8.83572,8.74232 z m 0.0559,-15.04801 c -3.36,0 -6.39142,2.9178996 -6.39142,6.2779 0,3.24 2.9755,6.22232 6.3355,6.22232 3.36,0 6.33551,-2.86232 6.33551,-6.22232 0,-3.3600004 -2.91959,-6.2779 -6.27959,-6.2779 z m -0.63959,7.520682 c -0.48,-0.12 -0.63716,-0.735044 -0.64429,-1.214992 l -0.0559,-3.7667402 c -0.0107,-0.7199217 0.53592,-1.28337 1.25592,-1.28337 0.72,0 1.27834,0.535601 1.28388,1.25558 l 0.0289,3.7518922 c 1.32,1.32 2.53051,3.772891 2.53051,3.772891 0,0 -3.07896,-1.195261 -4.39896,-2.515261 z" /> + d="m 369.00476,4.7878231 0.94842,1.9083504 0.47422,0.858758 0.94842,0.190835 2.18136,0.3816699 -1.61231,1.7175156 -0.6639,0.667923 0.0948,0.954175 0.37937,2.290022 -1.89685,-0.954178 -0.85358,-0.477086 -0.85358,0.477086 -1.89685,0.954178 0.37938,-2.290022 0.0948,-0.954175 -0.6639,-0.667923 -1.61232,-1.7175156 2.27622,-0.3816699 0.94842,-0.190835 0.37936,-0.858758 0.94843,-1.9083504 m 0,-3.4350309 c -0.28454,0 -0.56906,0.1908348 -0.75874,0.667922 l -1.89683,3.9121193 -4.07821,0.6679227 c -0.94842,0.190835 -1.13812,0.8587576 -0.47421,1.5266802 l 2.94011,3.1487776 -0.66391,4.389208 c -0.0948,0.572504 0.1897,0.954174 0.66391,0.954174 0.18967,0 0.37936,-0.09542 0.56905,-0.190835 l 3.69885,-2.003768 3.69884,2.003768 c 0.18969,0.09543 0.47421,0.190835 0.56906,0.190835 0.4742,0 0.75873,-0.38167 0.6639,-1.049592 l -0.6639,-4.389207 2.9401,-3.1487781 c 0.66391,-0.6679226 0.37938,-1.3358454 -0.4742,-1.5266803 L 371.66031,5.837416 369.76347,1.9252968 C 369.5738,1.543627 369.28926,1.3527922 369.00474,1.3527922 Z" /> + id="path4366" + d="m 202.62125,17.648005 -2.53039,-0.04122 1.26526,2.515261 h -15.18311 l 1.26526,-2.515261 -2.51784,0.02249 c -0.71997,0.0064 -1.31817,-0.563397 -1.31184,-1.28337 l 0.0559,-6.3612693 c 0.006,-0.7199727 0.59192,-1.2112687 1.31183,-1.2000001 l 1.19667,0.018731 0.0313,-2.5298907 c 0.009,-0.7199457 0.51397,-1.243001 1.23397,-1.243001 l 0.022,-1.2403691 c 0.0127,-0.7198886 0.6198,-1.2535885 1.33979,-1.2555799 l 10.04733,-0.02779 c 0.72,-0.00199 1.21931,0.5078413 1.22796,1.22779 l 0.0156,1.295949 c 0.72,0 1.2692,0.5785813 1.26831,1.2985809 l -0.003,2.4743108 1.26513,-10e-8 c 0.71992,-0.010711 1.26205,0.5376375 1.26526,1.2576305 v 6.288153 c 0,0.729621 -0.61509,1.257631 -1.26526,1.257631 z m -15.18298,-0.04122 1.26526,-2.515262 h -1.26526 z m 0.6,-6.288153 h -0.6 -0.6 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.25348,-0.503016 -0.6,-0.6 z M 198.8256,5.0304738 c 0,-0.72 -0.54528,-1.2523398 -1.26526,-1.2576306 h -7.59155 c -0.71998,-0.00529 -1.28117,0.5378043 -1.26526,1.2576306 v 3.7728917 c 0.0159,0.7198264 0.54528,1.2629215 1.26526,1.2576305 h 7.59155 c 0.71999,-0.0053 1.24942,-0.5078188 1.25592,-1.2277899 z m -1.26526,10.0610482 h -7.59155 l -1.26526,3.772892 h 10.12207 z m 2.53052,0 h -1.26526 l 1.26526,2.515262 z" /> - + + + + id="path7725" /> + + id="path6182" + style="display:inline;fill:url(#radialGradient5031);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5049)" /> + style="display:inline;fill:url(#radialGradient4813);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4825)" /> + id="path7886" + style="display:inline;fill:url(#radialGradient4861);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4873)" /> + style="display:inline;fill:url(#radialGradient4881);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4893)" /> + style="display:inline;fill:url(#radialGradient4901);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4913)" /> + style="display:inline;fill:url(#radialGradient4921);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4933)" /> + style="display:inline;fill:url(#radialGradient4941);fill-opacity:1;stroke-width:0.96615839" /> + style="display:inline;fill:url(#radialGradient4949);fill-opacity:1;stroke-width:0.96615839" /> + style="display:inline;fill:url(#radialGradient4957);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4969)" /> + style="display:inline;fill:url(#radialGradient4977);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4989)" /> + style="display:inline;fill:url(#radialGradient4997);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5009)" /> + id="g4779"> + id="bookmarks-star-4" + d="M 165.92886,2.5152127 V 20.122041 h 8.85681 1.26526 2.53052 c 1.26526,0 2.53052,-1.257631 2.53052,-2.515261 V 15.091518 7.545735 5.0304738 c 0,-1.2576306 -1.26526,-2.5152611 -2.53052,-2.5152611 h -2.53052 -1.26526 z m 7.59155,2.5152611 1.26526,2.5152612 c 0,0 0.39827,0.9972133 0.68613,1.1930622 0.26974,0.1834496 1.07417,0.064568 1.07417,0.064568 h 3.30074 l -2.53052,3.1379238 c 0,0 -0.38069,0.332603 -0.51773,0.634968 -0.20593,0.452534 -0.18971,0.518683 -0.12151,1.257631 0.10732,1.162403 0.63924,3.772892 0.63924,3.772892 l -2.53052,-1.257631 c 0,0 -0.77873,-0.42944 -1.26526,-0.430166 -0.5721,0 -1.26526,0.430166 -1.26526,0.430166 l -2.53051,1.257631 c 0,0 0.56012,-2.658345 0.73559,-3.772892 0.11606,-0.733074 0.10061,-0.753616 -0.15752,-1.257631 -0.13995,-0.274086 -0.57807,-0.782455 -0.57807,-0.782455 l -2.53052,-2.9904368 h 3.02161 c 0,0 0.91024,-0.099407 1.27135,-0.3263622 0.27408,-0.1711231 0.76807,-0.9312683 0.76807,-0.9312683 z" + style="fill:url(#radialGradient4710);fill-opacity:1;stroke-width:1.265625;filter:url(#filter4729)" /> + id="bookmarks-overlay-1" + d="m 163.39834,2.5152127 c -1.26526,0 -2.53052,1.2576305 -2.53052,2.5152611 v 2.5152612 7.545783 2.515262 c 0,1.25763 1.26526,2.515261 2.53052,2.515261 h 2.91839 l 0.0559,-4.840061 V 7.6882296 l 0.028,-5.1730169 z" + style="fill:url(#radialGradient4712);fill-opacity:1;stroke:none;stroke-width:1.265625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill;filter:url(#filter4774)" /> + id="bookmarks-divider-7" + d="M 165.92886,2.5152127 V 20.122041" + style="opacity:0.66300001;fill:url(#radialGradient4714);fill-opacity:1;stroke:url(#radialGradient4750);stroke-width:1.2614392;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="path4214-3" + d="m 133.03211,35.213608 -6.32629,6.288153 c -0.24,0.36 -0.8202,0.518975 -1.3002,0.518975 -0.48,0 -0.87032,-0.158975 -1.23032,-0.518975 l -6.3263,-6.288153 c -0.6,-0.72 -0.96335,-1.29465 -0.003,-1.287183 l 3.79916,0.02955 -0.0908,-7.535242 c -0.009,-0.719949 0.67572,-1.307177 1.39571,-1.31116 l 5.02367,-0.02779 c 0.71999,-0.004 1.25401,0.619416 1.22796,1.33895 l 0.035,7.535242 3.80499,-0.02955 c 0.95998,-0.0075 0.71078,0.567183 -0.009,1.287183 z" /> diff --git a/application/palemoon/themes/windows/browser.css b/application/palemoon/themes/windows/browser.css index f921554df..c261fe083 100644 --- a/application/palemoon/themes/windows/browser.css +++ b/application/palemoon/themes/windows/browser.css @@ -39,9 +39,9 @@ --toolbarbutton-border-radius: 2.5px; --toolbarbutton-border-color: hsla(210,54%,20%,.2); - --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg"); - --toolbarbutton-glass-image: url("chrome://browser/skin/Toolbar-glass.svg"); - --toolbarbutton-inverted-image: url("chrome://browser/skin/Toolbar-inverted.svg"); + --toolbarbutton-image: url("chrome://browser/skin/Toolbar.png"); + --toolbarbutton-glass-image: url("chrome://browser/skin/Toolbar-glass.png"); + --toolbarbutton-inverted-image: url("chrome://browser/skin/Toolbar-inverted.png"); --tab-background: linear-gradient(transparent, hsla(0,0%,45%,.1) 1px, hsla(0,0%,32%,.2) 80%, hsla(0,0%,0%,.2)); --tab-background-hover: linear-gradient(hsla(0,0%,100%,.3) 1px, hsla(0,0%,75%,.2) 80%, hsla(0,0%,60%,.2)); @@ -52,6 +52,15 @@ --window-text-color: currentColor; } +/* Use SVG for HiDPI 133%+ */ +@media (min-resolution: 1.33dppx) { + :root { + --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg"); + --toolbarbutton-glass-image: url("chrome://browser/skin/Toolbar-glass.svg"); + --toolbarbutton-inverted-image: url("chrome://browser/skin/Toolbar-inverted.svg"); + } +} + :root:-moz-lwtheme-brighttext { --toolbar-highlight-top: rgba(32,32,32,.8); --toolbar-highlight-bottom: rgba(32,32,32,0); diff --git a/application/palemoon/themes/windows/jar.mn b/application/palemoon/themes/windows/jar.mn index 8a00d8b70..604466c9f 100644 --- a/application/palemoon/themes/windows/jar.mn +++ b/application/palemoon/themes/windows/jar.mn @@ -60,6 +60,9 @@ browser.jar: skin/classic/browser/Secure24.png skin/classic/browser/setDesktopBackground.css skin/classic/browser/slowStartup-16.png + skin/classic/browser/Toolbar.png + skin/classic/browser/Toolbar-glass.png + skin/classic/browser/Toolbar-inverted.png skin/classic/browser/Toolbar.svg skin/classic/browser/Toolbar-glass.svg skin/classic/browser/Toolbar-inverted.svg diff --git a/application/palemoon/themes/windows/places/organizer.css b/application/palemoon/themes/windows/places/organizer.css index 16ce25911..45851d0da 100644 --- a/application/palemoon/themes/windows/places/organizer.css +++ b/application/palemoon/themes/windows/places/organizer.css @@ -5,7 +5,14 @@ :root { --toolbar-custom-color: hsl(210,75%,92%); --toolbar-highlight-top: rgba(255,255,255,.5); - --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg"); + --toolbarbutton-image: url("chrome://browser/skin/Toolbar.png"); +} + +/* Use SVG for HiDPI 133%+ */ +@media (min-resolution: 1.33dppx) { + :root { + --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg"); + } } /* Toolbar */ -- cgit v1.2.3