From dbd0f464353300ab2910475415c8e66e04bf3b5d Mon Sep 17 00:00:00 2001 From: chris Houseknecht Date: Wed, 22 Jan 2014 18:19:25 -0500 Subject: [PATCH] AC-939 applied new branding. The Tower is erect\! --- awx/ui/static/img/favicon.ico | Bin 1150 -> 1150 bytes awx/ui/static/img/tower_console_bug.png | Bin 0 -> 2079 bytes awx/ui/static/img/tower_console_logo.png | Bin 0 -> 3121 bytes awx/ui/static/img/tower_login_logo.png | Bin 0 -> 3245 bytes awx/ui/static/less/ansible-ui.less | 27 ++++++++++++++--------- awx/ui/templates/ui/index.html | 8 +++---- 6 files changed, 21 insertions(+), 14 deletions(-) create mode 100644 awx/ui/static/img/tower_console_bug.png create mode 100644 awx/ui/static/img/tower_console_logo.png create mode 100644 awx/ui/static/img/tower_login_logo.png diff --git a/awx/ui/static/img/favicon.ico b/awx/ui/static/img/favicon.ico index 05c66adf0e338b89070dcb8927f7726dc929b467..e0ddbb3caca192249b096f98f22de921ed69bf72 100644 GIT binary patch literal 1150 zcmZuvEsw%L5FK)rBvf6Hm6u>h5QvKY1rmM$l1pmv2+ko$P5=oKi6FT@fZ#l$f}en> zYcD|{xMXhMlGiMI-DY;TGw;pE&WJS37lvZ?NZtdHR}pzLVpK-+(3?ZV*!-oc;!05z zt@V1H4hDm-Znv93aEA^y7wg}b%VipdVPRruoxlc+&%^&@GWo3I__}7Zsld8E;1jsZ z<)Ww4sWx`I-PYsrsCk}SJM%zI%y~MU8n>#wUhl~V{^1+za5z{SID9MSh#2?#T{oLe z#UG7Edb`~$7u#?+tZaN|@^S8VJH1}7YW(YBv9P=>%WUq*Aqaws&mOt_IF2oc`EIvc zMPA5ZHk(ykaM)j$kNf$2wsoXwYVkNx7yP(b&W5YQeLNo99HJ<)c=+4z_fK5lI9EO& zJub^q=kvL;o+L^B@i~+1pX+C}TG?JBF5j8! z#jK#0sK@2{^GhG_>DGex>-YN=7dAgGxjZ?OoDKGfZ$%u>-$dl6CG!39kdKB4#9!1C H2M)M@Kn?@K literal 1150 zcmbW1TW{NB9EUxLtF~&>HiyP>4z-)4P3)YHPMid%%c+@GP{o)gb+Cc7(GCz?0TN6? zTp|Yj3Q(loLM7VE-oPX-fGZ@f(LTn*`#Nl_XjilK`0wBE)niMqEGx<-ar%6UxF(c4 zFDXh;QIt)As6;dC#ZY=;ZFPQz%M?d2@&6Ec zBKmPvV_1nWs;Fc)RKn`)8PeAhNv_&4{`}m}@1F&p%OCfHNdEdF$Qv(*Sq(*z?&9Ji z$@CU>F~z&nIQMoE+?%dn;81i2lQ?%rQ4Yr%ty~N(n($odTb6~DFOaq>WD0f6Vgs|( z^vH_5nX8h_meA8VqDF@GjTDBid;ZeW62)SXYNbrGR>p2rY1?%ift;;I&FgFB0;PgQ z-pa7GnI@S`dcM!+BVVeq=bHTVL5LsTU*pGTkohU^t#S5Yh#PK#xUq?JS5{UiSDWl@ z7kGH6ar{n{w?hto4WiYwQX!?qnyYxlw_D3|G zK9z=pRjLcWh-qe#ZXgh#VLQA!sBv^l=j&S=d~-X=(OW5wZl^>}^59K_uWssmxu4*{ zevI8tn$(u%xxrwNYSUqVQsCE5R{8m(fWZGhME7xkUj)B>>gVl|j*&KzuB6$tal0+{ zhIL+>*t|Y%bN!0Lbuq7ryfmP8^EG)+TQ)u+h(q?7A% TO*-f2=kEPWv;V-0T&4RDL}IQa diff --git a/awx/ui/static/img/tower_console_bug.png b/awx/ui/static/img/tower_console_bug.png new file mode 100644 index 0000000000000000000000000000000000000000..90737558ae161af808558e02e238942eac197219 GIT binary patch literal 2079 zcmaJ?X;f3!77j>>B11uOK=56IC@N%v011RC36e;Fk{}4;G9(uWWW2db2-XGxEBg9G z1_4o|2%>bbLIoj=50qJk*w?3MD~O=LdMrT&rAlwC*!QFKu66G@`>gN#_C9-mYu$|C zz}+TBRz@fk%7p1p4?$Kp-Mi8d`Cd8hz8P6I!i;d3BaML*c@T*55lEv!fGOt1f*~MJ zkR7$G+t4rd2Y_);;Jr^8^CVj03lp**~lG9Etxgn?)ig~X~LH4?190qs~ zffJ~hKZ*)x2Lm)I1Og;1-jR=Y!2>P?EWydy)z#GjAmRyl9G-|H5FH7w6el7Dj|VsmVK0!C_c0aX&6q)li>(hyzWX%KsNjDp}LW4jaEQPpIsc5N-!EsVps)&=y02+q` zuz7r;L>Iruv)L4;L;>?8e2__}Vh{zaP$;1IkbUVsZbTPXl9LaCz;N;<`?}B=L_ZSV znc>WE#V>K`QvM+^D1n!_f%sXnatDxE(@l-OBouj6xY?GwD8D<^8F1d;Gbd zZD{WcSTRT^-nTz#8$thU%fB?D?3g`eLTz;cJJO^k#c1G858J2kGWd;gWc-BR5DBwm zRr;`h*6Fqm3nTZ%=l?89uAg3bD9`e|+0#1tU_tZiV)FUj2V-Nuv;kLF+DdkB#^-#o zW~ITAhW-mR9LK@-9&LB;rlV1NOf}x`R#*b)tK+y;N1bPEv8J{w1jqleMqhQsUXRR8 zYufr+KBV8#g);6Kw?6z^zg~Kc%E0 zKPhN~Oif11=B^N#UBvadcSnRfPNfG0zkQ)D;HGY~VXZH74$94mYt-B+V+qWit{SrI zcgOS&uxy?hRfMP6rE|X3yOkkmuq$23v`RYLubNW*kUdjTvG(WcnzE))&Vij**Pl|U z1;3;kZ0hcQ6`3iW6e)%BX{V9O>))QYAo7gt{T`Zkjar-?5kX)s`#FEIZ@OXn{?jaz zspGlm$har_zB@DKJO_y4K?a9-*LboJT^m(aXHmNS*ZI*2&$~}&D#!M-a61)VXw)+! zP1Y9hT1(;6m?Jwk%ALHk=2OQMU{|TO9BTQw@5VWqpFmiwI9i*{{JJaO*$VEw3HQ49haJ z?$jGHuFH-vMf=xMQ|V46@MyLPud^7P))sGv8y*8uN|&TD2Tf>L?1qaK^-=#ljxEkB z5ZGo6k6rBPn|h|s`kCgPwjHF z@_1XkqiFWciP2j!ER*q!nje63O=`1~;lX3Pb8`^%1wtDu=Cr4x5G^1_FbwTZ-iN-whzSD06nLWaN zMb$r}$)oOj=X3X$ALc~0Csumq&kQzNHV^JCTFKf7jmU|D4Vv?J80g-0pZQ8&`qFcp*0spCbNLo0npQk^Sog^3+R9py* zDhXT{UC!yclDS}L59pzTy{h4_R$n6*v7RT?@O;%FQ!dtUrE71Z_k|6NBhg#Rf5Gfs u-7oO~6g)^$* literal 0 HcmV?d00001 diff --git a/awx/ui/static/img/tower_console_logo.png b/awx/ui/static/img/tower_console_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..c93291a1c9a0183cba043cab05500132732a36dc GIT binary patch literal 3121 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 literal 0 HcmV?d00001 diff --git a/awx/ui/static/img/tower_login_logo.png b/awx/ui/static/img/tower_login_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..d8bfb6be33aa56707c1133678a161c062138e3f5 GIT binary patch literal 3245 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 QAAb-yD|^dAbMM&y0HiLf5C8xG literal 0 HcmV?d00001 diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less index ac7b727f5b..94c927e95a 100644 --- a/awx/ui/static/less/ansible-ui.less +++ b/awx/ui/static/less/ansible-ui.less @@ -320,8 +320,8 @@ dd { } /* footer variables */ -@footer-height: 85px; -@footer-margin: 60px; +@footer-height: 96px; +@footer-margin: 40px; @push-height: (@footer-height + @footer-margin); @push-margin: 0px; #wrap { @@ -341,7 +341,7 @@ dd { } .main-menu .nav { - margin-top: 10px; + margin-top: 0; } .main-menu .nav > li > a { @@ -367,7 +367,8 @@ dd { } .navbar>.container .navbar-brand { - margin-left: -10px; + margin-left: 0; + margin-top: 10px; } /* Using inline-block rather than block keeps @@ -396,8 +397,8 @@ dd { .site-footer { width: 100%; - padding-top: 20px; - padding-bottom: 20px; + padding-top: 10px; + padding-bottom: 10px; margin-top: 60px; color: @grey; text-align: center; @@ -414,7 +415,7 @@ dd { } .help { - padding-top: 15px; + padding-top: 18px; font-weight: normal; } @@ -427,19 +428,25 @@ dd { } .copyright { - padding-top: 15px; + padding-top: 18px; font-weight: normal; text-align: center; } } -.login-header { +.modal-header.login-header { text-align: center; + background-color: @black; + border-left: 1px solid #686868; + border-right: 1px solid #686868; + border-top: 1px solid #686868; + border-top-left-radius: 6px; + border-top-right-radius: 6px; } .login-header img { - max-width: 100px; + width: 327px; } .form-title { diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html index e096556f5b..51e5e3cc18 100644 --- a/awx/ui/templates/ui/index.html +++ b/awx/ui/templates/ui/index.html @@ -138,7 +138,7 @@