From 521177130c3cb7c976be1619aada8a6b3ce21b7f Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Thu, 12 Nov 2015 18:00:20 -0500 Subject: [PATCH] Update custom icons This also required an update to the padding fixes of the currently logged in user menu item. These aren't necessary anymore. --- .../fontcustom/.fontcustom-manifest.json | 50 ++++++++ .../assets/fontcustom/fontcustom-preview.html | 59 ++++++++-- .../client/assets/fontcustom/fontcustom.css | 18 ++- ...ustom_d77a9996ed04d45b02f5c06874cd36db.eot | Bin 0 -> 3982 bytes ...ustom_d77a9996ed04d45b02f5c06874cd36db.svg | 108 ++++++++++++++++++ ...ustom_d77a9996ed04d45b02f5c06874cd36db.ttf | Bin 0 -> 3796 bytes ...stom_d77a9996ed04d45b02f5c06874cd36db.woff | Bin 0 -> 2376 bytes ...ustom_fbf6cfce71d2c35351b84596defbfd01.eot | Bin 2946 -> 0 bytes ...ustom_fbf6cfce71d2c35351b84596defbfd01.svg | 72 ------------ ...ustom_fbf6cfce71d2c35351b84596defbfd01.ttf | Bin 2760 -> 0 bytes ...stom_fbf6cfce71d2c35351b84596defbfd01.woff | Bin 2016 -> 0 bytes .../new_icons/.fontcustom-manifest.json | 24 +++- .../fontcustom/new_icons/activity-stream.svg | 16 +-- .../assets/fontcustom/new_icons/launch.svg | 34 ++---- .../assets/fontcustom/new_icons/user.svg | 14 +-- .../client/src/main-menu/main-menu.block.less | 15 +-- 16 files changed, 268 insertions(+), 142 deletions(-) create mode 100644 awx/ui/client/assets/fontcustom/.fontcustom-manifest.json create mode 100644 awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot create mode 100644 awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg create mode 100644 awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.ttf create mode 100644 awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.woff delete mode 100644 awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot delete mode 100644 awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg delete mode 100644 awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf delete mode 100644 awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff diff --git a/awx/ui/client/assets/fontcustom/.fontcustom-manifest.json b/awx/ui/client/assets/fontcustom/.fontcustom-manifest.json new file mode 100644 index 0000000000..06fddffd64 --- /dev/null +++ b/awx/ui/client/assets/fontcustom/.fontcustom-manifest.json @@ -0,0 +1,50 @@ +{ + "checksum": { + "previous": "e4442d278bfc4c1a673bdd29512213a18cfaf74decd9bb21ecd698b4860e7453", + "current": "e4442d278bfc4c1a673bdd29512213a18cfaf74decd9bb21ecd698b4860e7453" + }, + "fonts": [ + "..//fontcustom_e4442d278bfc4c1a673bdd29512213a1.ttf", + "..//fontcustom_e4442d278bfc4c1a673bdd29512213a1.svg", + "..//fontcustom_e4442d278bfc4c1a673bdd29512213a1.woff", + "..//fontcustom_e4442d278bfc4c1a673bdd29512213a1.eot" + ], + "glyphs": { + "fontcustom_fbf6cfce71d2c35351b84596defbfd01": { + "codepoint": 61696, + "source": "./fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg" + } + }, + "options": { + "autowidth": false, + "config": false, + "css_selector": ".icon-{{glyph}}", + "debug": false, + "font_ascent": 448, + "font_descent": 64, + "font_design_size": 16, + "font_em": 512, + "font_name": "fontcustom", + "force": true, + "input": { + "templates": ".", + "vectors": "." + }, + "no_hash": false, + "output": { + "css": "../", + "fonts": "../", + "preview": "../" + }, + "preprocessor_path": null, + "quiet": false, + "templates": [ + "css", + "preview" + ] + }, + "templates": [ + "../fontcustom.css", + "../fontcustom-preview.html" + ] +} \ No newline at end of file diff --git a/awx/ui/client/assets/fontcustom/fontcustom-preview.html b/awx/ui/client/assets/fontcustom/fontcustom-preview.html index 48cb53f8af..becd88eca8 100644 --- a/awx/ui/client/assets/fontcustom/fontcustom-preview.html +++ b/awx/ui/client/assets/fontcustom/fontcustom-preview.html @@ -141,11 +141,11 @@ @font-face { font-family: "fontcustom"; - src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot"); - src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot?#iefix") format("embedded-opentype"), - url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff") format("woff"), - url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf") format("truetype"), - url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg#fontcustom") format("svg"); + src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot"); + src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot?#iefix") format("embedded-opentype"), + url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.woff") format("woff"), + url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.ttf") format("truetype"), + url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg#fontcustom") format("svg"); font-weight: normal; font-style: normal; } @@ -153,7 +153,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: "fontcustom"; - src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg#fontcustom") format("svg"); + src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg#fontcustom") format("svg"); } } @@ -163,6 +163,9 @@ .icon-activity-stream:before, .icon-google:before, .icon-launch:before, +.icon-launch-circle:before, +.icon-launch-new:before, +.icon-launch2:before, .icon-saml-02:before, .icon-user:before { display: inline-block; @@ -182,6 +185,9 @@ .icon-activity-stream:before { content: "\f102"; } .icon-google:before { content: "\f100"; } .icon-launch:before { content: "\f103"; } +.icon-launch-circle:before { content: "\f105"; } +.icon-launch-new:before { content: "\f107"; } +.icon-launch2:before { content: "\f106"; } .icon-saml-02:before { content: "\f101"; } .icon-user:before { content: "\f104"; } @@ -199,7 +205,7 @@
-

fontcustom contains 5 glyphs:

+

fontcustom contains 8 glyphs:

Toggle Preview Characters
@@ -243,6 +249,45 @@
+
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+
PpPpPpPpPpPpPpPpPpPp diff --git a/awx/ui/client/assets/fontcustom/fontcustom.css b/awx/ui/client/assets/fontcustom/fontcustom.css index 996fef5fe0..39ab124bda 100644 --- a/awx/ui/client/assets/fontcustom/fontcustom.css +++ b/awx/ui/client/assets/fontcustom/fontcustom.css @@ -4,11 +4,11 @@ @font-face { font-family: "fontcustom"; - src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot"); - src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot?#iefix") format("embedded-opentype"), - url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff") format("woff"), - url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf") format("truetype"), - url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg#fontcustom") format("svg"); + src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot"); + src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot?#iefix") format("embedded-opentype"), + url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.woff") format("woff"), + url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.ttf") format("truetype"), + url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg#fontcustom") format("svg"); font-weight: normal; font-style: normal; } @@ -16,7 +16,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: "fontcustom"; - src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg#fontcustom") format("svg"); + src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg#fontcustom") format("svg"); } } @@ -26,6 +26,9 @@ .icon-activity-stream:before, .icon-google:before, .icon-launch:before, +.icon-launch-circle:before, +.icon-launch-new:before, +.icon-launch2:before, .icon-saml-02:before, .icon-user:before { display: inline-block; @@ -45,5 +48,8 @@ .icon-activity-stream:before { content: "\f102"; } .icon-google:before { content: "\f100"; } .icon-launch:before { content: "\f103"; } +.icon-launch-circle:before { content: "\f105"; } +.icon-launch-new:before { content: "\f107"; } +.icon-launch2:before { content: "\f106"; } .icon-saml-02:before { content: "\f101"; } .icon-user:before { content: "\f104"; } diff --git a/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot new file mode 100644 index 0000000000000000000000000000000000000000..739e0b64f593b72c4ec3cbfb2e3a7338f56292ee GIT binary patch literal 3982 zcmds4eP|rV6@PDLzi)5vYj^L%(%tILx=SqSd>_)CYfHA9*s^2n#Ka%914WS)eYvuv z%93M;U|QOel0tF8l_|6on*PzIro^I!LWr?T|L8x4#JChn3N57&3ZV%hU{WLX&ECqA z8@YD>?abZ2d2eQC=DqiOv-7?i0k~rUATSVxfz15|NiLyi9X#w4fM`oD#;L{>xb*{(br% z7&$lZK@9f*@F%EW8XrD8yRt$vf%O*g+W6FkvHT~$o}&K!#J)8#I{cFS$t&+tAH5Ha z2@>#+@OLzqP5kDGGxO)At>6$Z*3VDPj0_teXjkd|ZsId%hR@H!5%@XvZzJBD9zHXA z>(n>C4-mRbHs3xwb9VmjyI&om^?RxR6<;^fZ`a9FSBE0~pF*hRo!h5>w1xUX(3O>y z>kRNFv0C6fnx1|)SFS^u0qG;e!b`P2I4`dxGVq)}VyUFmPNcd;GBzo~6juF2v zpr1k-zPTPD)Q9&$LCoQ?y)ThJypL79v2p{-w6~|k82YakkGQuX=Cg0o^Y^U{1l?jU zEYL-uQ2g71_xBJdW@-ZogwGVB0<^T6(3B`?yz;k*kOl>nwZ*YD_i9&*(#Qbp56b_) zI3MS*C8$?X!CBVEUga5nLlV)!e1H4^kC8D{C|^U^+P|bq@L}zmBER3i#2Gc=8W&<& zh?i6a@AWT{Nk6RBWA#|69xKGY{qoot9$WrJ4C^!}p=ad=q4NgK=s_23hr=Ybm3*!xe>dT{U>j&17=Pm{zill3|*5DI}Y3exylPoo^SUTgIA2HMJr-cHkyWz%#MiFh{Mp3byw@8~d$STtWSO-0$1aWa|C z^7dW(1AUhNkxs`nP1TH;VaQT=z*N+>P1Q^y5wW6C(ohQ}Y*mf!bGOyRrdRiT6Y@YO zUuWIILcUn4*LER!VJ8k?t0|uKByFzQSs+bFkt{m4TF6JRRO~_`oZK3rmsO#wihs)4 z-+AH0>&`Kgr}ErV^d5_)n>7`wEX(BeDU<)!d}*+$$CiA3lxL^<=og_LJ zev8X^ov?Tij>5|%Yt&o;#-?rY2xig32r9JgQn6WSHcA9NiY*!^PHwl?7Yzn7RwG~H*Y=>&y#jad;Hrt)Mjd~>K3`tDy>O{sF z=Q78fn?z))?dGy^iE%_s=J%o^qa=6k>&ux#?I&ukL~_p9Yhsq%tx$+3Wuv1%6tZOG zayXh~n#7Q|W5XZtrfgTr+ngaY*EdKDFVBVt@p9oyZ3S$5_2<;%A(<4-FWmoE00S>15r>9E3> z%1L|O>`L3=2szY}P_fc+N3uHb9eUyN?T>aGJbCfr$!B&r?OaO7t!P3)C9Wx0biy$T z%5XGOMAA4Gkpm_xeWwnHOG+}{tRqd-v~ z2LeuWYsHo&`BDBKz|WQy{P+R)tLo#p-^oREraZp$CEGp`uIp2$v8_oxebD9d5B3`I-POStI;E~Kehsm?8fig@({d8 zwxm1d=T9Zyf{w5tef{zUGE8vPJj#Tv?`F4e!9~K-PArn<0dF=^577S6v@*BB}Y?K;pvv-j>6Z75^BTss@O0}=sJ1{db z?H!t&ADI}Pq9GfmTw^oS^CJsq=V$0-`;Xk~`O)!(sbNaO2K~%y-luc4!BKx(A_Md2 z(&lYAajU0F+wY-ltxC^TMPQJY9GsaOAN6YGinrZc+X6AwT2HmwBliCo8-8SJczks3 z?BvX}SE*FXl}g2Xj5+=L4f&StWt7WoR7?_ztb)@AgQG-WJOx$MP*)eGCkLyQN+roR|crb0KY7Utgj;=MP7bbU_uZ{CLy7XSbN literal 0 HcmV?d00001 diff --git a/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg new file mode 100644 index 0000000000..f1fe2ac03d --- /dev/null +++ b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg @@ -0,0 +1,108 @@ + + + + + +Created by FontForge 20150401 at Thu Nov 12 14:46:50 2015 + By John Mitchell +Copyright (c) 2015, John Mitchell + + + + + + + + + + + + + + + + diff --git a/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.ttf b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.ttf new file mode 100644 index 0000000000000000000000000000000000000000..5d151b75b0ff606ea5b8f9617302a595e2f4864e GIT binary patch literal 3796 zcmds4YiJzT6+Y+QdC%mn&;k zS#q2ZOiNo*(myGp$~M9nv5 zCdZ$XKYsCT>ZAEkpCJMN5Pwf=In>@db8hLPv;$mfi~VzR&53d2eeEjE@27V9-1x-> zI1ay{{+-nJ=f}@Y-g@?1KL9ZA0I*#P&GSol-v0U+?LSEUFM_a*p1o(Dy*d^i{sc@$ z0)X3Rf4qI2wpy+04DcqkHRyD==itrObto|)dxTi5wE2?T5(_Q@d511B6Wg+VP-;sg z{0qJ+dhrNOk>p@NKYVvW`$^t5geI&aX5 zKJ>vZI7U)O$rT3cRk_}%C%lBsRGX`XVnJ2tE~tC3QD_v3)JW8aY97f-yjX9jUczhC z8zmGyMH*hTQS}(Cyt}gU?pmv7|M0M%=8D3(t{Ob*rPJ9&R4Y10(XcG1Xv)@`_;W23 z^3`xCqGXhJGWq`U_N-CRqlrY^i*;Li(TL%8vE0h)zNG7!Nv^0&(p6oGsG6cCV#&;_ zYDUX#4QJfsh?y)^2l_LzWmvM4pHAwgVRUKTswvSGa`IY6%L@Pz+V1&a_lEUcm_YZ? zV545Ek{`(CLO!P|u0xIBb{!?3qfxF`tJa4G18e2@V6SD!vSoSkcr26ZPNlnc_4F7< zG?L3(mZEG)yXkaqY1iIEfjw*gOr@flrfNpiFk~q-Vkv6ZmP$Gv58IIlS*V$DM^z&S zy`5E|^t#SBAqQ0XdTTc3bA@89x)&)5dvF9hta#TFq+FvnPnM7&8FU>rp9^EL(1%1g zg*8l*Rbi`&f6hAJd;0V%?n#R$bKF++0h^^7JVb9RF6+9q_R14{- zo0(r?w#|CW5~f+mlD>1QId|MR_#+EZl^-|1f7di;)2iAZkDp!He_=EnRV-UIOQ_HQ z^N+Y}5Fwi+stdovHM~w(JOU@+d6Lzuo&aORv3VFXXk!=^QoC4alpFOTLCs{ddNHN(tHBn(M*EVRYzGEhc0ZACPRtDH(FRqA_w-3Jis zxO7k^ypm@K&E!9VOML_d-b>gZu1**d81F^`yDM^BQC-K|jTv_3_T|gBFXPY3msT$g zSQ*`LW2unBn99j|-Res@p)dv1mQb-%F;}vC@GY8f`SypqkDR%5>CEH1-EJ{tqwEJ2`+i|cJ%aQaRihI0UkXio|^W8%SpkZRTc z1q&QM-HZZ7eHaM1jU8o2mgEP;e*`~WQ}CnDgkM!3Cj4$TtTW}|gD;8LQ+*dXbpmE! zf&AGi?%w@!YN(x4N^v7kM3&U4-k0l@MnU9G<#QQEU=hG+&*>x*rC%rM@JhBXOTSt2 zrSFc(sP}C}M(M+3?t4kXY+6=(MkqljFPLJ59a+bue`r0eGS*n;E46l7F~-+k)3tOe zt!e`8yt~W%t5`dWMph)lrO&u?Bb#(t*EZ)z%1Fdm!p+_%sn*7rq@_}6H?^KUGW$~} z(a3N7o-dEWGvrG;Q+~cGwLRzx57O5!mnX*rrRG5{?0h$=6j4UjLXmOFbHvH<|DX$0i2RwoSF9kd!TwV!y4n_D^z)N7@K)}lo!KVXWA^A7O z2~*N({YTqT5j=teQ-Pe(zApznhbQ1C0WX1riGY{ErxSi>9fjmygU6sr+3^A_!YoWv zbeHHnv<)WU5u#NnLj{JQpZLQxZU*LwJ4z#$Xv7Rm!W`Z3Saacp#o6hZC4bw*BYw49 z8S3{BH)rPkqq9pBGm~>PWQu0bw`VQGd7@2G&8C|3OB2iImzu;sMT4lw*)rQ!&?kk2uY_Xa_5n^!E}oxl&imzZrBp7LN%BA^w9hvb zTRNA~f0_GT774|_3QivkjuL(G6jV_|U0t4^9j%nh0j&hI8qium2Ln13(0V`{?ah$> Usn7|lgSmIUeD^gW-Ta^KKdK`9RR910 literal 0 HcmV?d00001 diff --git a/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.woff b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.woff new file mode 100644 index 0000000000000000000000000000000000000000..4c79bee685837eb1b64ad90daef441ecd51cd202 GIT binary patch literal 2376 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 literal 0 HcmV?d00001 diff --git a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot b/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot deleted file mode 100644 index bbac28619de4353c5c270afb1c6ab37c0105a93a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2946 zcmds3O>7&-6@G7LcXqkETyn|f@<%ecA}vy}B$|IBUH!#r6v=gML`Z74E{w>6B8dtl zQIM!KMgzgH+tkg;Kq46_3iOa1nl=a^oeJb)peT?-dq`juDUeIiLxBPY+Jk`r4aB~o zR<_ZmXwIGC@cqrcnfK<~*>}?b_*e%(kU%sE6xL-(a|Z=?VYW*E!bf^B_o%(Kd-wfg z-DB#&60~3)+OPoIutl^5YhMA|-)YkKNWQkPHox)bFJc{%@6$NH z@M_xw8>ax6M|OF6eru!CAy1&cN3yoOdVT5kW%gIHpCR*S&BghbmH9snk?nID^(HCU zCO$*H9Fk8q*V?bK{Z5MH-;mt9+FF=r*JRocJ4v#$HvifN%)-yePX54KpI=-2@VVcn zX(`I8)Yxckwckke7HR!+WWU;tjpBR%?(SQ2q49@c9G%Xm*DjC`06{x9J7W^yJrXtl z@W?&=?sdkXC_(3@IL)pn@yKygx|#r`TG#L%7)1QJ9vqbph9sU;q>@{D#L@yK36^;KVTBEu+M~A5$Xe#jaBkSXzASRqEQ7824R%YPPpgUe63zl>WzBbja!mxF*RSv ztDJgXoy11IkuQ)Cua8t+(iK^u-ca4R+o(5+C@ckFCf?xh&# zj0IGk*={P8iQ8Ji(F?k1It4>9Kf+&X!Jwyxf?=NKpQLj`rBfL_AF$)`s2e$91`2uv zPYHK>2WJy8*GMp~N^(FA$YE9EYCMui-%-OH3GvVr6(Jt(dy0IJxCSz|i$x z?SyK`)Phb^t18nVJ+icmA6j;e-d+%pxiX^C!;3A}}qkcDZ0{;Gw!Y`##fJdJb; zlQ@A#toX0SX>*PK97R&ExG_h~WkXoV4O*H^@7UFmQ<7peYJYIL0~LoNAitHi4JB`u2x)LujRAcaT@}*4FT0`P8^?* z>J3LIsK=a`Q*|4(Tp;Ad<`fJJoOxdAOlp~L7JnA@>Z4j_SJ$X4| zQ8cz?r;yW^l$r$}KKcsu5dx0B2nag7?(-7ecz1oCK^`9XybL;?@_7Zq_+6jpq~8%= zAUQz(ze(eW$8KSA#7ng9PkcRt3-Ak{m%*Xx;AoBl9*+1tCw-F;+JX(ZPUX)^7pZN! zHwUO>dWvYJTLz855b@_}UX#ix4=&P7QB*alXj-KX&$c$MZ>}si+up#!Q(mQ19vSk^ zx0>tT#g+C#b8(fXd}S%N)LL&ZY;Uz&RF?f)P4>d#^7iUH6=&1kimctGo3z2j?zTi_ z=F#QueWl|gOAUsphAY$maTqX73r@E-mlwTCvE+?7MuSXyZxW_;^oE7 zt(DfgS1Of@rBccJ8a|J!1FBe(biV)D#L0__gQ0|sULbni)a~_^>2j&$)3Q%1KCSw+ XCZ41!MbsZC9Dnl6m+uPtWF7Y}!nm3R diff --git a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg b/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg deleted file mode 100644 index 6a8eea52fa..0000000000 --- a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg +++ /dev/null @@ -1,72 +0,0 @@ - - - - - -Created by FontForge 20150401 at Wed Nov 4 19:00:26 2015 - By John Mitchell -Copyright (c) 2015, John Mitchell - - - - - - - - - - - - - diff --git a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf b/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf deleted file mode 100644 index ee6d0e05a70e1d2b2c8df36abf22766740649607..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2760 zcmds3U1%KF6+UO~%$?bp+1Z`lnb{x7yQ5ueSFxn^{%P0MUz|o+IgU+CQoD6Ak%b~@ z6(p_DPa4x8Ox&h!o(zp-S_*w=ANmsl(o-NWhEm8w`;cHt3VA7gC=?9sgCWqM?YXP* z546xe_g-es-@WIabM7~HE+7De;U+M+)M|a>;+xXm=K%T#r0swC)zj5W-@W#C0Q?ro z*B932H~##k+a>uvJ?9tR-1fo7835*!U0$Bw+UR!46X?GnSzBJcv2^6NL^{L7D zd%Pp8cmbD4o(sVw ziNB`zC%qVn>E5FLE-}Klc>05RGb9NQ{UE~-QBD*o2wH`942VLv+x<&KXoH6Q$)YIo z6VKC)Mm|a5X~X{&-@`YY3i=1gaaH2dDpf<&|HpWlil9R20O9oHp(?|J>H$~2m^@?> zv2ehIS`q3)mE%{Fhg8Z3)tX(ii#0oM-~P_h5?(&~jg2+(Mri5Y>!DEvABJI^&`!AL zxk9~BRT|Ak!b@0^YB9A?EU27%L7m2Cp;;)BkZ6q6Jkpg|vC&k$gx72|ODHTw8eX(e z^(5H8zrTO~s5>w-Iq9bv=Zu9^o!MSGolV$U(b0>#X*xwiF+av%YT>Z2M#52^;h$#m zBjr5hUBQKaWxT3X6~pNEq5}Kag$R< zvQ!-%$tb37Do%bm88UReUpt{1GPSUi*D_jO0EbZaxCRqXvS%U%>SOh0qgJIlP|k&X zPUWscLeO1@=W{g5^=j3|SUt#AiPr~BT~SQai^pS`)QMEOe|%s-*X?L7Z$)O`r%bN)_f^vIc*KfEDMQVOJE|I;_0Cj9&=Q>@Q+Nxf zAqOph!J38nT%lO2K8v&q(>R64ta#TF6kKyKPnk5Tp6jUjTm*}SVI;x|D!uc$yvS6= zYrgy5x3B)tyBubT9J5rd6lSTWWQAEW98*Fe<>(6(x|3{bS0FxB;#w6WnrPr zq!bIAGP|;|`l>$rQxj2B&Y5@qX&CL4%14~o8+Z5Lh}zt+xKToGqVdNa9nl~RiW3oU z;v`JK^DqO;(57?1u~-B%NEpiVVxie6s=Q)JC7IAyZ&aED#$s-)(43ZNW2WU=)#HtN zA;%rBDPY?aP|fAV_6e!cbcBMs>$pzMYtnL|i0{rR7#co_TveFwC6TF)o6Xv?#1NCY z7FSSK24}}I=A3(`RCYMyx3k&dYkQ8NIX_3CWDhNFS}#{eJf>B{2bp*#CGnBM}tESBnHgssn*^n$g}@8&gPC zD3-9hOS$Bdw4L}YHIY)=jk;Kb0(YxR})Y3kA26E9ue-M#wac-S>H#IzlW#5wY~ z#^a7-*#-eS(pQjU7G+~wb{aYTNvT=z;p4x+03qP`kAR@V+W{}piFY^P85H0_z{{ZH zseo4?ir)-)PWoN(2a-eN|LgP|^9T+s1-wM-{vhBPT!5biybKQA4vxnw;Nw`pbJDj7 zp&i(O8?Z@#Vu93cIyZ-40iGdRg)&rN3`U4QPvhFKPTWNrxlJS5un4Qv;rY(Sjm?$i z_O?H?@QhzASH?#C^PTp(e{p4dp}n|DLzZavdT-VaY!U6i8Yw&L+Y38e+a2OxA!p05 zL+<7&6nJHEd1rN=m{u@R&`lb#*bA#ff%$Z}`~T7Lv84{96nur=kJ5k^E!gU8E-(7k zQrRE(p9DZceY8>;6~X@x(O#iAHYt&nUUWW1BMK#=65R*5vbedm(pmS*3iJ206r6humAu6 diff --git a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff b/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff deleted file mode 100644 index 566b28175a3e0f0a4e5606787919d7633e47bb2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2016 zcmZuyc~Dc=8@(^V5O$D|ChW2(VpuH5Ru(~siiAawz4$^BWEB($s4NLPB8VU=(Aw&t zq9~S9K|vu1l{K^4{Qot?_4$g5 zn88lahMEu5B)&okaXv(khd#;skgt33VlluTiar(webE451<*Q@=Zl>VXVICkhbi=| z!(s#dDJ2|=P(vZtgwVqtMI6Ip5|W`d54jqII<`)%8Xe1kK8!!)gmqw1iIEt3GVF_R zAlHJ>2A-heFg=C^0L~5SR?u%*>(Z_n7aN}d@0SHVmJq=?Bz5EDQ3lFHQ7~2Z=QpN=wY?V8#J9>xBn5C!T^5Z1ZVZ|JZ+_cFL51V#{O9S)Sgdk!FGt!R zVX0yp0Qgp)WOgx87C<&@hcQ9EwdrfF1dx9O=DybHw(VA2ZW)(5n7h4@%WczeO=lG| z!|5m*in78u2o=Fe;P=GS=;5g6O4q~WNil-6dxVwU?HE~n*1*&h1Ds@J<-hhC;cIsR zObus60^Z}oaw{1>2JF*tJzx8vXcz}2=&Q6#ZQsWt(F27f}WVW3C#XwvFrwSXCU;uWWuWMuqZLGR1qk6)tyexvkQYB1Z;_UW8Uj7M*Zt{J7b-!1Gj zUJ%tV@m=l2>8F#NHl5emX*5rdVtXoUG?@9HPr;$6_7Xlj_o0?k=lR|Xe zDFw@AAp>)A)aImxALjzTJQE$S*lgZzCQB9B6%-7Yi9%{#+7#yOuP!$_nD^+?c=y~s zVU5Y{_mfh6UZ><0RSEKXM=DfSH9U>`=n5eob1l`mk;Ml3tlGnrl96o61lUpRQ*EDL z8hD+f@Tsj{p{VuTZi|S{4yDnq%@fi;Sj>#juFgfT&TFKw@9`>CpU7R^B5xt!6=7$H zZ9j$voxLya?tDYe6$Aj)=0kSkF>|fN4O$=hodSxcrR`yxado7TxAx8(%kz;nH1b}- zgx&ZUdpY&3qMZ{yCHJmkMyP?8`2p7Em4?jSK7*FVjoUUbh#o_cMP=LL17DP!7n;9n zxfvNXlCy~QX=Y*-EN?ov+&Do3g4W8vq-FXed7scokYwx471dV#F=MdfqVOFj z7yntt_xA5DaE26~wsUXashBNzrEmu0^#bft);Fm8+jpo+ugk@`f^eyb(izpAtUI<< zXH#I&&ThH8E8awkfK3uT$e>lZamaf`^ zdODgqWo>5wIjwlNu5GijM~5nUPD*Ez$OkE+=RQ^W*O`Pu{edqjI@_X-23$M9oH|uv z*SvgnF0W*8Dt~XK-(cNM%CUC3Q~{a&M+WUD^?Hp>35AK2>O8d|%|a>STAEr)ZJ+6t zW4}y)h}C}aaDcd%!o9}Yqr=_L`R*G}Sj8X}dD}|m`t|| z1ojHdTEReWaN&9egn~@5BuS6_8{!Tl01oyrW+*d^NoTT{3=@8Df| + viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve"> - - + + l3.5-4.6c1.2-1.4,3.2-2.4,5.3-2.4h17.5c0.5-4.1,0.8-8.3,0.8-12.6c0-55.2-44.8-100-100-100S0.1,44.8,0.1,100c0,5.1,0.4,10.1,1.1,15 + H31.8z"/> diff --git a/awx/ui/client/assets/fontcustom/new_icons/launch.svg b/awx/ui/client/assets/fontcustom/new_icons/launch.svg index 396289cde6..22eec6bab0 100644 --- a/awx/ui/client/assets/fontcustom/new_icons/launch.svg +++ b/awx/ui/client/assets/fontcustom/new_icons/launch.svg @@ -1,28 +1,18 @@ + viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve"> - - - - - - - - - - - - + diff --git a/awx/ui/client/assets/fontcustom/new_icons/user.svg b/awx/ui/client/assets/fontcustom/new_icons/user.svg index 5637e50c0e..7b38db83e6 100644 --- a/awx/ui/client/assets/fontcustom/new_icons/user.svg +++ b/awx/ui/client/assets/fontcustom/new_icons/user.svg @@ -1,11 +1,11 @@ - + viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve"> + diff --git a/awx/ui/client/src/main-menu/main-menu.block.less b/awx/ui/client/src/main-menu/main-menu.block.less index e7363659f8..4c9c12d43b 100644 --- a/awx/ui/client/src/main-menu/main-menu.block.less +++ b/awx/ui/client/src/main-menu/main-menu.block.less @@ -123,18 +123,6 @@ margin-right: -1px; } - // the user item is a little different based on the icon being - // strangely positioned - .MainMenu-item--user { - margin-top: -3px; - padding-left: 25px; - } - - .MainMenu-item--user:hover, - .MainMenu-item--user.is-currentRoute { - padding-left: 26px; - } - .MainMenu-item:hover, .MainMenu-item.is-currentRoute { padding-top: 5px; @@ -151,8 +139,7 @@ .MainMenu-itemImage--user { font-size: 21px; - margin-top: -9px; - margin-right: -9px; + margin-right: -5px; } .MainMenu-itemImage--docs {