moj_template 0.22.0 → 0.23.0

data/app/assets/stylesheets/moj-template.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 {
@@ -182,24 +107,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;
-    background-color: #d53880;
-    color: #fff;
+    vertical-align: top;
+    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 (min-width: 641px) {
+      header.page-header h1 .alpha {
+        vertical-align: baseline; } }
     @media (max-width: 640px) {
       header.page-header h1 .alpha {
         font-size: 14px;
@@ -207,19 +135,22 @@ header.page-header h1 {
   header.page-header h1 .beta {
     display: -moz-inline-stack;
     display: inline-block;
-    background-color: #f47738;
-    color: #fff;
+    vertical-align: top;
+    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 (min-width: 641px) {
+      header.page-header h1 .beta {
+        vertical-align: baseline; } }
     @media (max-width: 640px) {
       header.page-header h1 .beta {
         font-size: 14px;
@@ -263,19 +194,22 @@ h2, h3, h4 {
 body.alpha #global-header .header-proposition .proposition-phase {
   display: -moz-inline-stack;
   display: inline-block;
-  background-color: #d53880;
-  color: #fff;
+  vertical-align: top;
+  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 (min-width: 641px) {
+    body.alpha #global-header .header-proposition .proposition-phase {
+      vertical-align: baseline; } }
   @media (max-width: 640px) {
     body.alpha #global-header .header-proposition .proposition-phase {
       font-size: 14px;
@@ -283,19 +217,22 @@ body.alpha #global-header .header-proposition .proposition-phase {
 body.beta #global-header .header-proposition .proposition-phase {
   display: -moz-inline-stack;
   display: inline-block;
-  background-color: #f47738;
-  color: #fff;
+  vertical-align: top;
+  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 (min-width: 641px) {
+    body.beta #global-header .header-proposition .proposition-phase {
+      vertical-align: baseline; } }
   @media (max-width: 640px) {
     body.beta #global-header .header-proposition .proposition-phase {
       font-size: 14px;
@@ -319,7 +256,7 @@ body.alpha #global-header .header-proposition .proposition-phase, body.beta #glo
       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;
@@ -344,7 +281,7 @@ body.alpha #global-header .header-proposition .proposition-phase, body.beta #glo
   position: relative;
   display: -moz-inline-stack;
   display: inline-block;
-  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;
@@ -405,7 +342,7 @@ body.alpha #global-header .header-proposition .proposition-phase, body.beta #glo
   position: relative;
   display: -moz-inline-stack;
   display: inline-block;
-  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;
@@ -466,7 +403,7 @@ body.alpha #global-header .header-proposition .proposition-phase, body.beta #glo
   position: relative;
   display: -moz-inline-stack;
   display: inline-block;
-  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;
@@ -526,12 +463,11 @@ body.alpha #global-header .header-proposition .proposition-phase, body.beta #glo
   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;
@@ -545,7 +481,7 @@ body.alpha #global-header .header-proposition .proposition-phase, body.beta #glo
     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;

data/app/views/layouts/moj_template.html.erb

@@ -42,14 +42,14 @@
 
     <link rel="shortcut icon" href="<%= asset_path "favicon.ico" %>" type="image/x-icon" />
 
-    <!-- For third-generation iPad with high-resolution Retina display: -->
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="<%= asset_path "apple-touch-icon-144x144.png" %>">
-    <!-- For iPhone with high-resolution Retina display: -->
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="<%= asset_path "apple-touch-icon-114x114.png" %>">
-    <!-- For first- and second-generation iPad: -->
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="<%= asset_path "apple-touch-icon-72x72.png" %>">
-    <!-- For non-Retina iPhone, iPod Touch, and Android 2.1+ devices: -->
-    <link rel="apple-touch-icon-precomposed" href="<%= asset_path "apple-touch-icon-57x57.png" %>">
+    <!-- Size for iPad and iPad mini (high resolution) -->
+    <link rel="apple-touch-icon-precomposed" sizes="152x152" href="<%= asset_path "apple-touch-icon-152x152.png" %>">
+    <!-- Size for iPhone and iPod touch (high resolution) -->
+    <link rel="apple-touch-icon-precomposed" sizes="120x120" href="<%= asset_path "apple-touch-icon-120x120.png" %>">
+    <!-- Size for iPad 2 and iPad mini (standard resolution) -->
+    <link rel="apple-touch-icon-precomposed" sizes="76x76" href="<%= asset_path "apple-touch-icon-76x76.png" %>">
+    <!-- Default non-defined size, also used for Android 2.1+ devices -->
+    <link rel="apple-touch-icon-precomposed" href="<%= asset_path "apple-touch-icon-60x60.png" %>">
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta property="og:image" content="<%= asset_path "opengraph-image.png" %>">
@@ -167,8 +167,8 @@
 
 
             <div class="open-government-licence">
-              <h2><a href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/2/">Open Government Licence</a></h2>
-              <p>All content is available under the <a href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/2/">Open Government Licence v2.0</a>, except where otherwise stated</p>
+              <p class="logo"><a href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence</a></p>
+              <p>All content is available under the <a href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, except where otherwise stated</p>
             </div>
           </div>
 

data/lib/moj_template/version.rb

@@ -1,3 +1,3 @@
 module MojTemplate
-  VERSION = "0.22.0"
+  VERSION = "0.23.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moj_template
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Dom Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: govuk_frontend_toolkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.43.2
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.43.2
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
@@ -129,15 +129,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/images/apple-touch-icon-60x60.png
 - app/assets/images/gov.uk_logotype_crown_invert_trans.png
-- app/assets/images/apple-touch-icon-72x72.png
+- app/assets/images/apple-touch-icon-120x120.png
+- app/assets/images/apple-touch-icon-76x76.png
 - app/assets/images/gov.uk_logotype_crown_invert.png
-- app/assets/images/apple-touch-icon-144x144.png
 - app/assets/images/gov.uk_logotype_crown.png
-- app/assets/images/apple-touch-icon-114x114.png
+- app/assets/images/apple-touch-icon-152x152.png
 - app/assets/images/opengraph-image.png
 - app/assets/images/favicon.ico
-- app/assets/images/apple-touch-icon-57x57.png
 - app/assets/javascripts/modules/moj.tabs.js
 - app/assets/javascripts/ie.js
 - app/assets/javascripts/moj.js