moj_template 0.22.0 → 0.23.0

data/app/assets/stylesheets/govuk-template-print.css.erb

@@ -21,7 +21,7 @@ html {
   -ms-filter: none; }
 
 body {
-  font-family: "nta", Arial, sans-serif;
+  font-family: sans-serif;
   font-size: 11pt;
   line-height: 1.42857;
   font-weight: 400;

data/app/assets/stylesheets/govuk-template.css.erb

@@ -60,6 +60,9 @@ html, body, div, h1, h2, h3, h4, h5, h6, article, aside, footer, header, hgroup,
   padding: 0;
   vertical-align: baseline; }
 
+main {
+  display: block; }
+
 .group:before,
 .group:after {
   content: "\0020";
@@ -89,13 +92,21 @@ html {
   /* 1 */
   -ms-text-size-adjust: 100%;
   /* 1 */
-  background: white; }
+  background-color: #dee0e2; }
+
+/*
+  Force the scrollbar to always display in IE10/11
+ */
+html {
+  -ms-overflow-style: scrollbar; }
 
 body {
+  background: white;
   color: #0b0c0c;
   line-height: 1.5;
   font-weight: 400;
-  -webkit-font-smoothing: antialiased; }
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale; }
 
 ol, ul, nav ol, nav ul {
   list-style: inherit; }
@@ -108,7 +119,7 @@ a:link {
   color: #005ea5; }
 
 a:visited {
-  color: #2e8aca; }
+  color: #4c2c92; }
 
 a:hover {
   color: #2e8aca; }
@@ -184,9 +195,6 @@ strong {
 img {
   border: 0; }
 
-button {
-  *overflow: visible; }
-
 abbr[title] {
   cursor: help; }
 
@@ -390,13 +398,15 @@ button:focus,
       text-decoration: none; }
       @media (max-width: 640px) {
         #global-header .header-proposition #proposition-name {
-          font-size: 20px;
+          font-size: 18px;
           line-height: 1.2; } }
+    #global-header .header-proposition a#proposition-name:hover {
+      text-decoration: underline; }
     #global-header .header-proposition a.menu {
       font-family: "nta", Arial, sans-serif;
       font-size: 16px;
       line-height: 1.25;
-      font-weight: 300;
+      font-weight: 400;
       text-transform: none;
       color: white;
       display: block;
@@ -456,9 +466,8 @@ button:focus,
           font-family: "nta", Arial, sans-serif;
           font-size: 14px;
           line-height: 1.42857;
-          font-weight: 400;
-          text-transform: none;
-          font-weight: 700; }
+          font-weight: 700;
+          text-transform: none; }
           @media (max-width: 640px) {
             #global-header .header-proposition #proposition-links li a {
               font-size: 12px;
@@ -468,9 +477,8 @@ button:focus,
               font-family: "nta", Arial, sans-serif;
               font-size: 16px;
               line-height: 1.25;
-              font-weight: 300;
-              text-transform: none;
               font-weight: 700;
+              text-transform: none;
               line-height: 23px; } }
             @media (min-width: 769px) and (max-width: 640px) {
               #global-header .header-proposition #proposition-links li a {
@@ -523,7 +531,7 @@ button:focus,
     font-family: "nta", Arial, sans-serif;
     font-size: 16px;
     line-height: 1.25;
-    font-weight: 300;
+    font-weight: 400;
     text-transform: none;
     margin: 0; }
     @media (max-width: 640px) {
@@ -560,7 +568,7 @@ button:focus,
     margin: 0; }
     @media (max-width: 640px) {
       #footer h2 {
-        font-size: 20px;
+        font-size: 18px;
         line-height: 1.2; } }
     #footer h2 a {
       color: inherit; }
@@ -586,7 +594,7 @@ button:focus,
         font-family: "nta", Arial, sans-serif;
         font-size: 16px;
         line-height: 1.5;
-        font-weight: 300;
+        font-weight: 400;
         text-transform: none;
         display: inline-block;
         list-style: none;
@@ -608,16 +616,17 @@ button:focus,
         @media (min-width: 641px) {
           #footer .footer-meta .footer-meta-inner .open-government-licence {
             padding-left: 53px; } }
-        #footer .footer-meta .footer-meta-inner .open-government-licence h2 {
-          margin-bottom: 1em; }
+        #footer .footer-meta .footer-meta-inner .open-government-licence .logo {
+          margin-bottom: 1em;
+          padding-top: 0; }
           @media (min-width: 641px) {
-            #footer .footer-meta .footer-meta-inner .open-government-licence h2 {
+            #footer .footer-meta .footer-meta-inner .open-government-licence .logo {
               position: absolute;
               left: 0;
               top: 0;
               width: 41px;
               height: 100%; } }
-          #footer .footer-meta .footer-meta-inner .open-government-licence h2 a {
+          #footer .footer-meta .footer-meta-inner .open-government-licence .logo a {
             display: block;
             width: 41px;
             height: 17px;
@@ -625,14 +634,14 @@ button:focus,
             text-indent: -999em;
             background: url(<%= asset_path 'images/open-government-licence.png' %>) 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 h2 a {
+              #footer .footer-meta .footer-meta-inner .open-government-licence .logo a {
                 background-image: url(<%= asset_path 'images/open-government-licence_2x.png' %>);
                 background-size: 41px 17px; } }
         #footer .footer-meta .footer-meta-inner .open-government-licence p {
           font-family: "nta", Arial, sans-serif;
           font-size: 16px;
           line-height: 1.25;
-          font-weight: 300;
+          font-weight: 400;
           text-transform: none;
           margin: 0;
           padding-top: 0.1em; }
@@ -644,7 +653,7 @@ button:focus,
       font-family: "nta", Arial, sans-serif;
       font-size: 16px;
       line-height: 1.25;
-      font-weight: 300;
+      font-weight: 400;
       text-transform: none;
       margin: 30px 0 0 0;
       width: 100%;

data/app/assets/stylesheets/moj-template-ie6.css.erb

@@ -14,91 +14,24 @@
 @-o-viewport {
   width: device-width; }
 
-/* CSS 3 Mixins
-
-  Add them as you need them. This should let us manage vendor prefixes in one place.
- */
-/* Cross-browser shims
-
-  Ways of normalising properties across browsers.
- */
 @-ms-viewport {
   width: device-width; }
 
 @-o-viewport {
   width: device-width; }
 
-/* Usage:
-   @include inline-block
-
-   or
-
-   @include inline-block("250px")
-
-   which gives a min-height to the inline-block elements.
-*/
-/* Contain floats usage:
-
-   .this-has-floated-children {
-     @extend %contain-floats;
-   }
-
-*/
-/* Cross-browser shims
-
-  Ways of normalising properties across browsers.
- */
 @-ms-viewport {
   width: device-width; }
 
 @-o-viewport {
   width: device-width; }
 
-/* Usage:
-   @include inline-block
-
-   or
-
-   @include inline-block("250px")
-
-   which gives a min-height to the inline-block elements.
-*/
-/* Contain floats usage:
-
-   .this-has-floated-children {
-     @extend %contain-floats;
-   }
-
-*/
-/* CSS 3 Mixins
-
-  Add them as you need them. This should let us manage vendor prefixes in one place.
- */
 @-ms-viewport {
   width: device-width; }
 
 @-o-viewport {
   width: device-width; }
 
-/*
-
-Mixin and defaults for making buttons on GOV.UK services.
-
-For guidance, see: https://www.gov.uk/service-manual/design-and-content/resources/buttons.html
-
-Example usage:
-
-.button{
-  @include button;
-}
-.button-secondary{
-  @include button($grey-3);
-}
-.button-warning{
-  @include button($red);
-}
-
-*/
 @font-face {
   font-family: GDS-Logo;
   src: local("HelveticaNeue"), local("Helvetica Neue"), local("Arial"), local("Helvetica"); }
@@ -109,32 +42,24 @@ Example usage:
 @-o-viewport {
   width: device-width; }
 
-/* Cross-browser shims
-
-  Ways of normalising properties across browsers.
- */
 @-ms-viewport {
   width: device-width; }
 
 @-o-viewport {
   width: device-width; }
 
-/* Usage:
-   @include inline-block
-
-   or
+@-ms-viewport {
+  width: device-width; }
 
-   @include inline-block("250px")
+@-o-viewport {
+  width: device-width; }
 
-   which gives a min-height to the inline-block elements.
-*/
-/* Contain floats usage:
+@-ms-viewport {
+  width: device-width; }
 
-   .this-has-floated-children {
-     @extend %contain-floats;
-   }
+@-o-viewport {
+  width: device-width; }
 
-*/
 .clearfix, .cf {
   zoom: 1; }
   .clearfix:before, .cf:before, .clearfix:after, .cf:after {
@@ -176,26 +101,27 @@ header.page-header h1 {
     color: #6f777b; }
     @media (max-width: 640px) {
       header.page-header h1 span {
-        font-size: 18px;
+        font-size: 20px;
         line-height: 1.11111; } }
   header.page-header h1 .alpha {
     display: -moz-inline-stack;
     display: inline-block;
     zoom: 1;
     display: inline;
-    background-color: #d53880;
-    color: #fff;
+    vertical-align: top;
+    vertical-align: baseline;
+    margin: 0 8px 0 0;
+    padding: 2px 5px 0;
     font-family: "nta", Arial, sans-serif;
     font-size: 16px;
     line-height: 1.25;
-    font-weight: 300;
-    text-transform: none;
     font-weight: 700;
+    text-transform: none;
     text-transform: uppercase;
     letter-spacing: 1px;
     text-decoration: none;
-    margin: 3px 10px 0 5px;
-    padding: 2px 5px 0; }
+    color: #fff;
+    background-color: #d53880; }
     @media (max-width: 640px) {
       header.page-header h1 .alpha {
         font-size: 14px;
@@ -205,19 +131,20 @@ header.page-header h1 {
     display: inline-block;
     zoom: 1;
     display: inline;
-    background-color: #f47738;
-    color: #fff;
+    vertical-align: top;
+    vertical-align: baseline;
+    margin: 0 8px 0 0;
+    padding: 2px 5px 0;
     font-family: "nta", Arial, sans-serif;
     font-size: 16px;
     line-height: 1.25;
-    font-weight: 300;
-    text-transform: none;
     font-weight: 700;
+    text-transform: none;
     text-transform: uppercase;
     letter-spacing: 1px;
     text-decoration: none;
-    margin: 3px 10px 0 5px;
-    padding: 2px 5px 0; }
+    color: #fff;
+    background-color: #f47738; }
     @media (max-width: 640px) {
       header.page-header h1 .beta {
         font-size: 14px;
@@ -260,19 +187,20 @@ h2, h3, h4 {
     display: inline-block;
     zoom: 1;
     display: inline;
-    background-color: #d53880;
-    color: #fff;
+    vertical-align: top;
+    vertical-align: baseline;
+    margin: 0 8px 0 0;
+    padding: 2px 5px 0;
     font-family: "nta", Arial, sans-serif;
     font-size: 16px;
     line-height: 1.25;
-    font-weight: 300;
-    text-transform: none;
     font-weight: 700;
+    text-transform: none;
     text-transform: uppercase;
     letter-spacing: 1px;
     text-decoration: none;
-    margin: 3px 10px 0 5px;
-    padding: 2px 5px 0; }
+    color: #fff;
+    background-color: #d53880; }
     @media (max-width: 640px) {
       body.alpha #global-header .header-proposition .proposition-phase {
         font-size: 14px;
@@ -282,19 +210,20 @@ h2, h3, h4 {
     display: inline-block;
     zoom: 1;
     display: inline;
-    background-color: #f47738;
-    color: #fff;
+    vertical-align: top;
+    vertical-align: baseline;
+    margin: 0 8px 0 0;
+    padding: 2px 5px 0;
     font-family: "nta", Arial, sans-serif;
     font-size: 16px;
     line-height: 1.25;
-    font-weight: 300;
-    text-transform: none;
     font-weight: 700;
+    text-transform: none;
     text-transform: uppercase;
     letter-spacing: 1px;
     text-decoration: none;
-    margin: 3px 10px 0 5px;
-    padding: 2px 5px 0; }
+    color: #fff;
+    background-color: #f47738; }
     @media (max-width: 640px) {
       body.beta #global-header .header-proposition .proposition-phase {
         font-size: 14px;
@@ -318,7 +247,7 @@ h2, h3, h4 {
       font-family: "nta", Arial, sans-serif;
       font-size: 16px;
       line-height: 1.25;
-      font-weight: 300;
+      font-weight: 400;
       text-transform: none;
       background: url(https://assets.digital.cabinet-office.gov.uk/static/separator-73822610794bc3a64871f144d93d6526.png) 100% 50% no-repeat;
       float: left;
@@ -345,7 +274,7 @@ h2, h3, h4 {
   display: inline-block;
   zoom: 1;
   display: inline;
-  padding: 0.35em 0.5em 0.15em 0.5em;
+  padding: 0.3em 0.6em 0.2em 0.6em;
   border: none;
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
@@ -416,7 +345,7 @@ h2, h3, h4 {
   display: inline-block;
   zoom: 1;
   display: inline;
-  padding: 0.35em 0.5em 0.15em 0.5em;
+  padding: 0.3em 0.6em 0.2em 0.6em;
   border: none;
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
@@ -487,7 +416,7 @@ h2, h3, h4 {
   display: inline-block;
   zoom: 1;
   display: inline;
-  padding: 0.35em 0.5em 0.15em 0.5em;
+  padding: 0.3em 0.6em 0.2em 0.6em;
   border: none;
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
@@ -555,12 +484,11 @@ h2, h3, h4 {
   font-family: "nta", Arial, sans-serif;
   font-size: 24px;
   line-height: 1.25;
-  font-weight: 400;
-  text-transform: none;
-  font-weight: 700; }
+  font-weight: 700;
+  text-transform: none; }
   @media (max-width: 640px) {
     #footer h2 {
-      font-size: 20px;
+      font-size: 18px;
       line-height: 1.2; } }
 #footer .footer-categories {
   font-size: 0;
@@ -574,7 +502,7 @@ h2, h3, h4 {
     font-family: "nta", Arial, sans-serif;
     font-size: 16px;
     line-height: 1.25;
-    font-weight: 300;
+    font-weight: 400;
     text-transform: none;
     list-style: none;
     border-top: 1px solid #a1acb2;