app/assets/stylesheets/govuk-template.css.erb in govuk_template-0.17.0 vs app/assets/stylesheets/govuk-template.css.erb in govuk_template-0.17.1

- old
+ new

@@ -26,33 +26,33 @@ @-o-viewport { width: device-width; } #global-header .header-wrapper:after, #global-header .header-wrapper .header-global:after, #global-header .header-wrapper .header-global .header-logo:after, #global-header .header-proposition #proposition-link:after, -#global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after { +#global-header .header-proposition #proposition-links:after, #footer .footer-meta:after { content: ""; display: block; clear: both; } -#global-header-bar, #global-cookie-message p { +#global-header-bar, #global-cookie-message p, #footer .footer-wrapper { max-width: 960px; margin: 0 15px; } @media (min-width: 641px) { - #global-header-bar, #global-cookie-message p { + #global-header-bar, #global-cookie-message p, #footer .footer-wrapper { margin: 0 30px; } } @media (min-width: 1020px) { - #global-header-bar, #global-cookie-message p { + #global-header-bar, #global-cookie-message p, #footer .footer-wrapper { margin: 0 auto; } } @-ms-viewport { width: device-width; } @-o-viewport { width: device-width; } #global-header .header-wrapper:after, #global-header .header-wrapper .header-global:after, #global-header .header-wrapper .header-global .header-logo:after, #global-header .header-proposition #proposition-link:after, -#global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after { +#global-header .header-proposition #proposition-links:after, #footer .footer-meta:after { content: ""; display: block; clear: both; } @-ms-viewport { @@ -60,11 +60,10 @@ @-o-viewport { width: device-width; } /* local styleguide includes */ -/* Old depricated greys, new things should use the toolkit greys */ html, body, button, input, table, td, th { font-family: "nta", Arial, sans-serif; } html, body, div, h1, h2, h3, h4, h5, h6, article, aside, footer, header, hgroup, nav, section { margin: 0; @@ -144,20 +143,20 @@ @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(<%= asset_path 'external-links/external-link-24x24.png' %>); background-size: 12px 400px; } } a[rel="external"]:after { - content: "\A0\A0\A0\A0"; - background-position: right 6px; } + content: "\A0\A0\A0\A0\A0"; + background-position: right 3px; } a[rel="external"]:hover:after { - background-position: right -382px; } -@media (max-width: 640px) { + background-position: right -385px; } +@media (min-width: 641px) { a[rel="external"]:after { - content: "\A0\A0\A0\A0\A0"; - background-position: right 3px; } + content: "\A0\A0\A0\A0"; + background-position: right 6px; } a[rel="external"]:hover:after { - background-position: right -385px; } } + background-position: right -382px; } } .external-link:after { content: "\A0\A0\A0\A0\A0\A0\A0\A0"; background-position: right 0px; } .external-link:hover:after { @@ -315,11 +314,11 @@ @-o-viewport { width: device-width; } #global-header .header-wrapper:after, #global-header .header-wrapper .header-global:after, #global-header .header-wrapper .header-global .header-logo:after, #global-header .header-proposition #proposition-link:after, -#global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after { +#global-header .header-proposition #proposition-links:after, #footer .footer-meta:after { content: ""; display: block; clear: both; } @-ms-viewport { @@ -562,16 +561,12 @@ /* Global footer */ #footer { background-color: #dee0e2; border-top: 1px solid #a1acb2; } #footer .footer-wrapper { - margin: 0 auto; - width: auto; - max-width: 1020px; - padding-top: 20px; background-color: #dee0e2; - margin: 0 auto; } + padding-top: 20px; } @media (min-width: 641px) { #footer .footer-wrapper { padding-top: 60px; } } #footer a { color: #454a4c; } @@ -582,28 +577,22 @@ font-size: 24px; line-height: 1.25; font-weight: 400; text-transform: none; font-weight: bold; - color: #171819; + color: #454a4c; margin: 0; } @media (max-width: 640px) { #footer h2 { font-size: 18px; line-height: 1.2; } } #footer h2 a { color: inherit; } #footer .footer-meta { - padding-left: 15px; - padding-right: 15px; padding-bottom: 60px; clear: both; font-size: 0; color: #454a4c; } - @media (min-width: 641px) { - #footer .footer-meta { - padding-left: 30px; - padding-right: 30px; } } #footer .footer-meta .footer-meta-inner { display: inline-block; vertical-align: bottom; width: 100%; } @media (min-width: 641px) {