From 431782c7aec78c4a5a6a6c667e3bdbcb5ada31c7 Mon Sep 17 00:00:00 2001 From: Thibaud Colas Date: Thu, 6 Jun 2019 17:58:01 +0100 Subject: [PATCH] Switch all icons to be defined with private use codepoints instead of ASCII letters --- client/scss/settings/_variables.icons.scss | 163 +++++++++--------- .../wagtailadmin/fonts/wagtail.woff | Bin 24020 -> 24140 bytes 2 files changed, 81 insertions(+), 82 deletions(-) diff --git a/client/scss/settings/_variables.icons.scss b/client/scss/settings/_variables.icons.scss index ab137ac44..a5aaddf9a 100644 --- a/client/scss/settings/_variables.icons.scss +++ b/client/scss/settings/_variables.icons.scss @@ -1,88 +1,87 @@ $icons: ( - 'cogs': 'a', - 'doc-empty-inverse': 'b', - 'doc-empty': 'c', - 'edit': 'd', - 'arrow-up': 'e', - 'arrow-down': 'q', - 'search': 'f', - 'cross': 'g', - 'folder-open-1': 'i', - 'folder-inverse': 'j', - 'mail': 'k', - 'arrows-up-down': 'l', - 'locked': 'm', - 'arrow-right': 'n', - 'doc-full': 'h', - 'file-text-alt': 'h', - 'image': 'o', - 'picture': 'o', - 'unlocked': 'p', - 'doc-full-inverse': 'r', - 'folder': 's', - 'plus': 't', - 'tag': 'u', - 'folder-open-inverse': 'v', - 'cog': 'w', - 'tick': 'x', - 'user': 'y', - 'arrow-left': 'z', - 'tick-inverse': 'A', - 'plus-inverse': 'B', - 'snippet': 'D', - 'wagtail': 'V', - 'wagtail-inverse': '0', - 'bold': 'C', - 'italic': 'E', - 'undo': 'H', - 'repeat': 'I', - 'list-ol': 'G', - 'list-ul': 'F', - 'link': 'J', - 'radio-full': 'K', - 'radio-empty': 'L', - 'arrow-up-big': 'M', - 'arrow-down-big': 'N', - 'group': 'O', - 'media': 'P', - 'password': 'Q', - 'download': 'S', - 'order': 'T', - 'grip': 'U', - 'home': 'W', - 'order-down': 'X', - 'order-up': 'Y', - 'bin': 'Z', - 'spinner': '1', - 'pick': '2', - 'redirect': '3', - 'view': '4', - 'no-view': '^', - 'collapse-down': '5', - 'collapse-up': '6', - 'date': '7', - 'time': '8', - 'success': '9', - 'help': '?', - 'warning': '!', - 'form': '$', - 'site': '@', - 'placeholder': '{', - 'pilcrow': '\e600', - 'title': '\f034', - 'code': '\e601', - 'openquote': '“', + 'arrow-down-big': '\e030', + 'arrow-down': '\e01a', + 'arrow-left': '\e022', + 'arrow-right': '\e017', + 'arrow-up-big': '\e02f', + 'arrow-up': '\e010', + 'arrows-up-down': '\e016', + 'bin': '\e038', + 'bold': '\e026', + 'chain-broken': '\e047', + 'code': '\e001', + 'cog': '\e020', + 'cogs': '\e00c', + 'collapse-down': '\e03f', + 'collapse-up': '\e03e', + 'cross': '\e012', + 'date': '\e045', + 'doc-empty-inverse': '\e00d', + 'doc-empty': '\e00e', + 'doc-full-inverse': '\e01b', + 'doc-full': '\e018', + 'download': '\e044', + 'edit': '\e00f', + 'folder-inverse': '\e014', + 'folder-open-1': '\e013', + 'folder-open-inverse': '\e01f', + 'folder': '\e01c', + 'form': '\e00b', + 'grip': '\e03b', + 'group': '\e031', + 'help': '\e041', + 'home': '\e035', + // horizontalrule is not rendered as an icon font – it uses a unicode dash character rendered with a fallback font. 'horizontalrule': '\2014', - 'chain-broken': '\e900', - 'table': '\f0ce', - 'logout': '\e901', - 'superscript': '\f12b', - 'subscript': '\f12c', - 'strikethrough': '\f0cc' + 'image': '\e019', + 'italic': '\e027', + 'link': '\e02c', + 'list-ol': '\e029', + 'list-ul': '\e028', + 'locked': '\e009', + 'logout': '\e049', + 'mail': '\e015', + 'media': '\e032', + 'no-view': '\e006', + 'openquote': '\e000', + 'order-down': '\e036', + 'order-up': '\e037', + 'order': '\e034', + 'password': '\e033', + 'pick': '\e03d', + 'pilcrow': '\e002', + 'placeholder': '\e003', + 'plus-inverse': '\e024', + 'plus': '\e01d', + 'radio-empty': '\e02e', + 'radio-full': '\e02d', + 'redirect': '\e03c', + 'repeat': '\e02b', + 'search': '\e011', + 'site': '\e007', + 'snippet': '\e025', + 'spinner': '\e03a', + 'strikethrough': '\e04a', + 'subscript': '\e04c', + 'success': '\e043', + 'superscript': '\e04b', + 'table': '\e048', + 'tag': '\e01e', + 'tick-inverse': '\e023', + 'tick': '\e021', + 'time': '\e008', + 'title': '\e046', + 'undo': '\e02a', + 'unlocked': '\e00a', + 'user': '\e004', + 'view': '\e005', + 'wagtail-inverse': '\e040', + 'wagtail': '\e039', + 'warning': '\e042', ); $icons-after: ( - 'arrow-down-after': 'q', - 'arrow-up-after': 'e', - 'arrow-right-after': 'n' + 'arrow-down-after': map-get($icons, 'arrow-down'), + 'arrow-right-after': map-get($icons, 'arrow-right'), + 'arrow-up-after': map-get($icons, 'arrow-up'), ); diff --git a/wagtail/admin/static_src/wagtailadmin/fonts/wagtail.woff b/wagtail/admin/static_src/wagtailadmin/fonts/wagtail.woff index 978aa7b2522e882a324a90aa7dc4835a2ffdf446..bcc9c406c3675f9ad33df17f3d5115cf83a93ff1 100755 GIT binary patch delta 1328 zcmY+EdrVtZ9LLY^ocro+d;6d-3Y3o0f(16@(as12kf4)}#{?e*=E`J49j`z#j2KAN z&BS4{9kR@1CK}lim$3}*A1Y!bW-*g2ncFbg7L8u_qs zh%KP6Y-2xsyF$qG;|A`H^MCa9rd}c>S&KC>15eeezYl{L8$&1j7^!1OT zpFE4>8w?(MJ^1*M!Gm>J*tvp5GX|+AkKXN1jbY=ix6lu!*-vi_r22a?hBa`^;LY;; zzYPtJjN+1tPp-vEu@3Bb``=Yd$V!4OZZ48qhF~te2}TX?fpF1o6e=!`;s;1@C9%1_ zxoKokleC7-UxET*xLGP~;o;`rd3Q@Iw<3G@-sLQDlXuIv_2IGv=pR`g%KV&ZQ4iNy zfX_X##zmIUzbbE4^zQ1bj6YgGrdz98LI0#)0e!ZiUFJU|#`O1Hw}F@VF6+ad1<-%; zjXE3xSs)dxnk9&j)R8yHG#}XGXO*IhpWPLTdIR7NyChkI|GuHTNWo4hhz9_ZF%JRx8sEk!qLkP#%u(I4iH%+SQwOX9AB*}{6wV9oYN#3|m*$FBN zRHW|-K&dQrP)bGC!9=up2S%ZZF=i5Fn@Pd(**49mN+!V}$V_o4&VWU=GZ3vNQ-=iZv^Cq*qD=}eGK-u+-Ne67=4Kk% z`mG8$AP{Ipeai5;y>mwffgaRPZ}TeJ<9sw3pIAVJ{Q>7RAOpzTND^5^dbjmyv)5aYBhIt?ET} z)%=vX&pcxZSjMb*)-Fxby0kO4TH6&nv7fMSINBYbIs+M{83P#?T$<~&Yt?^SSdOgWo%``p{{^}icZ6Z zOmUxN$1RH{q??N|W+o(ezGRLBjb;uMZkq;8s#1OMlpW87LJvYDmoag`i z&pj_WcjhXY|Aq*!?WwB+0@(J?gE}2Yfw0mJVa%@^GQ`LF4#i`A0Hhmhmn8o1PQQF4 z){h!z#9Xm%tcUSB%z`iN;R7#jm46k>ih}t^lZVBbbazl4~ zU=W}U$C8l5;sKH9rn~N8;`B zd$;>~`v-7Km&fi`mK;Y>hvxsZ0KlrBPNk+GKoP8^4}m&qly#DV`1`2X@sXt~4qR$A zv_S_Pvs>?wC9+bnGP5$f>Q6mLrO+XH-B1Egpd*G3Sb|N5FYO?y-%`J(eooD$W>YhZ z{@h*W23?MJSbIWS05pBv78dAGut`$OPBva*IfmWh521CA#p))QDOAC3?<`^4_-7EOrzw+`r|1X|$*`Y9E_g4=Tx z6K^r`5vM{+Tuy~aZxqTMWtH3X6&~8RF{;g#Q(eYcK2uS)BinAz<`(hIO&c8Y3^gwg zILsS5!RauQ6~T$yWfz;y49UQp`h_mhE076#uz?F_;k{Kgq`XWpmzsI6w_NX%SDE=N zoY3Pf^;Vh9E`2%S$0OI2CXL3VycQX+?(gS({}X6&B66Kqsrc)WMAn0@nnWb2RH>B7 zNW#W_1fYOr$fX9Bz4J%0u~y*3p};H^GZnju*kuSS#kKq}5x>YyQcB3lpoZaM+ zE@^d00IAv}X4+%buCBTk)j*ty`U ubX{;?cHb>%FF5Csc?LZRPtyD47Hc6CP8Z$u?e*QjMN0p2L_F309r*`Dd^z_3