From 995f6be2c45c4d246ca7525bacf5a5317caad8ed Mon Sep 17 00:00:00 2001 From: Trent White Date: Wed, 11 May 2016 03:08:25 -0400 Subject: [PATCH] old grafana wordmark was still showing on login and sidebar (#4972) --- public/fonts/grafana-icons.eot | Bin 28992 -> 29716 bytes public/fonts/grafana-icons.svg | 13 ++++++---- public/fonts/grafana-icons.ttf | Bin 28804 -> 29528 bytes public/fonts/grafana-icons.woff | Bin 28880 -> 29604 bytes public/sass/base/_grafana_icons.scss | 36 ++++++++++++++------------- 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/public/fonts/grafana-icons.eot b/public/fonts/grafana-icons.eot index 4e594eca65de0def6ec31291285f897eff9a9873..88bc142e2056ec8daf240b07534d77205b05dfc6 100755 GIT binary patch delta 2520 zcmai0eQZVrS9qs$7C@sw9;3Dkm*w@Y3hUj;Tt*elr_2?#|a zk~b7>hn4^v({6dJ-?4hMpIbd1D?|zaqE@$?MhlZwyXCf?v%0lgsIx+}0Q5j8xrn~@ zqc0n2LvKD4RqeKF8V)6Cq@{t%l@6O3cwZw3`VeSIfuax5Pz}WNLEm=Lh0NuJuC9g4 znbQ0Y$2D;hH#UYt6Q|GrhMAR(bp2TVMv?3JD!Fucxyt_wm4VM6{F?DF?~)4QA&MR} zZ^yJ?LRtcHv$PTY3!n=f>2$|`66W2(qJB_&yTs5g<7!aXW11MU@?f1^Vb)3I>h-{< zj~!-7KRLr(qJJYiF%S!}6H;jcyJP^r7qBFX0VGhs3qx4rxOSVdaYIWN#u2PMf6{eR2NsM%pG|7?$ za+Eb>Yg~9hz#v&7Pa@`2XHhI>QuA)9UXyVTj};ec{tKK-nDgW*H~L*NIp23+1Z)N zbneVR`&(~K<@Tss`{gG3n?ZRfTBMD)mS`g*NTc7K+SwfH%pR!P9c>UvapG&2Um%Y9KHWNwmMp~k{;iv-Wa+oc4yT$An)(0Kjg=5;8l4!5f zkMi{_DB36VO8%Md>FI9zQuj17-F3DATZ= zr?>aCwgOY|$#nN46Zfwr`uh_!k^d%t92P&yrefOA>C-mF$(po}R@k*>4u-c@rxMBFmbB=|-bL zG&UUwnpjp4Eu2Z|aC-!n#eI*>#Z()NMne^K**y%$aAge32_8>}VrI$^QnX+WrkjkS z!PuA%nmA5CC2wF%%67L)6*!JD@RVbmb|>8=8ja#6>bAKA39XAxcSk@QG17`NF3IY; zRN-URH^f(n^Zq#(nqV!W%jTk+Fc5Jw2I4NBce@`Cn2VPvgrHv{9W+zmIMKqI@fNCw z@K_`AjyU2^(1gSg+dkzcTg(u4#=nobhv4_!dL!+_A|-tmf+xP zJ;=n z+{K5&=qg2MWJ;D&6!p$n4fD_vT4bGIh{p}U=VB*K>8DRNisnOnNhLI$G#xmMx||lc z(WgRLxAr~Sr#>k@pFDm1#A51svAcW2`gfuE@YuD5lvj6}9 delta 1654 zcma)6Z)_7~7=PcpwkLnwc5AQgVD0W-+d0tYh(J|ISyA55W-8vy= zCL|>R2^fu(BZ0(4O+;ceQIn0tm?awdpeBHT82vPnh+%#)d{81`htG8k2TEeD@AZDq zpWpNR?tR`nb{&6l6}WQ>^Y||x!~q|J8s`gRyZ0axJg6{i_z`KwZ)@&ezLOa()!zD}N3 z1glk0c*7D3E?C6sYEj{xbsh0!qd(c*!LlKaruiVtc62BGjrS~Eh}AC&`Yh%J%v2#yoE{`#?XSL=F(X04eYl1XV#YHaFpLlTx^uP@72w^JS+Zm!T9cI~iL! zRIvIeALXDNszdde(pFI}w+teZT}wnfmrMs2RLG)LXYcFY&;#AaJL(KQ)m)G*E4<=7 zf6jRhe&?O%@Rz}~!3W8AD*#w*IMMs2;q(sjT>yzV@Ewww(Fnnyfa zwBTRwTqIYKAEOnh26>T$qG&S+58D}=Mc}=P98q}-W3x-)h$4H15WU1BDN9{TJ@@4h z`=quu$ylxZ{jJ8jhr1s%+{NT;3kg!2u&tcYx=la4XyO-0TKn}^mzuU2kyFE-Iksp< zL+A)ON!&!0$c|Pa4*5V62i?-3gaawG>?N_sjTxF;hPg*Era>rnsF=g#uK5PWNENbacI5+SLt&m64yVo8Lys~@M_|wiyHFj2$;fs@9}i zh~@gvxQ@7?&*57piqvmy+NfW{wFpg3KWVlW!<9a=6UJUa&!T=biVh+TeTdGWZ=p|# zslWmZmoZsV*zQmR04oS%{K~TjN5i8Ca5&_M1TUI08-5E_fnl2*ZVWr6G7>E?WO@65 z0k#q|0@&bE1lZCIMXW*!^M5kouvnNO_4=TsnfdR!_m!Rcsqv+a(Xm7@m>7#T zjXw62dNiIW<%-d0u9R3i(9`bH&k*i`fmDlQO~FaL%=ZSQ?H4O^`-=l?^{b;nkq*)^zOihs8pCWDuWZooj)YYU=B2(*MF# zD9Q2svd90Gqz^Ch!|Z%Dz*h+vK2@-$M@sv5R5tyAR+x;B7y51u{73w4@2UFP bhJB5D{U-vwfeHDR^1e|IDO1Z|Tu%HAM9h#> diff --git a/public/fonts/grafana-icons.svg b/public/fonts/grafana-icons.svg index 319e1739324..9006ea24078 100755 --- a/public/fonts/grafana-icons.svg +++ b/public/fonts/grafana-icons.svg @@ -31,10 +31,10 @@ - - + + - + @@ -46,14 +46,17 @@ - + - + + + + \ No newline at end of file diff --git a/public/fonts/grafana-icons.ttf b/public/fonts/grafana-icons.ttf index 2cfefbff196599282a6cf7ad15b01e9b29138070..50b2a0303f644e212864c67f544a810c45501853 100755 GIT binary patch delta 2543 zcmai0Yiv{J8UEhyT%9&UsY1MuVANC#_k8It= z^7p;xdA{d+-}k$m*M9DI@X2jZ2oORl$s%D$>&}6epwTS+5}CKLjZMsD<_m9KI!_4H zAfBAg9G*vOLcEApoX&l7|7Q!QZzKK|A$ilxRA$mT5`UJE125rtbOs4apZOBvUm@N& zGk4^v#_xOHK>Sz4zs(((=*kQv<8eafKStuvT;{2HGQhq<$iZ!hAIN9srdDoU=tDe% zL2k?+ID7;X#n0h(ZJaRN+0$z&sQ5PQgo@Q&04@c{>fJxE2;1rh>_BDW;mnD~* zuLX-Wkji7vqQa( zoEf4;pk+bHd5pCiV_8TCMspjeB3tTcD43*?a5ME(TP;T5-7O$!oiCgMzt%;A^$^oK zZP-Q^GZzel+_+j<+vO>LxPs19I+r*HS zyKC$Uvqq{{Mc-!+OtWN=oMbN0zY(73@IJ|eR2x8+bl`OX9*JKE68OOdBMb*|^#)@q zcwr7+XIb?I;=#w&_ZYwW9{rMvT;VFj!ARAgKpQ7A>YvrCv_n1jsJaHJ)x}4+Y9(s) zGyNn$Vx*U(NfxjA3GynrL_WZ^8yJtf8ILN7M`pDN&EUZ!ET3S^6>)JM?e2J_keq}B z2;hkrP;-AuBqTAoZ{=MBIV5{f9*&||W5J{R?-^cAU373SN+?)I|6dr!&!lFSb`G4J zPNZ_D`nSK(nQED9e<-`Nx$)8IL}X-Jo2b4EKZJvcV7HRpZSC?M+C(=GdqyMelRcX@ z^-Od`Mm&3GGF!VdneMF_=zQ(9+58S=)1ar7elqMCiI!xO?Pb~67|Q5(XScQmyR&<0 zw+EVcCEPTB-{XC0$>UqQPVCom>+4re=Te;=I|8BRUD?iLc1M$U^H6Y)bRlkM#jJq-cR!-YSAZp--imhSO!$kvXikI{zR;}dP}!iWD=cT~Lw9c|s+ zZR#~@YI4+iI{VeL_tfUEx?TP86K+#&1vz{7efB%dJ6Qf~WCN+kf)OB1BuTcD$CtmT zs#78^8Lxos@@iIaNiGSnipW?%LRdQ@5?+^T3-58ceOOE+$rTAlall#&&|@{4WZ7i2 zj%u9-K8Hi<$#PR)p&u2RSn#W#(#wS>dvm#7`h0JW$@QEXOcb7s4>9NO>>X0#^!daf z6Vx26YlRp3Zw}n-zuDh^LS2Db_%zph-^HCPiNV1HO%#4g$Gq{Op}4pB_Pxu#q`iIQ z2joYkGF86gT9vByH-lh+dN6>X6#=bKHiJK=M16iAZ!A710Y$~fQl)5sB*biWfG8IA zwX8!)D56qL>4ZA43B0wWOcjv<)}hjylh8tAEL0Y=0L@BDsVqr2Kv%Mtm-_maE@!`9 zvI_=Q5=53Y1kx>fov3f!6ELu>AeuOXzsuniSQf{f7CTd?)9ZD$)Gj+2j^Qd8mJ^)L zF29kfKuFPpF_3Q6i#mNvI$+>90ZCrR82p!v~|=lcG-?=1QgkEzP1S*PocOA#Wnb=a1E%a@^v|A zsLEaWtok#_;gDeO%a!;`&yq9uDzTR|l5Ud6+u%>(iD^y1FK$ddo^!D&G=@J@wiM<3 zF&o&x>yK#))Zm%g1Z@mQ@uDyqgjZ)H7ml@4DyT2Nx>$%`OB5{Ui@U zvQq?pUO;X%yAb57id<3v{vZ$ABttrFkY;0fp(4IT7&VG5*)nAs6?6&YOfmhn5d|tS z<{vTE(^{;jQ%gsWKCzT62G)T3@suDWyM-w|A3Rv4A04eU%y;OgL@~KlL@qS{Pfq(^ zp#7)9cFQ)Cztgf^zLSeV`*L{hFt^GPa(?;ZTnq-6Z_RDgb4}zd zwiRq=mc@J`^|I+N(vWn@e5^Vvo8;fvj@iFq|H5&uX0i61n{~H)KMyz`e7oUN4RaW7*4 delta 1678 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 diff --git a/public/sass/base/_grafana_icons.scss b/public/sass/base/_grafana_icons.scss index f7f3a0368ee..f3264d409cd 100644 --- a/public/sass/base/_grafana_icons.scss +++ b/public/sass/base/_grafana_icons.scss @@ -1,10 +1,10 @@ @font-face { font-family: 'grafana-icons'; - src: url('../fonts/grafana-icons.eot?h6rv8b'); - src: url('../fonts/grafana-icons.eot?h6rv8b#iefix') format('embedded-opentype'), - url('../fonts/grafana-icons.ttf?h6rv8b') format('truetype'), - url('../fonts/grafana-icons.woff?h6rv8b') format('woff'), - url('../fonts/grafana-icons.svg?h6rv8b#grafana-icons') format('svg'); + src: url('../fonts/grafana-icons.eot?okx5td'); + src: url('../fonts/grafana-icons.eot?okx5td#iefix') format('embedded-opentype'), + url('../fonts/grafana-icons.ttf?okx5td') format('truetype'), + url('../fonts/grafana-icons.woff?okx5td') format('woff'), + url('../fonts/grafana-icons.svg?okx5td#grafana-icons') format('svg'); font-weight: normal; font-style: normal; } @@ -61,6 +61,9 @@ .icon-gf-endpoint:before { content: "\e609"; } +.icon-gf-page:before { + content: "\e908"; +} .icon-gf-filter:before { content: "\e60a"; } @@ -112,9 +115,6 @@ .icon-gf-save:before { content: "\e614"; } -.icon-gf-settings:before { - content: "\e615"; -} .icon-gf-share:before { content: "\e616"; } @@ -124,10 +124,13 @@ .icon-gf-search:before { content: "\e618"; } -.icon-gf-tag-add:before { +.icon-gf-settings:before { + content: "\e615"; +} +.icon-gf-add:before { content: "\e619"; } -.icon-gf-tag-remove:before { +.icon-gf-remove:before { content: "\e61a"; } .icon-gf-video:before { @@ -169,6 +172,12 @@ .icon-gf-scale:before { content: "\e906"; } +.icon-gf-pending:before { + content: "\e909"; +} +.icon-gf-verified:before { + content: "\e90a"; +} .icon-gf-worldping:before { content: "\e627"; } @@ -176,10 +185,3 @@ content: "\e903"; } -.icon-gf-app:before { - content: "\e902"; -} -.icon-gf-datasource:before { - content: "\e607"; -} -