From c916664ae7053bfbe89381880023c3b0519fd598 Mon Sep 17 00:00:00 2001 From: Sam El-Husseini Date: Wed, 3 Jan 2018 15:02:24 -0800 Subject: [PATCH] Fix download and save icons. --- docs/static/fonts/icons/iconfont.css | 6 +++--- docs/static/fonts/icons/iconfont.eot | Bin 4828 -> 4824 bytes docs/static/fonts/icons/iconfont.svg | 4 ++-- docs/static/fonts/icons/iconfont.ttf | Bin 4660 -> 4656 bytes docs/static/fonts/icons/iconfont.woff | Bin 2716 -> 2708 bytes docs/static/fonts/icons/iconfont.woff2 | Bin 2092 -> 2064 bytes libs/core/_locales/core-strings.json | 2 +- svgicons/icons/download.svg | 9 ++------- svgicons/icons/save.svg | 19 ++++++++++--------- theme/blockly.less | 24 ++++++++++++++++-------- 10 files changed, 34 insertions(+), 30 deletions(-) diff --git a/docs/static/fonts/icons/iconfont.css b/docs/static/fonts/icons/iconfont.css index 4d0488f8..f7a48ce0 100644 --- a/docs/static/fonts/icons/iconfont.css +++ b/docs/static/fonts/icons/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; - src: url("iconfont.eot?8d461ad14fbdc5b48a8749a696d345dd?#iefix") format("embedded-opentype"), -url("iconfont.woff2?8d461ad14fbdc5b48a8749a696d345dd") format("woff2"), -url("iconfont.woff?8d461ad14fbdc5b48a8749a696d345dd") format("woff"); + src: url("iconfont.eot?6e1ef95090bc1e1acc3a7e6bb86172de?#iefix") format("embedded-opentype"), +url("iconfont.woff2?6e1ef95090bc1e1acc3a7e6bb86172de") format("woff2"), +url("iconfont.woff?6e1ef95090bc1e1acc3a7e6bb86172de") format("woff"); } .icon { diff --git a/docs/static/fonts/icons/iconfont.eot b/docs/static/fonts/icons/iconfont.eot index 5213c0ee20d7518e4080b76b6a2950166289b71b..f60ad1406faece6f579adc4311692a5b46b02fed 100644 GIT binary patch delta 397 zcmXYpy-Nc@6vXH4?zy>qUM`QYgIHOJpb}COOCBB8Pp+@F6f&9vC?2~lxz9=<~iGXsXt96 zg4aJXAWs5nuee{>%hmFi06v6Pi^9m>wtEeYV$!#L)L0_BssU``!rQGgwk9b}{>nf3U+Ynp)G7zOGLn#>2)GWoPRRB|Li0j$JnrW_TTm34F~e`0 z-7BUjf-1g1OaeAEn22FUP~c|B2|H;gyb{vMb(Yh1$Q_T7J)5D_Iw?aoS4opbh~}mZ h%`zAf3q+$7i3D|0)e*9Y>w1L5aPpY}qjjK{q<=^2M??Ss diff --git a/docs/static/fonts/icons/iconfont.svg b/docs/static/fonts/icons/iconfont.svg index f6fd85f3..b2fc37a1 100644 --- a/docs/static/fonts/icons/iconfont.svg +++ b/docs/static/fonts/icons/iconfont.svg @@ -66,10 +66,10 @@ horiz-adv-x="40" d=" M4209.2 23456H4231.3V23452.3H4209.2V23456z M4201.2 23463.4H4204.9V23452.3H4201.2V23463.4z" /> + horiz-adv-x="40" d=" M5.2 15.7H36.5V1.7H5.2V15.7z M28.5 24.2L26.1 26.6L22.6 23.1L22.6 36.5L19.1 36.5L19.1 23.5L16 26.6L13.6 24.2L20.9 16.7L21 16.9L21.2 16.7z" /> + horiz-adv-x="40" d=" M2.3 20.1V36.6C2.3 37.8 2.4 38 3.7 38H11.5C12.7 38 12.9 37.8 12.9 36.6V28.6C12.9 27.6 13 27.4 14.1 27.4H25.9C27 27.4 27.1 27.6 27.1 28.6V36.8C27.1 37.8 27.3 38 28.3 38C30.8 38 30.8 38 32.3 36.4C34.1 34.7 35.7 33.1 37.4 31.4C37.7 31 37.9 30.5 37.9 30V3.6C37.9 2.5 37.7 2.2 36.7 2.2H3.5C2.4 2.2 2.3 2.3 2.3 3.6C2.3 9.1 2.3 14.7 2.3 20.1zM20.2 6H33C34.3 6 34.4 6.2 34.4 7.4V22.5C34.4 23.6 34.3 23.9 33 23.9H7.1C6.1 23.9 5.7 23.7 5.7 22.5V7.4C5.7 6.2 5.9 6 7.1 6H20.2z M24.7 34.5C24.7 33.6 24.7 32.8 24.7 31.9C24.7 31 24.3 30.9 23.7 30.9C23.1 30.9 22.4 30.9 22.1 30.9S21 31 21 31.7V31.9V36.9C21 37.3 21.2 37.8 21.9 38C21.9 38 21.9 38 22.1 38C22.6 38 23.3 38 23.8 38C24.3 38 24.9 37.6 24.9 37.1C24.9 37.1 24.9 37.1 24.9 36.9C24.7 36.3 24.7 35.2 24.7 34.5z M5.1 25H35.4V4.8H5.1V25z M6.2 24.1H34.5V5.9H6.2V24.1z" /> diff --git a/docs/static/fonts/icons/iconfont.ttf b/docs/static/fonts/icons/iconfont.ttf index 09f962a4b86017207e8138a448cf07ff774cf163..d1efe4b48f5331932d3752040b27f528932d835e 100644 GIT binary patch delta 408 zcmXAiJ4gdT5QhJ`y>pXjUS}R6Nj!3i5v(+x!AEIfWh2_^;VVd9m>{vyUMv&~!9qc_ zR)~d#l|@PgK?^I96e5BkXsOO2!$14a{@>1CrY=&u#@6WONfV$Q0J954yYl%mIRz*a ztkadk#&Ywnbq;7T!2Og5;u)k)d^2J(RY_kKkxXl;J3wHX= zTn5xvo(GF|y+Zw1=e&z&qhuHNj$IiS{}ri}tF@D(865~3oO?k`^s#_`;A1-Quy@;? zl%>_@Isf<<+W)i1s{hPE{?Fgvz{9?WZWU1DiAIDxRPWW6`rYW(gnLVIK%}_@I)Gd@ zZ00i3GQ$}e)eNIc2vsOD;EM>==M_RawB|JQajFDx=DHj@$ zX2u#Cqi9$mHE=8FvPF=|%kVG?#0W}_5Vir4s<#S9aZMyYAGqR3W6 z>@3vCN|u&N$-+vKWG(MHyXTzy|98&qo?2(tR-`z3b9e>N27rlF*2%p;4vzrR z5OXx2S)Hpt_)q|)3DDlsv(C(TX>yaj4@_^GFOtXSZ(Lt6Ryvz6$m?8zp7@x~ET)|H zS2F{M3it7>Q^-*aE35~&k1ROZ?fvSgi+45V7MJsfd*cS+wOFqMv7?g#V!-)Ha&7xM z)HYeluTAL#pQ!!Q?v`GD_x4N`YMssFQuMlQLEsH4T>3V0+U$r}z+Fj%jXrd3gZgsumPLr|^Z^^`B& GOY%1#N>ls* diff --git a/docs/static/fonts/icons/iconfont.woff b/docs/static/fonts/icons/iconfont.woff index c055ec95b098eb378625f0df8cc21ee48f5c537b..3c08c9c07dd7edc08176486ab0c2e3f98e64c281 100644 GIT binary patch delta 1793 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 delta 2084 zcmV+<2;29N5UdawcTYw#00961000Oq01E&B000s+000Nvkr*L=aF9X)HUcCAU<)z; z1Rw>376*b28;lPl5vGi^hwLvBY`4)k#AIk-D2Pt7UuUmiUbtsX@I2q2)w%b*ub}dN z;%3-Y4JA!hwd|SM%}PsX31F$+cnvB5^lObbv3Zt00LYToo!;6zyI@Q=mpV6KMuk5D zb3EZ)TrcaVZ22UAWpQ2rn*ji6S4(G0sj{XC;l3r|_V)&oetBB^P-+tjhtMeGKc!ZQ ziqJT$LTC>>u;0vws{oN>QCR3H&eh+=a}XfG7-pdJdY7!B>&VVC$LNPet`<1%F z?KJ2UHjUc=pG02nkR;gS^p-ee?H!FzZMDSfU3oo9`>FX-=kz z-e7K5G0+76f5U!To~ip8FL!+$%nRZnaHnq-bok_}~E;gw4P9-beT- z;3OO6g!&4jH2q%C8J!MTs&0g#uqOR!1dL@=v;&3i z!ZX-{WaDDrw^5|gKs2*(shG0EF0)iG2*R&i;dfqL*^1LR++(dwOOPH)wa&L8#k=AA z=XlhAlArQ)u^*y6Y}>94I@k2cMwlwvDp?zG^tMS4fkFONqb3G53|5Qv+8$Onu58K2 zyx&h(Krl=B*Q`FCYb4!z;$IUNwy-(V9 zkXgsgNY`}uvGuZJ6_cUMjN#PYMbcZWAuJw$PT#3$h>@XYu4)g7w7~cmPG+gWFjIxL zE(0^`VO3Z2RAChs%+H7zo}TzB8X%sJ;C(hUwf3+WP`4Z9K|CZ9_a$dIPs^%g&=S;0(8#Qli z&YL$(or#s-Ez;8+Y;LSqYk2df$c>MpyRIUhsTf~G>w@@NQBTO))djzf=>&7FQe)Tp zSQkhzOcz`VB^(w?<4wm%ob%U&^L!J3t7-HIs5lTIsdZbkvCWbl=n(4)>LZ$zK$0r> zT5wiy(;y7OI0`}(MCsU{eEfzle%U(y5t)aIG9xGVr z>UZMp&NcgUT=Hi5u1w)}Gi| zkN2Lbwv5f2-dvb|$>i%*!_ar5TJ$ajbaIb9o zC2g@}g^D}5`QBsNC7axLd9|zhw$0jwJ4<^44SJJ%DD8|yVJb3fMS>50PLU~R{tyw3 zh&2yL^w0LE;woJ3{P076r!5>7SFiv7|8-iFY7Yb9L>a-*Iq6mc(PgDc!)7+8b6RX}^Zau-3eP>f2oi{z5Z#gy=*TPeIlUhi7u^zn5)-mKzs;b443n`V(4~7W5Ah z0iZxadEiO(0UWP}R4V@-6wqJa(vg@w%@A&*O9qc5gAG0*!wd^&#j;$EPMhK1* zkwNL=dV|4nQ@D-3+u%{;5rdCohCjmtzyBJKd>A%L?vru;NyCmow>F#qOKMYNXshP( zAzR9%;1ol53br4AR_=Z1RZ`gG+>Dqd6qT9KtI@rz>$-OxQK6)>2_^UDxBZib9fOK# z&%6GTS}d^sP+L_~B77_7QkLKpS$8r+Z9lAX!TO-bs-)1yj}faD2^IHNGoe?F9%@-v zi{<*Va@9UfpYAN5Cla`Fm_O3ErdoMl%q$rE0q zu;{hR4#%tEr1AhU7Qh7ty6#?F`f`UlDs1=tE~8I$?20GzYnH+HK`c`2DuItTNnF&f z)6OQmHOh9@^~&k!_xn%aK%*#p57tuGe``kKSME!Z&zh> Oq$Ha_JUase0001W?)wA) diff --git a/libs/core/_locales/core-strings.json b/libs/core/_locales/core-strings.json index 628e7efe..69588aab 100644 --- a/libs/core/_locales/core-strings.json +++ b/libs/core/_locales/core-strings.json @@ -35,7 +35,7 @@ "brick.buttonUp|block": "up", "brick.clearScreen|block": "clear screen", "brick.lightPattern|block": "%pattern", - "brick.printLine|block": "print %text| at line: %line", + "brick.printLine|block": "print %text| at line %line", "brick.printPorts|block": "print ports", "brick.setLight|block": "set light to %pattern=led_pattern", "brick.showImage|block": "show image %image=screen_image_picker", diff --git a/svgicons/icons/download.svg b/svgicons/icons/download.svg index c09ef141..63baf8e6 100644 --- a/svgicons/icons/download.svg +++ b/svgicons/icons/download.svg @@ -8,12 +8,7 @@ color - - - - - - - + diff --git a/svgicons/icons/save.svg b/svgicons/icons/save.svg index f808f233..9035957d 100644 --- a/svgicons/icons/save.svg +++ b/svgicons/icons/save.svg @@ -9,16 +9,17 @@ color - - + + - - + + diff --git a/theme/blockly.less b/theme/blockly.less index a4b5ce55..c259e71b 100644 --- a/theme/blockly.less +++ b/theme/blockly.less @@ -125,19 +125,27 @@ span.blocklyTreeIcon.blocklyTreeIconadvancedexpanded::before { content: "\f117"; } -.save-editortools-btn .icon.save::before { - content: "\f115" +.save-editortools-btn .icon.save, + .download-button .icon.download.icon-and-text, + .button.approve.positive .i.icon.checkmark, + .button.approve.cancel .i.icon.cancel +{ + font-family: 'legoIcons'; } -.download-button .icon.download.icon-and-text::before { - content: "\f114" +.save-editortools-btn .icon.save:before { + content: "\f115"; } -.button.approve.positive .checkmark.icon::before { - content: "\f113" +.download-button .icon.download.icon-and-text:before { + content: "\f114"; } -.button.approve.cancel .cancel.icon::before { - content: "\f112" +.button.approve.positive .i.icon.checkmark:before { + content: "\f113"; +} + +.button.approve.cancel .i.icon.cancel:before { + content: "\f112"; }