From 52529c0360d59bcfacb77d0baefff68cd50eb66d Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 19 Apr 2017 11:45:40 -0700
Subject: [PATCH] Use new openstack logo on git.o.o

This switches git.openstack.org over to using the new openstack logo.
Note this cleans up the no longer used openstack background image and
updates the favicon.ico as well.

Change-Id: Ib162a9a03be007edba41c4d184a0482068d0d844
---
 .../openstack_project/files/git/openstack.css |   8 +++++++-
 .../files/status/favicon.ico                  | Bin 1150 -> 15086 bytes
 .../manifests/git_backend.pp                  |  12 +++---------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/openstack_project/files/git/openstack.css b/modules/openstack_project/files/git/openstack.css
index 0f7b64323d..887c65e5ea 100644
--- a/modules/openstack_project/files/git/openstack.css
+++ b/modules/openstack_project/files/git/openstack.css
@@ -1,7 +1,7 @@
 @import url('/cgit-data/cgit.css');
 
 body {
-  background: url("/static/openstack-page-bkg.jpg") no-repeat scroll 0 0 white !important;
+  background: no-repeat scroll 0 0 white !important;
 }
 
 div#cgit {
@@ -97,3 +97,9 @@ div#cgit table.blob .kwa  { color:#000000; font-weight:bold; }
 div#cgit table.blob .kwb  { color:#830000; }
 div#cgit table.blob .kwc  { color:#000000; font-weight:bold; }
 div#cgit table.blob .kwd  { color:#010181; }
+
+/* Make logo larger than default */
+div#cgit table#header td.logo {
+    width: 248px;
+    vertical-align: top;
+}
diff --git a/modules/openstack_project/files/status/favicon.ico b/modules/openstack_project/files/status/favicon.ico
index 14855a4aacae2ae2a9fb507bc959b665de0d054b..4cb53bb442cf9c5f38abc4df4b280b87772af3cd 100644
GIT binary patch
literal 15086
zcmeI3J7^R^9LDF85Sw6vN<f<&qF@m)q_Fb=78cqH!A8q~Nr-4GoK0F^2$tHYjUZTv
zVxyq=D795nMFkNHi>ToG{Vq3gS@(Ifo884-{4%>U|Hn7~otd4P8;xn1K{GXFl(x;C
z-Nx)Q#<bhL=P_g6D{o9G<+DS^EJ<LGWTawF3FLRLU293$-{~FiTEaGAQkW9<Rt#{0
z8ys8yI_P;sI4!&sR)o*Or-}hiaC;%Zb%Z)79Tt{^pMqBtz!lDLKO%e)>cZXfgfrYP
z){wic1Ke-bm_OVb{^j+ZCjRBco<97)#s8P;{7kqmToJD31Z-jRxquHlJ|?AE<9|c8
zxBBNEdER4Nz(*2qTb_mgciBCdC*Lqz_z>`AImV^%znxO{tK_D`eCC;l4*_3sylolW
zXN8*r?=1?HUlS(s<QirRA3a}bIL%^1^344c5$3Omyfj>pDZ=+g+f+Rc2q#luMlyws
zJ+|KX5b%|T6Wr;;wm-zBRqVf6#?OYoZ6q<N+CrA`vx$F9Ec+>H;vYE{HT^e5gKFAO
z?b=VR=MO2GWaUNFXA<Ym$ZS+avha~?t=BK&U-$K6+WB);*Y9chvo>ITT-X{0+dUs~
z>kxlgmiZ@oMekp+H&*2SmA~#)xX&8@Dsc95X!xgF`}<>-=Y13Z^5b9k-%t4sxX!;{
z4~zejP|NcJ%!$R_p5NeX#EMYm^BbHoSwFvF=k&^B4ZzuyNuf69XT0uZ%rX_(WK4%t
zD;1ma=yZ*G-Zu<Pc;2cn?eHu=)_*V!%DX-X?b~O|;~)E$w^QZ+#<7DP)pwaxakl<B
zr_~k?3G3&ybe1dZQo9-#P6+3Ovjqbm_!@_c(w)M6;fL^hgMcr5;`?&XXP)ziG`6TK
zzL}e+kuO39-;9k#*iK^;-;Mw1`19@MyKt{hpd0u7PKrN!AX|i?K7nrBK1!1Rg|P7|
zOP>5M2vKbj|NJI-Mpz7hJdV0LUDyz!?9VtE&q29Y=SxbNZ~H;sepeUR5Tfias*E-o
z^?v4a@IN18AK!7~&s+}v=VJUPwg1My;|oyilj2`?`=bv;^^d~)pJRBP)m8UW$6xu6
z>;D_^{fYBm_V>5!`A5`uA+P+T@i#9&QFf}}zwGq~YarG_Q86ki->$z(U4Jrws_vz&
zzu7P7baxOUhH}p{Es3n{D|p@o{o^?dlvz2-wHXm%w7Y*H5zk|vf^CVmu)a^B|7#Y!
z6r<z91L3LgBqfkV2i><qzikO!_7D5jN7t{<{=*yLmGC+M@+d>b`a}1FuqrSnKNPkL
zn}yK;$fFDyWYIzQuy9m3CUBNcyGG#`Wjz^W(LtAQ(Ierpa9$V)*Y39Gfu0Pq=%D*i
zu=TmC`@tCfL6sw8<<WK3hl2}$*Z8@<KiBr-*SB#^o1*L5f1LVnC(v3)wfW2NGNH|1
N?g97Yaqqv-{R6OSI`04g

literal 1150
zcmb`GOH30%7{~v>?#|A3sasIu#Yntpj90y=k;IFMXAd4sJQ|}ZioM{)XnbCLa8MC~
ziFiSvLNN*mX`$^FgoQ0aNCkO`AYjxphx*MlTQJdhVK%@0b{@ZZ?F>*rk7a@0<v6DR
zWdQaOR754Yati-S1=(yC6%{aHUOg|_Hh2ftU=Sq(r?5SF47&yoqQuz`E3sR$)7b$;
z4AKgyQ|ZGvSr7g3nuOW&&=NTqMV6d_o|=YkXCyo|3Bw+TWjBytq$@ZIe&IV<?MjY;
zIp}esZw@Rz3q3JQeF!M;LH!!GLw>o>hZEoz*T8Q4km%39L2q3IBR1j}@V12<;RT2}
z`clJN;M4k12wwRWTFs(F?VJSf4#R4{gh1pT{Ot`y2YAhrgjN5fbuPo-_)hG-0L7O-
zQyI;RP@FXQ=v}YQi!iUa5_WSHit9oh?akL2!4+tAwCBWMd^9x`!5<ouNT0?~hkNoq
zucW<yuq06;8JNA-y*d#A@_nIk3A?p|LNWeGm)8b7NdNB%t$|SDDez>-tIPXlXaWLO
z^$YCwD)_VaUK^N|Q#AKa62<MKwRM4|A3<}kfsX~DI%i-!bS12I3d(Rlw2{WVFX#Vs
z8jKMBe;Fk|9o{nEs9pwpL1#|TnE~sbgx32JES9Fb;6P1%fI4JL6dGF{i-C<b=f^i+
z_P`g;Ncih1@YWgd@I0MgI=3xL&^Oae`Bw`F)EyQ+rQ99d+g1z#TFX$@vIl{V11OCg
wLh0M%2)sEBtD{QdZ@Z5`{So1=lOClGHWQ<KY<7cw`i`FcvrUw4es&%B4Xe<zIRF3v

diff --git a/modules/openstack_project/manifests/git_backend.pp b/modules/openstack_project/manifests/git_backend.pp
index d1065f3872..8b6570714a 100644
--- a/modules/openstack_project/manifests/git_backend.pp
+++ b/modules/openstack_project/manifests/git_backend.pp
@@ -57,7 +57,7 @@ class openstack_project::git_backend (
         'commit-filter'  => '/usr/local/bin/commit-filter.sh',
         'css'            => '/static/openstack.css',
         'favicon'        => '/static/favicon.ico',
-        'logo'           => '/static/openstack.png',
+        'logo'           => '/static/openstack.svg',
         'root-title'     => 'OpenStack git repository browser',
         'max-repo-count' => 2500,
     },
@@ -131,9 +131,9 @@ class openstack_project::git_backend (
     require     => User['cgit'],
   }
 
-  file { '/var/www/cgit/static/openstack.png':
+  file { '/var/www/cgit/static/openstack.svg':
     ensure  => present,
-    source  => 'puppet:///modules/openstack_project/openstack.png',
+    source  => 'puppet:///modules/openstack_project/openstack.svg',
     require => File['/var/www/cgit/static'],
   }
 
@@ -143,12 +143,6 @@ class openstack_project::git_backend (
     require => File['/var/www/cgit/static'],
   }
 
-  file { '/var/www/cgit/static/openstack-page-bkg.jpg':
-    ensure  => present,
-    source  => 'puppet:///modules/openstack_project/openstack-page-bkg.jpg',
-    require => File['/var/www/cgit/static'],
-  }
-
   file { '/var/www/cgit/static/openstack.css':
     ensure  => present,
     source  => 'puppet:///modules/openstack_project/git/openstack.css',