From 3c37068a3dbdb7c4ffa9a73c5f8e92252f8f7082 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika.henke@digital.cabinet-office.gov.uk>
Date: Wed, 10 Aug 2016 14:31:27 +0100
Subject: [PATCH] Change logo dimensions to be divisible by 2

The logo was 71x62 and resized to be 35x31.
As the ratio is slightly off because 71 is not divisible by 2
(there are no half pixels), this changes the logo to be 72x64.

This also simplifies the CSS (removing unnecessary floats and spacing)
and fixes vertical alignment of the logo in print.
---
 .../gov.uk_logotype_crown_invert_trans.png    | Bin 2008 -> 1049 bytes
 source/assets/stylesheets/_core-print.scss    |   9 +++++----
 source/assets/stylesheets/_header.scss        |  18 ++++--------------
 .../images/gov.uk_logotype_crown.png          | Bin 780 -> 1049 bytes
 source/views/layouts/govuk_template.html.erb  |   2 +-
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/source/assets/images/gov.uk_logotype_crown_invert_trans.png b/source/assets/images/gov.uk_logotype_crown_invert_trans.png
index 152b83eab6d477547744425fbf4f5f71738b9a45..82600e6595930c85f677ce3b8186550cbaa9b994 100644
GIT binary patch
literal 1049
zcmV+!1m^pRP)<h;3K|Lk000e1NJLTq002k;002M;0{{R3j$pwU0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUyGf+%aMSp*PzrVjgKtS*B?+_3WpP!%K
z-`_AWFd!fxU|?Xcudh&0P;hW?&(F_~kB<NV0RR90H-L+?0000HbW%=J|NsC0|NsC0
z|NsC0|NsC0041%NVgLXGUr9tkRCwC#SIL&*FbtF}?@r?U|JRP>-60G#^liq6ek7Pu
zNh&Q3=Pw=jhk=a9$9xT>Q$G4@AS^)meT*dI#9s*Z@s?*VfOd{H1DX2pDUeh?oHiwU
z2Cw8dKtx8RdcFlp9|4j4-UE7&=mLb1?z?>jlH{9`E70y(68IFzXUhsFASX`xkvoN(
zfUv~PKLe^F&Z5E0-P6aNUlB{~v*$R<W|8|0B<lC{PP5G|zunUEQ4u!Oi{b&O*f*V#
zm@1XSLB0(lqBAm`V+9JTcr06tV!3F~>RI-Um09Yp#z>Z^s?dN;^9cE>+DF=(XT`T6
zgPoBqHXls|s*j58ADQXI$d!+7X2h{Ln4{`J%|Mg=HSD^3R`T``;z_C(MoVAZ#&^Z)
zcI_w^MrJ(DwUTRK0qSpi&es?f)%d@)>}RdbS7og_x^3B&y~3wM2H$J7q2Po!T5YgN
zZO^BK@lyKdV+}WzY+#_!B~vNbm!k*mAXvl|2*|C$M3-J6Q2{tyli>&`t;yFfn`#!Y
zUImcw0Z6_aV|wnp4Tu=oRrqNctU>nE!xHCu60ItsRPvBxFVQ)cOE%n6n7KVu#~_c)
zCZm3G?M{#vQ##7cbU~utW((Ck4(_5pHj>SQP2*^_s3VuU&Z;w0jG}1a<ZB^LF)DX8
zH-wn6pj82!@#uNbd#*j1h&1vzLJC06lo7k`IX+@B6I!jY4Q)zFjUei-e9P}8$ohwQ
zvQ1tpN{!28bmL#z3`G=to>M+eX@ayI=#94oiRPfEE6R-OheAS+_LDQ0ffO@P6=?dp
zTz1V(n3L{12P<OA8de9pqt8QSy{9N_=jUf3K$pEz)U_c=ZObs$oO+&3kd2aVMSjVH
z-D;T*>ex#4a)Pcyg<6SSW(`&y3C3Z=teRbkrXyCTG(u^*>MpY%SV<^OQ-($Bqt)#^
zU|KgW<HelRW4BT4Fl{2OZntHkz-7WfTPcd_@w$z~GOSzVVcCvTI%eGJ4wrj;SZhLW
z@iiGBkOuRp{)3;vjTI}e9^r96%2Khgx%9?y8`yO^!)5RL;qf;>`V*jV1B9Od;oS}?
ze~u$>m(iuxx!rrX9Gbb(Ui!fekl>#KgmwA9J3<5iDVLq=U;cOfKhW<1{SjaQ3ts@X
TO%S(g00000NkvXXu0mjfgJAlf

literal 2008
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

diff --git a/source/assets/stylesheets/_core-print.scss b/source/assets/stylesheets/_core-print.scss
index be357a4b..19a3f1bb 100644
--- a/source/assets/stylesheets/_core-print.scss
+++ b/source/assets/stylesheets/_core-print.scss
@@ -37,17 +37,18 @@ img { max-width: 100% !important; }
 select { background: white; }
 
 #global-header {
-  margin-bottom: 1em;
+  margin: 3px 0 1em; // 3px addtional space at top for countering -3px re-poositioning of #logo img
 
   #logo {
     @include bold-80;
     text-rendering: optimizeLegibility;
 
     img {
-      width: 46px;
+      width: 45px;
       height: 40px;
-      margin-right: 6px;
-      float: left;
+      position: relative;
+      top: -3px; // aligns bottom of img with bottom of "G"
+      vertical-align: bottom;
     }
   }
 
diff --git a/source/assets/stylesheets/_header.scss b/source/assets/stylesheets/_header.scss
index 4210020e..0acd2886 100644
--- a/source/assets/stylesheets/_header.scss
+++ b/source/assets/stylesheets/_header.scss
@@ -40,7 +40,7 @@
         }
       }
       .header-logo {
-        margin: 5px 0 2px;
+        margin-top: 2px;
       }
     }
   }
@@ -71,11 +71,7 @@
 
   #logo {
     float: left;
-    position: relative;
-    top: -1px;
-
     overflow: visible;
-    vertical-align: baseline;
 
     color: $white;
     font-weight: bold;
@@ -83,24 +79,18 @@
     line-height: 1;
     text-decoration: none;
     text-rendering: optimizeLegibility;
-    margin-bottom: -3px;
-    padding-top: 2px;
     border-bottom: 1px solid transparent;
 
     background: image-url('images/gov.uk_logotype_crown.png') no-repeat;
-    background-size: 35px 31px;
+    background-size: 36px 32px;
     background-position: 0 0;
     @include ie-lte(8) {
       background-image: image-url('images/gov.uk_logotype_crown-1x.png');
     }
 
     img {
-      position: relative;
-      top: -2px;
-
-      margin-right: 6px;
-
-      float: left;
+      margin: 2px 1px 0 0; // top margin aligns bottom of img with bottom of "G"
+      vertical-align: bottom;
       visibility: hidden;
     }
 
diff --git a/source/assets/stylesheets/images/gov.uk_logotype_crown.png b/source/assets/stylesheets/images/gov.uk_logotype_crown.png
index 1393390f85b0046f7b788e4f9e90d1876164db6c..6a7651541e11cb0e836468aed25b5e493065c73c 100644
GIT binary patch
literal 1049
zcmV+!1m^pRP)<h;3K|Lk000e1NJLTq002k;002M;0{{R3j$pwU0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUyGf+%aMSy^SKtMphzrPR=5by8rU|?V%
zARy1r&)?tQpP!$vudh&0P>+v~FfcH1aB%<s{{R30+NBWC0000HbW%=J|NsC0|NsC0
z|NsC0|NsC0041%NVgLXGUr9tkRCwC#SIL&*FbtIUEs690UptcJHH3kNzRmd1j|5XH
zNu{OX{G|i`Fpw4H*sp<1F2{Tgq!>tjA0tUP@fU)9yye*opq-*kK(;=73M6$%r_0%$
zDQNi(5R%cko^OHjM?fgQ_kbQGx&Wz&_x-*CN%T$26=?S)3H1~x6w6voKwg~qBYz4%
z0V$4Kcm`BOTtuS^_kbUFdW9@aD4wfPHjCV6AW^@^cZO_k<?WW2j~cO|UK9^NY~OZ9
zVyaXM2l_UMh|b7%juj|r_E@$UMZW0H>RIuPl*x5hV<b7MIyE5MJW_O3?<4KaGxlxB
zU?(J}nvb>u)kjVCkHU0f<oTnY8Br__;;4I23(#bL4ZG={ao!$6JW2J!Xz7dF_>Qe^
z*N$>wWXI!NE2Rb&p#HY!e2o#SCj6~sKWlBFDr?ozZOg9gwR$>a)O)QqF;04;)h3tq
z_Iyg%AZ2(y*3_o6O9Yg<WGV&sa`Y%S2(q{m0{JzV%I8-|SO8wF$?yo2*W{a*O|=Nv
ztOCgD0Z6_aV`lEV4G0;zRrq-stV#CM!xHCu60ItMD|yJVm*^bJB^!Pz%+j8*W1vTN
zlhHi6b|=V-DHG*pyC9X>W((E48r(&FY$Tfpn^B|HDif*HO;MelViZLSCtXW%iV@#6
z)DU99f>s4^#-r!K?4|Z(M$(GLk-`9!Oj)s;p5r63nbc~HY#7TawF0So{+8ZLko6Do
zB%8EUaE;4sP2<mP1|tfg%&Cy4G(lbt^v26U!Z{f5ingQrfk~LreoE#FkR}GY0!?4@
zW#8O{Iq9Kua3bcSVSSK0<~(%Kdyc|&eqj~@blGc-T^q7Aj)$?K)YEK&Via{N%1avT
z&d7XV$JV-+6LcMFWwh93(O}h)ARIDGs@b(@IwEySE40C@{xbW4l%&LId04bQTHP)K
zrgdW;FZRS9yNzOpX%lI6yDbw1E)xdYO2MjE*KH*7ux^ouWjoIKm~pE+RPOO%tx3Jb
z*JOZDIG9KEAM^}<tXO6BNRRtbk&1)O=Qobuz^&66E_>e(Pq+axp8%yBAoU55y4xY;
z&vE4KGP=|{wfg{<gELpUOFy^)67+L`v@ZX5M~DO<<+5}A%m1$b2l_prKLQK@{1yPV
T|Lmf^00000NkvXXu0mjf@1ONw

literal 780
zcmV+n1M~ceP)<h;3K|Lk000e1NJLTq002h-002G+0{{R3PDA!20000OP)t-s|NsB$
z>g#!VdZVMG#l^)%MMfVVAPNc#R0}1300087Nkl<Zc-rlk>rU)2420v`<o)0Hkl4+n
zw5!!pbbet8=mzKW_>vS_{~h~poHorKb8K?-F-Io{k2x3^e^#HV!YeKOoD*V!kr<%f
z9&koZQeTfaw9hyZc*CLJYYs+D4JVGwwKFH?+G~#2?2;oo>m1=bN9ae+HH{P=U*Cqd
ziXGlNB0xWR#nIwKCMYp;<rW<}lzvwZRI%$Z2Gm4TM(nyngPioWE$=0aH9O$VJIZgD
z-55xF$m~}xWDa00{NOCVToELPfvUXJv(;?5*_t10vfCbLnXLtHYd5$njk1%&KqrtR
zl@&A75$&{ZdLYL~8Uo9eVl(TD?BrCSvkOP}BK9hqbBKG&UgvuovZ)6T?)mC4#g*Z^
zpQ>{0?81_?QqHD3nJ+9>)7YYRR5DnQS0GA|^5DocaF|lg+qb9Fn<L!%xgmJ_+S9!Z
zM$UX(N`vAUFQuQh<};6Y<Ke&KgsgccnjBs^bs6F4CCDK+<&r}z@(SdADB3|c<%HR)
zUcu=Abg@Y(J=p=n5)hSC)P&f~fSIH`)fvS~Pi;lhqmH6(G1ooDJ^@skjID0E;+RjU
zpYG?-88ytRw8&b~e4Sd)Y^244w&Qj%X_C@7m=_MmKrrRn$eEnl9?MbW;Mj22nsRT8
zq#QhQYQK%2lD{+^tE1AD(EwXyNEx4`cpE1*iga`I(uz9z(Xzs02Qs97Ek-m^p4i6e
z0&Ko^u!2}r6OdglPoKl2S|Z6wZ|7@3uE)EKQF64fI9$`^$y3RB=ATH;N9*L!U%At3
zr0r-A>iqCjIQbhVayQmaad&AncW2WhiPFj8o9c738;<>e6E~dr0S7l6e2(#c<?s;F
z#CN+EP;WV!T`|>&z{|IAsH$b_;+BJm{(&L%xBfr<<NR@ciSrM9O;kJss_=9G0000<
KMNUMnLSTaV*ncAc

diff --git a/source/views/layouts/govuk_template.html.erb b/source/views/layouts/govuk_template.html.erb
index 728a8d4f..35ea632e 100644
--- a/source/views/layouts/govuk_template.html.erb
+++ b/source/views/layouts/govuk_template.html.erb
@@ -54,7 +54,7 @@
         <div class="header-global">
           <div class="header-logo">
             <a href="<%= content_for?(:homepage_url) ? yield(:homepage_url) : "https://www.gov.uk/" %>" title="<%= content_for?(:logo_link_title) ? yield(:logo_link_title) : "Go to the GOV.UK homepage" %>" id="logo" class="content">
-              <img src="<%= asset_path 'gov.uk_logotype_crown_invert_trans.png' %>" width="35" height="31" alt=""> <%= content_for?(:global_header_text) ? yield(:global_header_text) : "GOV.UK" %>
+              <img src="<%= asset_path 'gov.uk_logotype_crown_invert_trans.png' %>" width="36" height="32" alt=""> <%= content_for?(:global_header_text) ? yield(:global_header_text) : "GOV.UK" %>
             </a>
           </div>
           <%= yield :inside_header %>