From 7181890e37253ec81120b3ad952baf849b2b6890 Mon Sep 17 00:00:00 2001 From: Miguel Solorio Date: Mon, 7 Jan 2019 14:48:29 -0800 Subject: [PATCH] Update Octicons to fix rendering bug and add new icon mapping defaults --- cgmanifest.json | 2 +- .../ui/octiconLabel/octicons/octicons.css | 12 ++++++----- .../ui/octiconLabel/octicons/octicons.svg | 20 +++++++++--------- .../ui/octiconLabel/octicons/octicons.ttf | Bin 36668 -> 36668 bytes 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/cgmanifest.json b/cgmanifest.json index b89d667cc07..286c6bda424 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -111,7 +111,7 @@ "git": { "name": "vscode-octicons-font", "repositoryUrl": "https://github.com/Microsoft/vscode-octicons-font", - "commitHash": "3752426de46430e63fb8333f073b1d3bb1c8b104" + "commitHash": "174697a8d28a65dc6600c44d239bd75f7d157c71" } }, "license": "MIT", diff --git a/src/vs/base/browser/ui/octiconLabel/octicons/octicons.css b/src/vs/base/browser/ui/octiconLabel/octicons/octicons.css index 7eec6209772..f4744af5bb4 100644 --- a/src/vs/base/browser/ui/octiconLabel/octicons/octicons.css +++ b/src/vs/base/browser/ui/octiconLabel/octicons/octicons.css @@ -1,7 +1,7 @@ @font-face { font-family: "octicons"; - src: url("./octicons.ttf?1bb24181fd8a43af3b7da2880004ad79") format("truetype"), -url("./octicons.svg?1bb24181fd8a43af3b7da2880004ad79#octicons") format("svg"); + src: url("./octicons.ttf?7b4c09277b7efac707b034fae8e52ed0") format("truetype"), +url("./octicons.svg?7b4c09277b7efac707b034fae8e52ed0#octicons") format("svg"); } .octicon, .mega-octicon { @@ -157,12 +157,16 @@ url("./octicons.svg?1bb24181fd8a43af3b7da2880004ad79#octicons") format("svg"); .octicon-note:before { content: "\f289" } .octicon-octoface:before { content: "\f008" } .octicon-organization:before { content: "\f037" } +.octicon-organization-filled:before { content: "\26a2" } +.octicon-organization-outline:before { content: "\f037" } .octicon-package:before { content: "\f0c4" } .octicon-paintcan:before { content: "\f0d1" } .octicon-pencil:before { content: "\f058" } .octicon-person-add:before { content: "\f018" } .octicon-person-follow:before { content: "\f018" } .octicon-person:before { content: "\f018" } +.octicon-person-filled:before { content: "\26a3" } +.octicon-person-outline:before { content: "\f018" } .octicon-pin:before { content: "\f041" } .octicon-plug:before { content: "\f0d4" } .octicon-plus-small:before { content: "\f28a" } @@ -235,6 +239,4 @@ url("./octicons.svg?1bb24181fd8a43af3b7da2880004ad79#octicons") format("svg"); .octicon-fold-down:before { content: "\f104" } .octicon-fold-up:before { content: "\f105" } .octicon-github-action:before { content: "\f106" } -.octicon-organization-filled:before { content: "\f107" } -.octicon-person-filled:before { content: "\f108" } -.octicon-play:before { content: "\f109" } +.octicon-play:before { content: "\f107" } diff --git a/src/vs/base/browser/ui/octiconLabel/octicons/octicons.svg b/src/vs/base/browser/ui/octiconLabel/octicons/octicons.svg index 15a50dd81e7..4309475d790 100644 --- a/src/vs/base/browser/ui/octiconLabel/octicons/octicons.svg +++ b/src/vs/base/browser/ui/octiconLabel/octicons/octicons.svg @@ -12,7 +12,7 @@ horiz-adv-x="1000" d=" M555.8125 726.25C544.375 745.625 523.3125000000001 757.5 500.375 757.5S456.4375 745.625 445 726.25L8.625 -23.6875A61.25000000000001 61.25000000000001 0 0 1 8.625 -86.25C20.6875 -105.625 41.75 -117.5625 64 -117.5625H936.75C959.6875 -117.5625 980.75 -105.6875 991.5625 -86.3125A64.375 64.375 0 0 1 992.1875 -23.6874999999999L555.8125 726.25zM564.125 7.6875H436.6875V132.875H564.125V7.6875zM564.125 195.4375H436.6875V445.8125H564.125V195.4375z" /> + horiz-adv-x="875" d=" M250 382.5H625V320H250z M812.5 757.5H62.5C25 757.5 0 732.5 0 695V570C0 532.5 25 507.5 62.5 507.5V-55C62.5 -92.5 87.5 -117.5 125 -117.5H750C787.5 -117.5 812.5 -92.5 812.5 -55V507.5C850 507.5 875 532.5 875 570V695C875 732.5 850 757.5 812.5 757.5zM750 -55H125V507.5H750zM812.5 570H62.5V695H812.5z" /> @@ -168,7 +168,7 @@ horiz-adv-x="750" d=" M687.5 507.5H62.5C28.125 507.5 0 479.375 0 445V195C0 160.625 28.125 132.5 62.5 132.5H687.5C721.875 132.5 750 160.625 750 195V445C750 479.375 721.875 507.5 687.5 507.5zM250 257.5H125V382.5H250V257.5zM437.5 257.5H312.5V382.5H437.5V257.5zM625 257.5H500V382.5H625V257.5z" /> + horiz-adv-x="1142.857142857143" d=" M1057.142857142857 812.8571428571429C1042.857142857143 827.1428571428571 1021.4285714285716 827.1428571428571 1007.1428571428572 812.8571428571429L857.1428571428573 655.7142857142857C778.5714285714288 712.8571428571429 685.7142857142858 748.5714285714286 578.5714285714287 748.5714285714286C214.2857142857144 755.7142857142857 1e-13 327.1428571428571 1e-13 327.1428571428571S85.7142857142858 162.8571428571429 235.7142857142859 34.2857142857142L85.7142857142858 -115.7142857142857C71.4285714285716 -130 71.4285714285716 -151.4285714285714 85.7142857142858 -165.7142857142857S121.4285714285716 -179.9999999999999 135.7142857142858 -165.7142857142857L1057.1428571428573 755.7142857142858C1071.4285714285716 770.0000000000001 1071.4285714285716 798.5714285714287 1057.1428571428573 812.857142857143zM642.8571428571429 448.5714285714286C621.4285714285714 462.8571428571429 600 470 571.4285714285714 470C492.8571428571429 470 428.5714285714286 405.7142857142857 428.5714285714286 327.1428571428572C428.5714285714286 298.5714285714286 435.7142857142857 277.1428571428571 450 255.7142857142858L350.0000000000001 148.5714285714287C307.1428571428572 198.5714285714286 285.7142857142857 255.7142857142858 285.7142857142857 327.1428571428572C285.7142857142857 484.2857142857144 414.2857142857143 612.8571428571429 571.4285714285714 612.8571428571429C635.7142857142858 612.8571428571429 700.0000000000001 591.4285714285716 750 548.5714285714287z M992.8571428571428 541.4285714285714L850 398.5714285714286C857.1428571428571 377.1428571428571 857.1428571428571 348.5714285714285 857.1428571428571 327.1428571428571C857.1428571428571 169.9999999999999 728.5714285714286 41.4285714285713 571.4285714285714 41.4285714285713C542.8571428571429 41.4285714285713 521.4285714285714 41.4285714285713 500 48.5714285714286L385.7142857142857 -65.7142857142858C442.8571428571429 -94.2857142857143 507.1428571428572 -108.5714285714285 578.5714285714287 -108.5714285714285C928.5714285714286 -108.5714285714285 1142.857142857143 320 1142.857142857143 320C1100 405.7142857142857 1050 477.1428571428572 992.8571428571428 541.4285714285714z" /> @@ -243,7 +243,7 @@ horiz-adv-x="750" d=" M687.5 115V507.5C685.625 556.25 666.25 599.375 628.75 636.25C591.25 673.125 548.75 693.125 500 695H437.5V820L250 632.5L437.5 445V570H500C516.875 568.75 530 563.125 543.125 550.625C556.25 538.125 561.875 524.375 562.5 507.5V114.9999999999999A124.56250000000001 124.56250000000001 0 0 1 625 -117.5A124.56250000000001 124.56250000000001 0 0 1 687.5 115zM625 -67.5C583.75 -67.5 550 -33.1249999999999 550 7.5C550 48.125 584.3750000000001 82.5 625 82.5C665.625 82.5 700 48.1249999999999 700 7.5C700 -33.125 665.6249999999999 -67.5 625 -67.5zM250 632.5C250 701.875 194.375 757.5 125 757.5A124.56250000000001 124.56250000000001 0 0 1 62.5 525V114.9999999999999A124.56250000000001 124.56250000000001 0 0 1 125 -117.5A124.56250000000001 124.56250000000001 0 0 1 187.5 115V525C224.375 546.25 250 586.25 250 632.5zM200 7.5C200 -33.75 165.625 -67.5 125 -67.5C84.375 -67.5 50 -33.1249999999999 50 7.5C50 48.125 84.375 82.5 125 82.5C165.625 82.5 200 48.1249999999999 200 7.5zM125 557.5C83.75 557.5 50 591.875 50 632.5C50 673.125 84.375 707.5 125 707.5C165.625 707.5 200 673.125 200 632.5C200 591.875 165.625 557.5 125 557.5z" /> + horiz-adv-x="1000" d=" M687.5 476.25C687.5 424.4733047033631 729.4733047033632 382.5 781.25 382.5C833.0266952966368 382.5 875 424.4733047033631 875 476.25C875 528.026695296637 833.0266952966368 570 781.25 570C729.4733047033632 570 687.5 528.026695296637 687.5 476.25z M937.5 695H562.5C562.5 732.5 537.5 757.5 500 757.5S437.5 732.5 437.5 695H62.5C31.25 695 0 663.75 0 632.5V7.5C0 -23.75 31.25 -55 62.5 -55H437.5C437.5 -92.5 462.5 -117.5 500 -117.5S562.5 -92.5 562.5 -55H937.5C968.75 -55 1000 -23.75 1000 7.5V632.5C1000 663.75 968.75 695 937.5 695zM937.5 7.5H62.5V632.5H937.5z" /> @@ -368,9 +368,9 @@ unicode="" horiz-adv-x="1000" d=" M918.75 486.25C926.875 506.25 953.125 585.625 910.6249999999998 693.125C910.6249999999998 693.125 844.9999999999999 713.75 695.6249999999999 611.875C633.1249999999999 629.375 566.2499999999999 631.875 499.9999999999999 631.875S366.875 629.375 304.375 611.875C155 714.375 89.375 693.125 89.375 693.125C46.875 585.625 73.125 506.2499999999999 81.25 486.25C30.625 431.875 0 361.875 0 276.875C0 -45 208.125 -117.5 498.75 -117.5S1000 -45 1000 276.875C1000 361.8750000000001 969.375 431.8750000000001 918.75 486.25zM500 -56.25C293.75 -56.25 126.25 -46.875 126.25 153.125C126.25 200.625 150 245.625 190 282.5C256.875 343.7500000000001 371.25 311.2500000000001 500 311.2500000000001C629.375 311.2500000000001 742.4999999999999 343.7500000000001 810 282.5C850.6250000000001 245.625 873.75 201.25 873.75 153.125C873.75 -46.25 706.25 -56.25 500 -56.25zM343.125 256.875C301.875 256.875 268.125 206.875 268.125 145.625S301.875 33.7500000000001 343.125 33.7500000000001C384.375 33.7500000000001 418.125 83.7500000000001 418.125 145.625S384.375 256.875 343.125 256.875zM656.875 256.875C615.625 256.875 581.875 207.5 581.875 145.625S615.6250000000001 33.7500000000001 656.875 33.7500000000001C698.125 33.7500000000001 731.8749999999999 83.7500000000001 731.8749999999999 145.625S698.75 256.875 656.875 256.875z" /> - - + horiz-adv-x="937.5" d=" M375 695H562.5V195H375z M125 695H312.5V-55H125z M625 695H812.5V70H625z M875 820H62.5C25 820 0 795 0 757.5V-117.5C0 -155 25 -180 62.5 -180H875C912.5 -180 937.5 -155 937.5 -117.5V757.5C937.5 795 912.5 820 875 820zM875 -117.5H62.5V757.5H875z" /> @@ -444,7 +444,7 @@ horiz-adv-x="750" d=" M250 257.5H187.5V320H250V257.5zM250 445H187.5V382.5H250V445zM250 570H187.5V507.5H250V570zM250 695H187.5V632.5H250V695zM750 757.5V7.5C750 -26.875 721.875 -55 687.5 -55H375V-180L281.25 -86.25L187.5 -180V-55H62.5C28.125 -55 0 -26.875 0 7.5V757.5C0 791.875 28.125 820 62.5 820H687.5C721.875 820 750 791.875 750 757.5zM687.5 132.5H62.5V7.5H187.5V70H375V7.5H687.5V132.5zM687.5 757.5H125V195H687.5V757.5z" /> + horiz-adv-x="1000" d=" M437.5 320H562.5V195H437.5z M437.5 632.5H562.5V382.5H437.5z M937.5 757.5H62.5C25 757.5 0 732.5 0 695V132.5C0 95 25 70 62.5 70H187.5V-180L437.5 70H937.5C975 70 1000 95 1000 132.5V695C1000 732.5 975 757.5 937.5 757.5zM937.5 132.5H406.25L250 -23.75V132.5H62.5V695H937.5z" /> diff --git a/src/vs/base/browser/ui/octiconLabel/octicons/octicons.ttf b/src/vs/base/browser/ui/octiconLabel/octicons/octicons.ttf index 05843f8a1bddb97ce7dc82883aa29cbfd6a39e7a..747e34216cac83a6e77e6b7971a532a5c47016e2 100644 GIT binary patch delta 1302 zcmYLHdu&rx82`?_TkmYQ_5HfLU3<@M@4fBX(%rVVg}~T`uOOR(2#BH^Pua%SJ#=Ci zBZ9;cU|?a11TX<5B;s5sK_iWsNC-hx1fod%gBW8LF@%JRQ4#fPpIt$K)V58*_utQsoT1W9|1}(0hC|f(6M>_r|~%k0F*7&)!Vmsd+U0Dod*EQKG~lQdY@|0U3*HpA9TO7jfL zoMRRvn|KVMNa6G?Mv(@>_0oSjvmKpCw6XeUSSn>344jn zRmoK?RsV8r+%1>J)mc5K`ks54`vmXcQ~XJ+;5K|wcvk2UM!gpA!a?so??vBg-=ug( zDv=IJ=Vew-$tUDL{SLq4U*uou|G+;MkOLhxmKwF@Sk3L=lflEm+o3>cb!a@43s;9* z!lU8BtlhIFBH>6&@!AgfR8fBxY=*Q6;u~_Wu_|x%``0w$1@q${evTBQZ zKJk9yZjy;5_a;v!ze<;x*O=R>DWIVW+#nD^@Kzr2>6Wd|Mn1vE`5fvm3{la%$%U~C zb5u7ca2UUmAEvtJ=S|dIG&mof6}SNo=f5Wbj*4P35vH$G(Yk@mujW&BCk^o6`I3G* z2|kz&D~TvYtVg0CrpJTUK}KV-DG8*;h_@11>`WNNV+l2(MirYIF*d7((J&eTOQOWs zqDnFH2=kFx!s|HQ$hMKj`Z=?e+JKBbPP?H(Yp}3_6p4-KtS%k>p{}sp)7&Up*LpmX z*wEOdyz09@%oK;sY+Jdxvgf6ay1LnFZNxA09;c1$pG${yx+ANQ(ctD}T;mJyg41s1 zuvZBsgCkm(RZAbzdJ7*}rG{otyKhCjX+eW1@$Ry{Hl=Any(lB9w714=bh~6B=<{R2 z=`g*WITidxKUfA{kjWotY>FBau_nP6dn-?9wAi9N`3*JB6B=V8%^P`Y3?-TqiDord z7!s1WFyxRV2kOU30rlG@$v%CMZb!dKs!A4};RJz`?D=7bRIG*Mpt|i+elgVzrKASC z=r(F9qnUSI-Vh@NXFxYobU;y~Kob_N`Tsl~XMp;%*<3b@CW)E8QPcq)EM7EygAP(( z6w1+LQ3ym4cQH48a3~{Ns-nPk8^P^Ob0-8RzDT&byAJnMSVzAEIC%-6=)$>~hQ*t za$Wgj<&Bajq&i%Nen4vOA&Qddi($&R2^9}-HQso)8QzC(jN|Yjd;}-qCd|Sd{0@0o zLIg4+E3zX8h6|${vB-<$RfNzBL{JUJT2zNNpp9rd>O`Hm^xH6<>!DspWG@`gU8T36 zoLKxd?d%13hR4&13&OKvow+${5)IrlZ8v>odTcH+r_8e!vt^^D&vM^twVtxxvX$7j z*v9N>`*Hg;qc9!JtYd>?+L3oHx{KTq_fGe?`%$^0ysv!56Y-q%JYdu8PWE1fp+c$H z=Ow&7-k&S2l}D>ytIGR6@QrgkcZ~a%PxC$eU15vRCrpb~;?@E2Gx4r;Kw6fs`_2AK z{@H*SI2ITWJPq=}bZ}d6cW^X#HKc@&gsZ~q!&kx!k*3Jy$U-y`-50$TBVux_BQ{x0 zRiCeZTBFu<)Qr}OwU26-l#tS+Ovd^6(fF14Plir2$}Nvmr~W5P&r7gk3nQ4#fz{f@ER%n}}D}ga%QMu{o0gL6Ath`kK1Z0 zu{g^Gxh8R*HX6-#hMsS8BDvvBzD?RuyQ#53_OBuApETE(44ABLkBdqLjkIz{>aJ6JjcNIdaD`psN(r zRZ?6|n}ZTK2gS=8$ID4uLXC3?RdE?@oXzM`6EaU>4e{^KVtqWzr=^61mQU+Kpsa}Z z*`*7_oL|$LRMk&RNuI(WE9rvinqpxkX?tOi$mEgMgkv-?;zrKo7Slfl+LO2|8cM-} zn*k|q6Udju29b29{O6t+A~G{G`PH|Mj4a*PiF13%C@Udx1Cd!SLw~N?={~u?PGXlv z^bX1W9tm=hHjQrm1-sJ@9;gHkV0Flsqti(N&&}YPcqhf3f(`S?Jb>qkG1sd?dlx%o|S2; Qd(WZ6U7fkN&i;!21q7H`DF6Tf