From 84b6dd0a3b5a0b6674feea7c1106a291f613af0e Mon Sep 17 00:00:00 2001
From: tombye <tombaromba@gmail.com>
Date: Fri, 28 Jun 2013 13:22:50 +0100
Subject: [PATCH] Reformat OGL section & right-align copyright

---
 app/assets/images/open-government-licence.png | Bin 0 -> 1222 bytes
 app/assets/stylesheets/_footer.scss           |  35 +++++++++++-------
 app/views/root/_footer_meta.html.erb          |   2 +-
 3 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 app/assets/images/open-government-licence.png

diff --git a/app/assets/images/open-government-licence.png b/app/assets/images/open-government-licence.png
new file mode 100644
index 0000000000000000000000000000000000000000..eeb5243a2b2d101786bd467d29f115ced6e497ba
GIT binary patch
literal 1222
zcmV;%1UdVOP)<h;3K|Lk000e1NJLTq001cf000pP1^@s6KuLu*00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3A;B92=Ls!-fC=1XD>w
zK~zY`b(Tx0RaG3uf8W0MYDuB=&`PMlD8j6p_CN^2=xokD%gAXB3LNDmBx=;CLC~;>
z3Iqq55Ya5!XP@?okmx~WnIJu&B#Nxm>S|eo^n4BW+K+oYZ8)6$_`lZo|Nh@v0!Xs}
zKw0F(=cj@DjjtD)0RIB-1Fw`t{#j)+pe%-@{XjX2e*Lfu@gQ)cje$h+A<(O3k-rJh
z>j%cIee0VIb^sg8V)!gmm(na?U|i&+S=b5Qi@~*lraa7H!yV(%a8f5pv%$T<K>!;h
z;TS}!-?0R`sVwpnH83?Oy=?F<uubTNvdDK&7n#r&xEI)4Rfds}1k_aukPWv>I-h3Y
zqN>2K3v@8rSaDT?)?c#C8t|`a7H+M(mS$mlngt8C#XJ*cTuE8v^!kHGz&q&xSV7Ue
zn8aIEv25&<X%;qsU&gVy5OJe+HrT>(sj|(Hv>z^ud7f)LZEVk~k@>2n+UF)v)8@a8
z4+xzC?gO?06HMZ2*_X)vw&8<f0!xV3g}wncgSLYwRNS7E*i#ny?~yuZr51?`s8tu4
zX5py{f|$jC^iEmiy{=)Jg+<^nk}rrQ1j6RK@hHEc`>B_OH9~(NpRn0F9u1E*eC#r5
zHi%WbZ8BFj6@jGFWs&#liI2plEb=c5k7Cqz(2CTUV3;m2%>v^hUou=#7Q=Pp(ePMT
zMOfas4*#c+l-N+ut&JpJoDMWDhNM|gS>*eB{lUJ5wG{_r2A9hU><56P*B=P@t(S$Q
zmIooqBA+Z5jXLCPPOf(|jR5>G8}yphoz+@(s}jWV<w-4Bb1`Z{JB5maIGN(h|F;|b
z<J7xbx&q%ORnqH+RgoC(py^8Nwb=C=kA^n>KyX_2lI$gkC8WO)A9ae3ll}j^Oh8}N
zx@&{&$2&UK<<>;vnW#W&xLF}H4=ncjVQpvEVmun&g*XFR09FDk1q;B6Wla(7RLm}t
z1F_AH+Uqn6ry>XG6#NA6q$Lwej6rKjJTLKcnuTk+oVNX##R4!_x7|2dhGbjmxmiUj
zuG-7kWG0|Q;*jlAk~RZtfr)V<EADju$8fP~4Ux`c<`750--9***BMV_5>)wtkB*Ds
zrd~gMEO94P0fDm;XR6r}h6Ta?dgAVOJ7h>C@qUY>6u7cM-l{@~FU!$zRW;v@ckQ<k
zG{9V2Z<dV$cgCa@Z`EH`fvz%IXILk=+^{;Sgmw6d@B_`hQDv2F*-pSB5>{1)<7JU=
zjN!Ma+XWiFCXRlt>ua{!xOKWCK-J`^{n03AQt@p-Sq$H@y-DayYtT7hRIajlzAW<f
z?eT8-InvcgUn8jzlg<G})y>=GC{M6o6S_2-tcWlI(}$VnT9~i5sQ7;rSe^F6J-`l&
zE%Bgr68xdyrE-*?i$YC(J}is;7vSbJ3yX$_fZK!@u>M3oVzg&G%72PE9!|5cI|BHI
k#iwe{bQfsmyy3n700GA^7fNL$-~a#s07*qoM6N<$g0fLcTL1t6

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/_footer.scss b/app/assets/stylesheets/_footer.scss
index fa28a3deb..f34a7e38c 100644
--- a/app/assets/stylesheets/_footer.scss
+++ b/app/assets/stylesheets/_footer.scss
@@ -193,7 +193,7 @@
     .footer-meta-inner {
       display: inline-block;
       vertical-align: bottom;
-      width: 74%;
+      width: 75%;
 
       @include media-down(mobile) {
         display: block;
@@ -226,21 +226,26 @@
 
       .open-government-licence {
         clear: left;
-        min-height: 42px;
+        background: transparent image-url("open-government-licence.png") no-repeat 0 center;
+        padding: 8px 0 0 53px;
 
-        h2 {
-          display: inline;
-          margin: 0 0.5em 0 0;
-          padding: 0;
+        @include media(mobile) {
+          background-image: image-url("open-government-licence_2x.png");
+          background-size: 41px 17px;
         }
 
-        img {
-          width: 41px;
+        h2 {
+          position: absolute;
+          left: -9999em;
         }
 
         p {
           @include core-16;
-          display: inline;
+          margin: 0;
+
+          a {
+            @include core-14;
+          }
         }
       }
     
@@ -258,8 +263,7 @@
       float: none;
       text-align: inherit;
       width: 25%;
-      min-height: 150px;
-      min-height: 15rem;
+      padding-top: 15px;
 
       @include ie-lte(7) {
         display: block;
@@ -274,8 +278,8 @@
         padding: 115px 0 0 0;
         padding: 11.5rem 0 0 0;
 
-        background: transparent image-url("govuk-crest.png") no-repeat 50% 0;
-        text-align: center;
+        background: transparent image-url("govuk-crest.png") no-repeat 100% 0;
+        text-align: right;
         text-decoration: none;
 
         @include ie(6) {
@@ -296,7 +300,10 @@
         margin: 30px 0 0 0;
         margin: 3rem 0 0 0;
 
-        min-height: 0;
+        a {
+          text-align: center;
+          background-position: 50% 0%;
+        }
       }
     }
   }
diff --git a/app/views/root/_footer_meta.html.erb b/app/views/root/_footer_meta.html.erb
index a77ea9aef..ff8ed259b 100644
--- a/app/views/root/_footer_meta.html.erb
+++ b/app/views/root/_footer_meta.html.erb
@@ -12,7 +12,7 @@
 
     <div class="open-government-licence">
       <h2><a href="http://www.nationalarchives.gov.uk/doc/open-government-licence/"><%= image_tag 'open-government-licence_2x.png', alt: 'OGL' %></a></h2>
-      <p>All content is available under the <a href="http://www.nationalarchives.gov.uk/doc/open-government-licence/">Open Government Licence</a>, except where otherwise stated</p>
+      <p>All content is available under the <a href="http://www.nationalarchives.gov.uk/doc/open-government-licence/version/2">Open Government Licence v2.0</a>, except where otherwise stated</p>
     </div>
   </div>