From e8926d53d228920e456213b86d254be6d3ae700c Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 18 Apr 2017 16:32:18 -0700
Subject: [PATCH] Use new OpenStack logo on Gerrit sites

This puts the new logo in place for our gerrit deployments. Had to move
the header nav bar slightly to the right to get this to look well
without overlapping significantly. Note that this has been tested
locally using firefox to render the changes.

Change-Id: I1d773e137dd41ac2d7ee9347941d95732dae0932
---
 .../files/gerrit/GerritSite.css               |   4 +-
 .../files/gerrit/GerritSiteHeader.html        |   2 +-
 .../files/openstack-page-bkg.jpg              | Bin 3738 -> 0 bytes
 modules/openstack_project/files/openstack.svg |  57 ++++++++++++++++++
 modules/openstack_project/manifests/gerrit.pp |  10 +--
 5 files changed, 62 insertions(+), 11 deletions(-)
 delete mode 100644 modules/openstack_project/files/openstack-page-bkg.jpg
 create mode 100644 modules/openstack_project/files/openstack.svg

diff --git a/modules/openstack_project/files/gerrit/GerritSite.css b/modules/openstack_project/files/gerrit/GerritSite.css
index b37e594f53..0cf799e4d9 100644
--- a/modules/openstack_project/files/gerrit/GerritSite.css
+++ b/modules/openstack_project/files/gerrit/GerritSite.css
@@ -1,4 +1,4 @@
-body {color: #000 !important; background: url("static/openstack-page-bkg.jpg") no-repeat scroll 0 0 white !important; position: static}
+body {color: #000 !important;}
 a,a:visited {color: #264D69 !important; text-decoration: none;}
 a:hover {color: #000 !important; text-decoration: underline}
 
@@ -7,7 +7,7 @@ a.gwt-InlineHyperlink {background: none !important}
 #gerrit_header {display: block !important; position: relative; top: -60px; margin-bottom: -60px; width: 200px; padding-left: 17px}
 #gerrit_header h1 {font-family: 'PT Sans', sans-serif; font-weight: normal; letter-spacing: -1px}
 
-#gerrit_topmenu {background: none; position:relative; top: 0px; left: 200px; margin-right: 200px}
+#gerrit_topmenu {background: none; position:relative; top: 0px; left: 220px; margin-right: 200px}
 
 #gerrit_topmenu tbody tr td table {border: 0}
 
diff --git a/modules/openstack_project/files/gerrit/GerritSiteHeader.html b/modules/openstack_project/files/gerrit/GerritSiteHeader.html
index d978cef458..a3546044b9 100644
--- a/modules/openstack_project/files/gerrit/GerritSiteHeader.html
+++ b/modules/openstack_project/files/gerrit/GerritSiteHeader.html
@@ -2,5 +2,5 @@
   <script type="text/javascript" src="static/jquery.js" />
   <script type="text/javascript" src="static/jquery-visibility.js"></script>
   <script type="text/javascript" src="static/hideci.js" />
-  <a href="/"><h1 style="color: #CF2F19"><img src="static/title.png" style="vertical-align:middle;" /></h1></a>
+  <a href="/"><h1><img src="static/title.svg" style="vertical-align:middle;" /></h1></a>
 </div>
diff --git a/modules/openstack_project/files/openstack-page-bkg.jpg b/modules/openstack_project/files/openstack-page-bkg.jpg
deleted file mode 100644
index f788c41c26481728fa4329c17c87bde36001adc1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3738
zcmd5-YdDna8vedHnM0NtYi6>>At7O=uyTsZup5R_40A9<awvpN*{N7bPBYF{4qIA<
z(eRBKv`k6LA%|oohl~{^o2*5sw4{=<wa)Ep{n$VDk9~jF^}X+NU+;6j_w!uOcYQ10
zuZ#hBX9p(-0E7WR!0H36%mRd+(f*;w0T4g{0N}bxJp(?o3y3%n2m~~*GT_PxkO;tj
z2Yhu0N36c#2qfYokSOHOK%tbB&`L@u3<itEVAgyJ5DteU5l9RQg;B;~aLOv5twKfR
z=R?0PYkrA7&HFuCX$A;rpah(Rg9HFZ0O161r45J%z~8WH^=E(|jiHn<zw*D)t1AdY
zz>)aXQa}U<N30eA{*pj|tv9t(g}eFbd>(l^=gSg=J*&3mKp$aM0r>UIFDe9Zy(vs}
zWf)kqO2Y_n0$>ZQ0D&hY4tWjpY?<W4-ty|)1?ajJlX~}LY}gffP_$)A^zgayx=^wn
zwfjNeo@c|B;hVG8_>Ii5?V)h*kc0fz?%ZIj3|{;F8E5l%d0)&*Hx~ulvc_*73u8%R
zsVMV~ne!JY);&pWott~QIZYJFTXliYc2};JEU{X7W6;ZPfz;<lY{|)jOHm$2<eGkR
z^cnFhiRDfGE$ge|Zl;)r9<4K-ZagNw^7O7{CqIY(9GZ23=K0Nz3G#GXEAzyN%8D5`
z>)U;U4#mEuK@K*=SC3BR-m&x9(Nna@>b@%FS34|P^jtsXRb5>z9gtPp;_MI2F3o*k
z>csA-?CX4b;~4P-*L$+Mmb|51F)eD*wCc`Jt(9}C${Zo=!Uin=u_yMC^;`X!x$##4
z+~}dkT`NF@Uhw0r+6g_)?e!h8IX+OE^C96>UOsv0GPMD6(kr#ljhXRnA=O>Qj@%iT
zqBF7aQ*}BG)h@6r0%#azk!r9yrN6>9dq~>KadV$~cGG?Hjk>~it^5rd#zS4KE*p+4
z;;B)%oBK8PNTs=A)a-z`n?3zJ%+h<?>{`=>ijk4sYKr*>`eN1H`~Lo|Tm!o6qN{S*
zeNl=NcpGzD55)XnLC|>g)~w={=c#4*x^;mk4Zo_FOFlffP@!?1`c+TogTVR4kp9-q
z`d5cMBzNxk6qjPRK9*WY3uHS=bnm_QJvSMBBS_A#3i=ywsg6^|9rfruW0MhdGwHDO
z?1gJRMQVecKE^gV{%uo(b)zl^Hd&vmnwFh88h*-?FJ;y=Hdqvt!K|s<$>xlzR=G4{
zZgGOCF43IXS?62B)w*N&dXt%U8X^Bjx}^%Yf>VFpFoKSGP%k?ems;&&J)|Dx(qtQD
zu2tS)<_Qz4#LhBKY<yuS+cEiCchA#eKaT2)bj7z?LUDRr>kl@Og}G)^5+F<m`}IIG
zJKpRDQ)*0?RpP^t!N@TDAI%1rB^mWAK;I+Z%~p$wp6sCw*4SD_-X1}?p_Y&{C`p}Y
z%*}Z+d-Xuwa?H!LqN1kz1tUSPR{)}mcbw83r}zL%pQ=*67<iMIPRt}v3#z8Cg@o=q
zpLevHl{}nw`1CqkD6cFD--yiGEpuvci7jPqUF6*O`ry0o=7(`bJ^z}I6&x<Z<Y$YW
zrKKC1^h779{RN^5(*C9B6v9Q($rI2U+K)%975;7kKV9nJAAfhEsG+X)46kQ`6wBiE
z$Q)$;zLe+{;Lt;1_S{gwz*52IJm-7C3mB50%$Yn(9bkkEio}!ztI;cq?dI;Gr-L~q
zqQ@1QG2&MXI<@oHUK=KvoYrKAVH~tZ(TeS7XFB5g?ZhrfuJfQ}iKSzxn|VoonfDPB
z@^)gC+-gDhc$WPxb%K{CywoY&PDE;2*F{XKA!%FWkm_zW9~Sl-U7`Or#sILcyK?A3
zmm(-fU=#gQnXh`*aFnyd8*2ssf=>4P($Fk>)}{uMVv|;Sz2i4$XJ_WTw*;n>3N8<R
zTQ}mnFa4?}?O86TFP!vbF8q7hMvkfFXEHg);E9}{r)w;Oeo9<EtlZYL*DJWn@}0w^
z4i_S>05rnXhbC52SC={E3rXRlrs|I6f;o|Cn%eje59{axu9sivy4oYmg=j|fLt3<3
zFce84aNb8GbK;y>R<cGe4k;nuh{!9xC!9t5N`?m>bBu71YBcYKL3@M3N25yoE%BtG
z^K!`WTQ|fb-Ysa7T)mEw&4_b)PWYgc!)3W)H+neR9o^f|AXdgY1`gN+<W+TEI`5Vo
zBro)W_*r8totfZzVy0YLJdWXK3bS%MV4aubF)gHuBO<V(3pHkxbd;GOLiOuZ5rYX{
z*nT^TPW<m3g})t^7FoY)ZsgM$z6Mlh`FWuIdHcIi<J)CDBY6QOZ|w?S>pvgzbbk`M
z*Ts6${7M`2)9XIPy^MoXTiiP2GTp_OtgWMshnH)M&ZSO0)cet!oWo_0_&hV(0?Qdb
zdo(sw{I#{hI`SWPM`N=U^#+MgN-*rZ#J7Cm7Jj89`5ehd_{z&9->Jc7$F(X4)&|`K
z5r<q}=3Lz@GIo*-*t2xXf;Y-qbIwJFnp`-~(5>Egd;@dhi-IzJnSVpMd!Gf_G-QW+
zjVMrIas1)g%)GJ;(=oaK<z4D02;vgs<?JAV#g8h@Brb0`DZ^+9W&;_c9NE5f1<e-0
z-u2RToDpn*A;aqO<HNMgQl;87uvD$&k9h;%P^o$|`#crn52GeS%DuSHc4lVJ?c?5O
zCzOTg+b*D|_dtC;&!g1Fmr8v!&JOwHQ8T;k8vJ|nF1e>};O^)NYdS1`XR?K_;I7qj
zhii5}x^he{U3M+GF+WpYws#=Pt#S9xB_X5QE7W+_rQdwMhukJnQj}5cnCz_sIJ#r0
zJa5drkRPI$X(4YdpCswJe#5aN4Jjw3V3Nzt&`lcKBI<RcA%4}Dw4>~#;!>jq7j8y#
zvHrFg_#P376A45^hp-KU*P=R;DVdPK*w7D@Gw+`XsSpm^L-VkCooZF61sPAnnjsT#
zND4C{>G#P10F_&txEoE!rX%Iy*L}Kna=Q%fDLJ_rF*LujRITZ)$g!?UYLkCXOoz-S
z_p`Hny*Rh--<k0Cn__+W^c%@D`>l)aYQC&-2dd%;%VKGC1<1DJm_n~`nk4^yS`}&P
zM}5bOypW0hwtvrwnE>}g1Mq+B>09qPp1b$hn6kC_iqF`tX#G-t7D$n}Ky9t}sUqiI
zOe@odQ?JueZ+sg`-zoQ}J4if6vv1c9x{BDme+F<Q-p6t3DI$D0+I)>6z{8esU^Kio
zK_oPy9}@nlGywSOZy9`^<Bg~wS_dVU=AU-tG9q{*9$l-B{4Q8;5l0$CBvHw@!ns>-
zzBg>C9|rgWF{pcCogEV@;d}VHrgeBl=5Dr*th4V!1`Z9Zrz9le1zH<Uvo#LBK%Ebu
zg(j=5-y`?<r;;P@yZuVUMZrT_nDG}2+Wit|{%v*$&wg8}GSti&41gLvrb|$7k~{=%
z`>C#sM3{j#G2R?WMhl6b_yyoEAxX>Zixl$16`+^d$ihNtuIBUafyiCEv#oksNL<4=
z*oDXsc7-(ww^9-b-6_|bITySG1N2C-7p0L4+V@R%j=4@ygc=89bmSNy38$S=ZiDyP
z0SrqrVA;zi8kYBZ2@Mx(2Lx~-*bc@d1#4R($RJv$9ZTfx_t7Kc|HIHnd&@I386P?&
z?d6Vd(48n${cTNFFCoSIUj#O{mmt%M&xCIFmR9Y3f{2UnF4e9@uFZOaYiY|CLdbDa
z%xS9x4SHi7Fr-1?CnDqRK?)n&$TTBW5J?O&o{TnNCnLw*{QmT7{c}flSbp9&xi*zF
z1TdUn&_!$_WxQbMKGkgsl}B%+N5ZV%Hy6_zJ>dejD89yCBMw9(d}z2fWjYH_nV6!F
zqe_rI2H5Pi0^~S6)jjnu%lqZN*eQq6!||a24+edpSH_{C8Ew^g8dw2qdrH!@*E7K*
z)00Bb8uUsai%v6<v|*vuFACg`gQX#e27k8vpL?ZbRkJoLp)uYVPXoq@hm`Od^nN-o
zfTi}?dh`O8PH_fAXb`E>Oa^L@3E02r|EG%EdV>q;=#2Q9Wjv3l?dAur$4bzyOl3M6
z1hf%&o*#2R&xnS1z4&R`Uq%`Ut0_P{BOwt;FuDb<DQ#wG)6t0kD)*xx9PhzHepH|V
j3HW#h_Af8_pOWBR{=EZbP9rU(i~m#I{|~WKD-Zq+k90#3

diff --git a/modules/openstack_project/files/openstack.svg b/modules/openstack_project/files/openstack.svg
new file mode 100644
index 0000000000..a2f42a1055
--- /dev/null
+++ b/modules/openstack_project/files/openstack.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 135 35" enable-background="new 0 0 135 35" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#DA1A32" d="M22.565,5.596H2.76c-1.243,0-2.26,1.017-2.26,2.26v5.326h5.493v-0.87c0-0.675,0.547-1.222,1.222-1.222
+			H18.11c0.675,0,1.222,0.547,1.222,1.222v0.87h5.493V7.857C24.825,6.613,23.808,5.596,22.565,5.596z"/>
+		<path fill="#DA1A32" d="M19.332,22.688c0,0.675-0.547,1.222-1.222,1.222H7.216c-0.675,0-1.222-0.547-1.222-1.222v-0.87H0.5v5.326
+			c0,1.243,1.017,2.26,2.26,2.26h19.805c1.243,0,2.26-1.017,2.26-2.26v-5.326h-5.493V22.688z"/>
+		<rect x="0.5" y="14.753" fill="#DA1A32" width="5.493" height="5.493"/>
+		<rect x="19.332" y="14.753" fill="#DA1A32" width="5.493" height="5.493"/>
+	</g>
+	<path fill="#4E4540" d="M134.5,22.114c0-0.852-0.693-1.545-1.545-1.545c-0.852,0-1.545,0.693-1.545,1.545
+		c0,0.852,0.693,1.545,1.545,1.545C133.807,23.659,134.5,22.966,134.5,22.114z M132.955,23.28c-0.643,0-1.166-0.523-1.166-1.166
+		c0-0.643,0.523-1.166,1.166-1.166c0.643,0,1.166,0.523,1.166,1.166C134.12,22.757,133.597,23.28,132.955,23.28z"/>
+	<path fill="#4E4540" d="M133.534,21.834v-0.009c0-0.149-0.045-0.268-0.128-0.351c-0.095-0.095-0.236-0.145-0.411-0.145h-0.569
+		v1.514h0.313v-0.497h0.197l0.279,0.497h0.359l-0.322-0.562C133.42,22.208,133.534,22.063,133.534,21.834z M133.218,21.843
+		c0,0.136-0.087,0.227-0.247,0.227h-0.231v-0.457h0.225c0.16,0,0.253,0.076,0.253,0.227V21.843z"/>
+	<path fill="#4E4540" d="M41.683,17.605v-0.21c0-3.656-2.398-6.311-5.658-6.311c-3.284,0-5.705,2.701-5.705,6.334v0.209
+		c0,3.656,2.399,6.287,5.659,6.287C39.261,23.915,41.683,21.238,41.683,17.605z M32.95,17.558v-0.14
+		c0-2.306,1.188-4.005,3.027-4.005c1.793,0,3.074,1.723,3.074,4.028v0.14c0,2.305-1.188,4.028-3.027,4.028
+		C34.231,21.61,32.95,19.864,32.95,17.558z"/>
+	<path fill="#4E4540" d="M54.209,17.652v-0.326c0-4.169-2.329-6.241-4.797-6.241c-1.77,0-2.841,1.025-3.609,2.212v-1.98h-2.631
+		v15.858h2.631v-5.379c0.745,1.094,1.816,2.096,3.609,2.096C51.904,23.892,54.209,21.797,54.209,17.652z M45.756,17.605v-0.233
+		c0-2.422,1.351-3.958,2.934-3.958c1.584,0,2.864,1.514,2.864,3.982v0.21c0,2.469-1.257,3.959-2.864,3.959
+		C47.107,21.564,45.756,20.027,45.756,17.605z"/>
+	<path fill="#4E4540" d="M65.611,22.006l-1.374-1.63c-0.815,0.792-1.677,1.304-2.841,1.304c-1.607,0-2.888-1.118-3.12-3.19h7.731
+		c0.023-0.372,0.023-0.745,0.023-0.908c0-3.702-1.77-6.497-5.123-6.497c-3.027,0-5.263,2.655-5.263,6.357v0.186
+		c0,3.866,2.468,6.287,5.635,6.287C63.119,23.915,64.493,23.194,65.611,22.006z M60.907,13.297c1.537,0,2.422,1.42,2.562,3.376
+		h-5.216C58.439,14.578,59.463,13.297,60.907,13.297z"/>
+	<path fill="#4E4540" d="M73.757,11.085c-1.677,0-2.678,0.955-3.377,2.049v-1.816h-2.631v12.342h2.631v-7.475
+		c0-1.7,0.955-2.725,2.329-2.725c1.397,0,2.212,0.955,2.212,2.678v7.522h2.631v-8.267C77.552,12.761,76.132,11.085,73.757,11.085z"
+		/>
+	<path fill="#4E4540" d="M88.159,20.143V20.12c0-1.933-1.444-2.817-3.353-3.679c-1.444-0.652-2.422-1.071-2.422-1.886v-0.047
+		c0-0.675,0.582-1.211,1.56-1.211c0.978,0,2.003,0.466,2.934,1.094l1.118-1.933c-1.164-0.838-2.631-1.327-4.005-1.327
+		c-2.305,0-4.075,1.397-4.075,3.609v0.047c0,2.026,1.537,2.864,3.377,3.656c1.467,0.629,2.422,1.025,2.422,1.91v0.023
+		c0,0.769-0.629,1.351-1.723,1.351s-2.282-0.536-3.4-1.443l-1.234,1.886c1.421,1.187,3.12,1.723,4.587,1.723
+		C86.32,23.892,88.159,22.565,88.159,20.143z"/>
+	<path fill="#4E4540" d="M96.307,23.31v-2.166c-0.442,0.233-0.908,0.349-1.421,0.349c-0.838,0-1.327-0.396-1.327-1.351v-6.567h2.771
+		v-2.259h-2.771v-3.33h-2.631v3.33h-1.351l0.432,2.259h0.918v7.102c0,2.399,1.374,3.167,3.19,3.167
+		C95.003,23.846,95.702,23.636,96.307,23.31z"/>
+	<path fill="#4E4540" d="M106.39,12.435c-0.792-0.815-2.026-1.257-3.633-1.257c-1.653,0-2.888,0.396-4.075,0.978l0.745,2.096
+		c0.815-0.372,1.793-0.745,2.981-0.745c1.677,0,2.655,0.862,2.655,2.515v0.513c-0.838-0.28-1.677-0.489-2.841-0.489
+		c-2.608,0-4.378,1.304-4.378,3.958v0.116c0,2.399,1.723,3.772,3.772,3.772c1.607,0,2.701-0.699,3.423-1.746v1.514h2.585v-7.661
+		C107.624,14.461,107.205,13.25,106.39,12.435z M105.086,19.514c0,1.397-1.164,2.422-2.678,2.399
+		c-1.141-0.023-2.002-0.722-2.002-1.956V19.91c0-1.304,0.885-2.072,2.398-2.072c0.885,0,1.677,0.186,2.282,0.442V19.514z"/>
+	<path fill="#4E4540" d="M118.809,22.053l-1.42-1.746c-0.722,0.722-1.444,1.257-2.515,1.257c-1.793,0-3.05-1.607-3.05-4.005v-0.116
+		c0-2.329,1.257-3.982,2.981-3.982c1.118,0,1.84,0.559,2.492,1.234l1.467-1.933c-1.025-1.025-2.189-1.677-3.959-1.677
+		c-3.237,0-5.635,2.655-5.635,6.334v0.233c0,3.679,2.329,6.264,5.542,6.264C116.597,23.915,117.831,23.147,118.809,22.053z"/>
+	<g>
+		<polygon fill="#4E4540" points="126.863,17.254 125.016,19.239 127.493,23.659 130.544,23.659 		"/>
+		<polygon fill="#4E4540" points="127.307,11.317 123.092,16.743 123.092,6.847 120.461,6.847 120.461,23.659 123.092,23.659 
+			123.092,20.097 130.428,11.317 		"/>
+	</g>
+</g>
+</svg>
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index df5b4d2fb1..91174d864b 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -250,19 +250,13 @@ class openstack_project::gerrit (
     require => Class['::gerrit'],
   }
 
-  file { '/home/gerrit2/review_site/static/title.png':
+  file { '/home/gerrit2/review_site/static/title.svg':
     ensure  => present,
-    source  => 'puppet:///modules/openstack_project/openstack.png',
+    source  => 'puppet:///modules/openstack_project/openstack.svg',
     require => Class['::gerrit'],
     notify => Exec['reload_gerrit_header'],
   }
 
-  file { '/home/gerrit2/review_site/static/openstack-page-bkg.jpg':
-    ensure  => present,
-    source  => 'puppet:///modules/openstack_project/openstack-page-bkg.jpg',
-    require => Class['::gerrit'],
-  }
-
   package { 'libjs-jquery':
     ensure => present,
   }