Skip to content

Commit

Permalink
Bump gov uk template to 0.14.0
Browse files Browse the repository at this point in the history
# 0.14.0

- Update the font-files and move woffs into CSS

- All user-visible text in the template can now be overridden.

Some template languages which don't support default values (such as
plain mustache) will therefore lose that text and require you to handle
supplying the default.
  • Loading branch information
gemmaleigh committed Jul 8, 2015
1 parent 847d3d2 commit d5bb2f1
Show file tree
Hide file tree
Showing 12 changed files with 72 additions and 71 deletions.
8 changes: 4 additions & 4 deletions govuk/public/stylesheets/fonts-ie8.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@

@font-face {
font-family: 'nta';
src: url(fonts/NTA-Light-20130221.eot?0.13.0#) format('embedded-opentype');
src: url(fonts/GDSTransportWebsite.eot?0.14.0#) format('embedded-opentype');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'nta';
src: url(fonts/NTA-Bold-20130221.eot?0.13.0#) format('embedded-opentype');
src: url(fonts/GDSTransportWebsite-Bold.eot?0.14.0#) format('embedded-opentype');
font-weight: bold;
}

@font-face {
font-family: 'ntatabularnumbers';
src: url(fonts/NTATabularNumbers-Light.eot?0.13.0#) format('embedded-opentype');
src: url(fonts/GDSTransportTabular-Light.eot?0.14.0#) format('embedded-opentype');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'ntatabularnumbers';
src: url(fonts/NTATabularNumbers-Bold.eot?0.13.0#) format('embedded-opentype');
src: url(fonts/GDSTransportTabular-Bold.eot?0.14.0#) format('embedded-opentype');
font-weight: bold;
}
13 changes: 6 additions & 7 deletions govuk/public/stylesheets/fonts.css

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
18 changes: 9 additions & 9 deletions govuk/public/stylesheets/govuk-template-ie6.css
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,11 @@ a:active {
color: #2e8aca; }

a[rel="external"]:after {
background-image: url(external-links/external-link.png?0.13.0);
background-image: url(external-links/external-link.png?0.14.0);
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.13.0);
background-image: url(external-links/external-link-24x24.png?0.14.0);
background-size: 12px 400px; } }
a[rel="external"]:after {
content: "\A0\A0\A0\A0";
Expand All @@ -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.13.0);
background-image: url(external-links/external-link-black-12x12.png?0.14.0);
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.13.0);
background-image: url(external-links/external-link-black-24x24.png?0.14.0);
background-size: 12px 400px; } }

/*
Expand Down Expand Up @@ -626,10 +626,10 @@ button:focus,
height: 17px;
overflow: hidden;
text-indent: -999em;
background: url(images/open-government-licence.png?0.13.0) 0 0 no-repeat; }
background: url(images/open-government-licence.png?0.14.0) 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.13.0);
background-image: url(images/open-government-licence_2x.png?0.14.0);
background-size: 41px 17px; } }
#footer .footer-meta .footer-meta-inner .open-government-licence p {
font-family: "nta", Arial, sans-serif;
Expand Down Expand Up @@ -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.13.0);
background-image: url(images/govuk-crest.png?0.14.0);
background-repeat: no-repeat;
background-position: 50% 0%;
background-position: 100% 0%;
background-image: url(images/govuk-crest-ie.png?0.13.0);
background-image: url(images/govuk-crest-ie.png?0.14.0);
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.13.0);
background-image: url(images/govuk-crest-2x.png?0.14.0);
background-size: 125px 102px; } }
16 changes: 8 additions & 8 deletions govuk/public/stylesheets/govuk-template-ie7.css
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,11 @@ a:active {
color: #2e8aca; }

a[rel="external"]:after {
background-image: url(external-links/external-link.png?0.13.0);
background-image: url(external-links/external-link.png?0.14.0);
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.13.0);
background-image: url(external-links/external-link-24x24.png?0.14.0);
background-size: 12px 400px; } }
a[rel="external"]:after {
content: "\A0\A0\A0\A0";
Expand All @@ -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.13.0);
background-image: url(external-links/external-link-black-12x12.png?0.14.0);
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.13.0);
background-image: url(external-links/external-link-black-24x24.png?0.14.0);
background-size: 12px 400px; } }

/*
Expand Down Expand Up @@ -625,10 +625,10 @@ button:focus,
height: 17px;
overflow: hidden;
text-indent: -999em;
background: url(images/open-government-licence.png?0.13.0) 0 0 no-repeat; }
background: url(images/open-government-licence.png?0.14.0) 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.13.0);
background-image: url(images/open-government-licence_2x.png?0.14.0);
background-size: 41px 17px; } }
#footer .footer-meta .footer-meta-inner .open-government-licence p {
font-family: "nta", Arial, sans-serif;
Expand Down Expand Up @@ -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.13.0);
background-image: url(images/govuk-crest.png?0.14.0);
background-repeat: no-repeat;
background-position: 50% 0%;
background-position: 100% 0%;
Expand All @@ -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.13.0);
background-image: url(images/govuk-crest-2x.png?0.14.0);
background-size: 125px 102px; } }
16 changes: 8 additions & 8 deletions govuk/public/stylesheets/govuk-template-ie8.css
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,11 @@ a:active {
color: #2e8aca; }

a[rel="external"]:after {
background-image: url(external-links/external-link.png?0.13.0);
background-image: url(external-links/external-link.png?0.14.0);
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.13.0);
background-image: url(external-links/external-link-24x24.png?0.14.0);
background-size: 12px 400px; } }
a[rel="external"]:after {
content: "\A0\A0\A0\A0";
Expand All @@ -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.13.0);
background-image: url(external-links/external-link-black-12x12.png?0.14.0);
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.13.0);
background-image: url(external-links/external-link-black-24x24.png?0.14.0);
background-size: 12px 400px; } }

/*
Expand Down Expand Up @@ -606,10 +606,10 @@ button:focus,
height: 17px;
overflow: hidden;
text-indent: -999em;
background: url(images/open-government-licence.png?0.13.0) 0 0 no-repeat; }
background: url(images/open-government-licence.png?0.14.0) 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.13.0);
background-image: url(images/open-government-licence_2x.png?0.14.0);
background-size: 41px 17px; } }
#footer .footer-meta .footer-meta-inner .open-government-licence p {
font-family: "nta", Arial, sans-serif;
Expand Down Expand Up @@ -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.13.0);
background-image: url(images/govuk-crest.png?0.14.0);
background-repeat: no-repeat;
background-position: 50% 0%;
background-position: 100% 0%;
Expand All @@ -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.13.0);
background-image: url(images/govuk-crest-2x.png?0.14.0);
background-size: 125px 102px; } }
16 changes: 8 additions & 8 deletions govuk/public/stylesheets/govuk-template.css
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ a:active {
color: #2e8aca; }

a[rel="external"]:after {
background-image: url(external-links/external-link.png?0.13.0);
background-image: url(external-links/external-link.png?0.14.0);
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.13.0);
background-image: url(external-links/external-link-24x24.png?0.14.0);
background-size: 12px 400px; } }
a[rel="external"]:after {
content: "\A0\A0\A0\A0";
Expand All @@ -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.13.0);
background-image: url(external-links/external-link-black-12x12.png?0.14.0);
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.13.0);
background-image: url(external-links/external-link-black-24x24.png?0.14.0);
background-size: 12px 400px; } }

/*
Expand Down Expand Up @@ -646,10 +646,10 @@ button:focus,
height: 17px;
overflow: hidden;
text-indent: -999em;
background: url(images/open-government-licence.png?0.13.0) 0 0 no-repeat; }
background: url(images/open-government-licence.png?0.14.0) 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.13.0);
background-image: url(images/open-government-licence_2x.png?0.14.0);
background-size: 41px 17px; } }
#footer .footer-meta .footer-meta-inner .open-government-licence p {
font-family: "nta", Arial, sans-serif;
Expand Down Expand Up @@ -685,7 +685,7 @@ button:focus,
margin-top: 0; } }
#footer .footer-meta .copyright a {
display: block;
background-image: url(images/govuk-crest.png?0.13.0);
background-image: url(images/govuk-crest.png?0.14.0);
background-repeat: no-repeat;
background-position: 50% 0%;
text-align: center;
Expand All @@ -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.13.0);
background-image: url(images/govuk-crest-2x.png?0.14.0);
background-size: 125px 102px; } }
@media (min-width: 641px) {
#footer .footer-meta .copyright a {
Expand Down
Loading

0 comments on commit d5bb2f1

Please sign in to comment.