diff --git a/govuk/public/stylesheets/fonts-ie8.css b/govuk/public/stylesheets/fonts-ie8.css index 45bee4f82..45c819960 100755 --- a/govuk/public/stylesheets/fonts-ie8.css +++ b/govuk/public/stylesheets/fonts-ie8.css @@ -5,26 +5,26 @@ @font-face { font-family: 'nta'; - src: url(fonts/GDSTransportWebsite.eot?0.14.0#) format('embedded-opentype'); + src: url(fonts/GDSTransportWebsite.eot?0.14.1#) format('embedded-opentype'); font-weight: normal; font-style: normal; } @font-face { font-family: 'nta'; - src: url(fonts/GDSTransportWebsite-Bold.eot?0.14.0#) format('embedded-opentype'); + src: url(fonts/GDSTransportWebsite-Bold.eot?0.14.1#) format('embedded-opentype'); font-weight: bold; } @font-face { font-family: 'ntatabularnumbers'; - src: url(fonts/GDSTransportTabular-Light.eot?0.14.0#) format('embedded-opentype'); + src: url(fonts/GDSTransportTabular-Light.eot?0.14.1#) format('embedded-opentype'); font-weight: normal; font-style: normal; } @font-face { font-family: 'ntatabularnumbers'; - src: url(fonts/GDSTransportTabular-Bold.eot?0.14.0#) format('embedded-opentype'); + src: url(fonts/GDSTransportTabular-Bold.eot?0.14.1#) format('embedded-opentype'); font-weight: bold; } diff --git a/govuk/public/stylesheets/govuk-template-ie6.css b/govuk/public/stylesheets/govuk-template-ie6.css index 02dec381e..1b8b4c2c9 100755 --- a/govuk/public/stylesheets/govuk-template-ie6.css +++ b/govuk/public/stylesheets/govuk-template-ie6.css @@ -142,11 +142,11 @@ a:active { color: #2e8aca; } a[rel="external"]:after { - background-image: url(external-links/external-link.png?0.14.0); + background-image: url(external-links/external-link.png?0.14.1); background-repeat: no-repeat; } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { a[rel="external"]:after { - background-image: url(external-links/external-link-24x24.png?0.14.0); + background-image: url(external-links/external-link-24x24.png?0.14.1); background-size: 12px 400px; } } a[rel="external"]:after { content: "\A0\A0\A0\A0"; @@ -160,11 +160,11 @@ a[rel="external"]:hover:after { .external-link:hover:after { background-position: right 0px; } .external-link:after { - background-image: url(external-links/external-link-black-12x12.png?0.14.0); + background-image: url(external-links/external-link-black-12x12.png?0.14.1); background-repeat: no-repeat; } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { .external-link:after { - background-image: url(external-links/external-link-black-24x24.png?0.14.0); + background-image: url(external-links/external-link-black-24x24.png?0.14.1); background-size: 12px 400px; } } /* @@ -626,10 +626,10 @@ button:focus, height: 17px; overflow: hidden; text-indent: -999em; - background: url(images/open-government-licence.png?0.14.0) 0 0 no-repeat; } + background: url(images/open-government-licence.png?0.14.1) 0 0 no-repeat; } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { #footer .footer-meta .footer-meta-inner .open-government-licence .logo a { - background-image: url(images/open-government-licence_2x.png?0.14.0); + background-image: url(images/open-government-licence_2x.png?0.14.1); background-size: 41px 17px; } } #footer .footer-meta .footer-meta-inner .open-government-licence p { font-family: "nta", Arial, sans-serif; @@ -666,16 +666,16 @@ button:focus, line-height: 1.14286; } } #footer .footer-meta .copyright a { display: block; - background-image: url(images/govuk-crest.png?0.14.0); + background-image: url(images/govuk-crest.png?0.14.1); background-repeat: no-repeat; background-position: 50% 0%; background-position: 100% 0%; - background-image: url(images/govuk-crest-ie.png?0.14.0); + background-image: url(images/govuk-crest-ie.png?0.14.1); text-align: center; text-decoration: none; text-align: right; padding: 115px 0 0 0; } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { #footer .footer-meta .copyright a { - background-image: url(images/govuk-crest-2x.png?0.14.0); + background-image: url(images/govuk-crest-2x.png?0.14.1); background-size: 125px 102px; } } diff --git a/govuk/public/stylesheets/govuk-template-ie7.css b/govuk/public/stylesheets/govuk-template-ie7.css index a51e9e60e..694838780 100755 --- a/govuk/public/stylesheets/govuk-template-ie7.css +++ b/govuk/public/stylesheets/govuk-template-ie7.css @@ -142,11 +142,11 @@ a:active { color: #2e8aca; } a[rel="external"]:after { - background-image: url(external-links/external-link.png?0.14.0); + background-image: url(external-links/external-link.png?0.14.1); background-repeat: no-repeat; } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { a[rel="external"]:after { - background-image: url(external-links/external-link-24x24.png?0.14.0); + background-image: url(external-links/external-link-24x24.png?0.14.1); background-size: 12px 400px; } } a[rel="external"]:after { content: "\A0\A0\A0\A0"; @@ -160,11 +160,11 @@ a[rel="external"]:hover:after { .external-link:hover:after { background-position: right 0px; } .external-link:after { - background-image: url(external-links/external-link-black-12x12.png?0.14.0); + background-image: url(external-links/external-link-black-12x12.png?0.14.1); background-repeat: no-repeat; } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { .external-link:after { - background-image: url(external-links/external-link-black-24x24.png?0.14.0); + background-image: url(external-links/external-link-black-24x24.png?0.14.1); background-size: 12px 400px; } } /* @@ -625,10 +625,10 @@ button:focus, height: 17px; overflow: hidden; text-indent: -999em; - background: url(images/open-government-licence.png?0.14.0) 0 0 no-repeat; } + background: url(images/open-government-licence.png?0.14.1) 0 0 no-repeat; } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { #footer .footer-meta .footer-meta-inner .open-government-licence .logo a { - background-image: url(images/open-government-licence_2x.png?0.14.0); + background-image: url(images/open-government-licence_2x.png?0.14.1); background-size: 41px 17px; } } #footer .footer-meta .footer-meta-inner .open-government-licence p { font-family: "nta", Arial, sans-serif; @@ -665,7 +665,7 @@ button:focus, line-height: 1.14286; } } #footer .footer-meta .copyright a { display: block; - background-image: url(images/govuk-crest.png?0.14.0); + background-image: url(images/govuk-crest.png?0.14.1); background-repeat: no-repeat; background-position: 50% 0%; background-position: 100% 0%; @@ -675,5 +675,5 @@ button:focus, padding: 115px 0 0 0; } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { #footer .footer-meta .copyright a { - background-image: url(images/govuk-crest-2x.png?0.14.0); + background-image: url(images/govuk-crest-2x.png?0.14.1); background-size: 125px 102px; } } diff --git a/govuk/public/stylesheets/govuk-template-ie8.css b/govuk/public/stylesheets/govuk-template-ie8.css index 6ce24a13f..c348bd5e3 100755 --- a/govuk/public/stylesheets/govuk-template-ie8.css +++ b/govuk/public/stylesheets/govuk-template-ie8.css @@ -136,11 +136,11 @@ a:active { color: #2e8aca; } a[rel="external"]:after { - background-image: url(external-links/external-link.png?0.14.0); + background-image: url(external-links/external-link.png?0.14.1); background-repeat: no-repeat; } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { a[rel="external"]:after { - background-image: url(external-links/external-link-24x24.png?0.14.0); + background-image: url(external-links/external-link-24x24.png?0.14.1); background-size: 12px 400px; } } a[rel="external"]:after { content: "\A0\A0\A0\A0"; @@ -154,11 +154,11 @@ a[rel="external"]:hover:after { .external-link:hover:after { background-position: right 0px; } .external-link:after { - background-image: url(external-links/external-link-black-12x12.png?0.14.0); + background-image: url(external-links/external-link-black-12x12.png?0.14.1); background-repeat: no-repeat; } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { .external-link:after { - background-image: url(external-links/external-link-black-24x24.png?0.14.0); + background-image: url(external-links/external-link-black-24x24.png?0.14.1); background-size: 12px 400px; } } /* @@ -606,10 +606,10 @@ button:focus, height: 17px; overflow: hidden; text-indent: -999em; - background: url(images/open-government-licence.png?0.14.0) 0 0 no-repeat; } + background: url(images/open-government-licence.png?0.14.1) 0 0 no-repeat; } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { #footer .footer-meta .footer-meta-inner .open-government-licence .logo a { - background-image: url(images/open-government-licence_2x.png?0.14.0); + background-image: url(images/open-government-licence_2x.png?0.14.1); background-size: 41px 17px; } } #footer .footer-meta .footer-meta-inner .open-government-licence p { font-family: "nta", Arial, sans-serif; @@ -643,7 +643,7 @@ button:focus, line-height: 1.14286; } } #footer .footer-meta .copyright a { display: block; - background-image: url(images/govuk-crest.png?0.14.0); + background-image: url(images/govuk-crest.png?0.14.1); background-repeat: no-repeat; background-position: 50% 0%; background-position: 100% 0%; @@ -653,5 +653,5 @@ button:focus, padding: 115px 0 0 0; } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { #footer .footer-meta .copyright a { - background-image: url(images/govuk-crest-2x.png?0.14.0); + background-image: url(images/govuk-crest-2x.png?0.14.1); background-size: 125px 102px; } } diff --git a/govuk/public/stylesheets/govuk-template.css b/govuk/public/stylesheets/govuk-template.css index 8aaeea639..b43685c96 100755 --- a/govuk/public/stylesheets/govuk-template.css +++ b/govuk/public/stylesheets/govuk-template.css @@ -139,11 +139,11 @@ a:active { color: #2e8aca; } a[rel="external"]:after { - background-image: url(external-links/external-link.png?0.14.0); + background-image: url(external-links/external-link.png?0.14.1); background-repeat: no-repeat; } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { a[rel="external"]:after { - background-image: url(external-links/external-link-24x24.png?0.14.0); + background-image: url(external-links/external-link-24x24.png?0.14.1); background-size: 12px 400px; } } a[rel="external"]:after { content: "\A0\A0\A0\A0"; @@ -163,11 +163,11 @@ a[rel="external"]:hover:after { .external-link:hover:after { background-position: right 0px; } .external-link:after { - background-image: url(external-links/external-link-black-12x12.png?0.14.0); + background-image: url(external-links/external-link-black-12x12.png?0.14.1); background-repeat: no-repeat; } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { .external-link:after { - background-image: url(external-links/external-link-black-24x24.png?0.14.0); + background-image: url(external-links/external-link-black-24x24.png?0.14.1); background-size: 12px 400px; } } /* @@ -646,10 +646,10 @@ button:focus, height: 17px; overflow: hidden; text-indent: -999em; - background: url(images/open-government-licence.png?0.14.0) 0 0 no-repeat; } + background: url(images/open-government-licence.png?0.14.1) 0 0 no-repeat; } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { #footer .footer-meta .footer-meta-inner .open-government-licence .logo a { - background-image: url(images/open-government-licence_2x.png?0.14.0); + background-image: url(images/open-government-licence_2x.png?0.14.1); background-size: 41px 17px; } } #footer .footer-meta .footer-meta-inner .open-government-licence p { font-family: "nta", Arial, sans-serif; @@ -685,7 +685,7 @@ button:focus, margin-top: 0; } } #footer .footer-meta .copyright a { display: block; - background-image: url(images/govuk-crest.png?0.14.0); + background-image: url(images/govuk-crest.png?0.14.1); background-repeat: no-repeat; background-position: 50% 0%; text-align: center; @@ -696,7 +696,7 @@ button:focus, background-position: 100% 0%; } } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { #footer .footer-meta .copyright a { - background-image: url(images/govuk-crest-2x.png?0.14.0); + background-image: url(images/govuk-crest-2x.png?0.14.1); background-size: 125px 102px; } } @media (min-width: 641px) { #footer .footer-meta .copyright a { diff --git a/govuk/views/govuk_template.html b/govuk/views/govuk_template.html index 54b3eb8bc..6f0686373 100755 --- a/govuk/views/govuk_template.html +++ b/govuk/views/govuk_template.html @@ -11,19 +11,19 @@ (function(){if(navigator.userAgent.match(/IEMobile\/10\.0/)){var d=document,c="appendChild",a=d.createElement("style");a[c](d.createTextNode("@-ms-viewport{width:auto!important}"));d.getElementsByTagName("head")[0][c](a);}})(); - - - - + + + + - + - + - + - + - + - + - + - + {{$head}}{{/head}} @@ -80,7 +80,7 @@