moj_template 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c95531cff17a4cef06c752f07a7f0e0920905ad
-  data.tar.gz: ddd278be9fde87e013131c3e22c0891a32d1b629
+  metadata.gz: 7630002a722009cf701a120b6032b369abafc5cc
+  data.tar.gz: b60f28dff00dd09227f7170c4ce9c2652560db02
 SHA512:
-  metadata.gz: a00cd6c17d1d20f7c2802628a1297e812b1fcd02e431b1e4800a8dca2e53bf6bd5fb48d03847e0e298fe1ca4a6b4bcc7c8837ea63298da28e84e67489bd13fb2
-  data.tar.gz: 45ee1c533c66b146b41c0d0410e5261c8f7090e5452e2504717becd634cbd1b02a62ccb7895db885ab1ae5f5c69e8f298b77ce182f031b3fc8f290ad10b3deb8
+  metadata.gz: 58350c5b877e77037c7664955ff01266e3bd8fc7158de24d8c57a393b66bff608f4613eb2d3589db0a6e48531af183b4f5dd338d55526132b175148e0e35bfd6
+  data.tar.gz: 41f90b86444d5c58e440033f5518eb314af93f5364619adf08184643923737f5b8828431d53a850843f2018f1fc0ac0243a290e1cc99d3c2bd89911b5e5cc256

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

@@ -83,7 +83,7 @@ Example usage:
 
 */
 /* local styleguide includes */
-/* New Greys */
+/* Old depricated greys, new things should use the toolkit greys */
 html, body, button, input, table, td, th {
   font-family: "nta", Arial, sans-serif; }
 
@@ -136,9 +136,11 @@ fieldset {
   border: none;
   padding: 0; }
 
-a,
+a:link {
+  color: #005ea5; }
+
 a:visited {
-  color: #2e3191; }
+  color: #2e8aca; }
 
 a:hover {
   color: #2e8aca; }
@@ -147,11 +149,11 @@ a:active {
   color: #2e8aca; }
 
 a[rel="external"]:after {
-  background-image: url(<%= asset_path 'external-link.png' %>);
+  background-image: url(<%= asset_path 'external-links/external-link.png' %>);
   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(<%= asset_path 'external-link-24x24.png' %>);
+      background-image: url(<%= asset_path 'external-links/external-link-24x24.png' %>);
       background-size: 12px 400px; } }
 a[rel="external"]:after {
   content: "\A0\A0\A0\A0";
@@ -165,11 +167,11 @@ a[rel="external"]:hover:after {
 .external-link:hover:after {
   background-position: right 0px; }
 .external-link:after {
-  background-image: url(<%= asset_path 'external-link-black-12x12.png' %>);
+  background-image: url(<%= asset_path 'external-links/external-link-black-12x12.png' %>);
   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(<%= asset_path 'external-link-black-24x24.png' %>);
+      background-image: url(<%= asset_path 'external-links/external-link-black-24x24.png' %>);
       background-size: 12px 400px; } }
 
 /*
@@ -303,6 +305,7 @@ a:focus {
 input:focus,
 textarea:focus,
 select:focus,
+button:focus,
 #global-header input:focus {
   outline: 3px solid #ffbf47; }
 
@@ -594,10 +597,17 @@ select:focus,
           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 h2 img {
+          #footer .footer-meta .footer-meta-inner .open-government-licence h2 a {
             display: block;
-            width: 43px;
-            height: 17px; }
+            width: 41px;
+            height: 17px;
+            overflow: hidden;
+            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 {
+                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;

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

@@ -83,7 +83,7 @@ Example usage:
 
 */
 /* local styleguide includes */
-/* New Greys */
+/* Old depricated greys, new things should use the toolkit greys */
 html, body, button, input, table, td, th {
   font-family: "nta", Arial, sans-serif; }
 
@@ -136,9 +136,11 @@ fieldset {
   border: none;
   padding: 0; }
 
-a,
+a:link {
+  color: #005ea5; }
+
 a:visited {
-  color: #2e3191; }
+  color: #2e8aca; }
 
 a:hover {
   color: #2e8aca; }
@@ -147,11 +149,11 @@ a:active {
   color: #2e8aca; }
 
 a[rel="external"]:after {
-  background-image: url(<%= asset_path 'external-link.png' %>);
+  background-image: url(<%= asset_path 'external-links/external-link.png' %>);
   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(<%= asset_path 'external-link-24x24.png' %>);
+      background-image: url(<%= asset_path 'external-links/external-link-24x24.png' %>);
       background-size: 12px 400px; } }
 a[rel="external"]:after {
   content: "\A0\A0\A0\A0";
@@ -165,11 +167,11 @@ a[rel="external"]:hover:after {
 .external-link:hover:after {
   background-position: right 0px; }
 .external-link:after {
-  background-image: url(<%= asset_path 'external-link-black-12x12.png' %>);
+  background-image: url(<%= asset_path 'external-links/external-link-black-12x12.png' %>);
   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(<%= asset_path 'external-link-black-24x24.png' %>);
+      background-image: url(<%= asset_path 'external-links/external-link-black-24x24.png' %>);
       background-size: 12px 400px; } }
 
 /*
@@ -303,6 +305,7 @@ a:focus {
 input:focus,
 textarea:focus,
 select:focus,
+button:focus,
 #global-header input:focus {
   outline: 3px solid #ffbf47; }
 
@@ -591,10 +594,17 @@ select:focus,
           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 h2 img {
+          #footer .footer-meta .footer-meta-inner .open-government-licence h2 a {
             display: block;
-            width: 43px;
-            height: 17px; }
+            width: 41px;
+            height: 17px;
+            overflow: hidden;
+            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 {
+                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;

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

@@ -81,7 +81,7 @@ Example usage:
 
 */
 /* local styleguide includes */
-/* New Greys */
+/* Old depricated greys, new things should use the toolkit greys */
 html, body, button, input, table, td, th {
   font-family: "nta", Arial, sans-serif; }
 
@@ -134,9 +134,11 @@ fieldset {
   border: none;
   padding: 0; }
 
-a,
+a:link {
+  color: #005ea5; }
+
 a:visited {
-  color: #2e3191; }
+  color: #2e8aca; }
 
 a:hover {
   color: #2e8aca; }
@@ -145,11 +147,11 @@ a:active {
   color: #2e8aca; }
 
 a[rel="external"]:after {
-  background-image: url(<%= asset_path 'external-link.png' %>);
+  background-image: url(<%= asset_path 'external-links/external-link.png' %>);
   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(<%= asset_path 'external-link-24x24.png' %>);
+      background-image: url(<%= asset_path 'external-links/external-link-24x24.png' %>);
       background-size: 12px 400px; } }
 a[rel="external"]:after {
   content: "\A0\A0\A0\A0";
@@ -163,11 +165,11 @@ a[rel="external"]:hover:after {
 .external-link:hover:after {
   background-position: right 0px; }
 .external-link:after {
-  background-image: url(<%= asset_path 'external-link-black-12x12.png' %>);
+  background-image: url(<%= asset_path 'external-links/external-link-black-12x12.png' %>);
   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(<%= asset_path 'external-link-black-24x24.png' %>);
+      background-image: url(<%= asset_path 'external-links/external-link-black-24x24.png' %>);
       background-size: 12px 400px; } }
 
 /*
@@ -299,6 +301,7 @@ a:focus {
 input:focus,
 textarea:focus,
 select:focus,
+button:focus,
 #global-header input:focus {
   outline: 3px solid #ffbf47; }
 
@@ -578,10 +581,17 @@ select:focus,
           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 h2 img {
+          #footer .footer-meta .footer-meta-inner .open-government-licence h2 a {
             display: block;
-            width: 43px;
-            height: 17px; }
+            width: 41px;
+            height: 17px;
+            overflow: hidden;
+            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 {
+                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;

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

@@ -81,7 +81,7 @@ Example usage:
 
 */
 /* local styleguide includes */
-/* New Greys */
+/* Old depricated greys, new things should use the toolkit greys */
 html, body, button, input, table, td, th {
   font-family: "nta", Arial, sans-serif; }
 
@@ -134,9 +134,11 @@ fieldset {
   border: none;
   padding: 0; }
 
-a,
+a:link {
+  color: #005ea5; }
+
 a:visited {
-  color: #2e3191; }
+  color: #2e8aca; }
 
 a:hover {
   color: #2e8aca; }
@@ -145,11 +147,11 @@ a:active {
   color: #2e8aca; }
 
 a[rel="external"]:after {
-  background-image: url(<%= asset_path 'external-link.png' %>);
+  background-image: url(<%= asset_path 'external-links/external-link.png' %>);
   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(<%= asset_path 'external-link-24x24.png' %>);
+      background-image: url(<%= asset_path 'external-links/external-link-24x24.png' %>);
       background-size: 12px 400px; } }
 a[rel="external"]:after {
   content: "\A0\A0\A0\A0";
@@ -169,11 +171,11 @@ a[rel="external"]:hover:after {
 .external-link:hover:after {
   background-position: right 0px; }
 .external-link:after {
-  background-image: url(<%= asset_path 'external-link-black-12x12.png' %>);
+  background-image: url(<%= asset_path 'external-links/external-link-black-12x12.png' %>);
   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(<%= asset_path 'external-link-black-24x24.png' %>);
+      background-image: url(<%= asset_path 'external-links/external-link-black-24x24.png' %>);
       background-size: 12px 400px; } }
 
 /*
@@ -305,6 +307,7 @@ a:focus {
 input:focus,
 textarea:focus,
 select:focus,
+button:focus,
 #global-header input:focus {
   outline: 3px solid #ffbf47; }
 
@@ -626,10 +629,17 @@ select:focus,
               position: static;
               width: auto;
               margin-bottom: 1em; } }
-          #footer .footer-meta .footer-meta-inner .open-government-licence h2 a, #footer .footer-meta .footer-meta-inner .open-government-licence h2 img {
+          #footer .footer-meta .footer-meta-inner .open-government-licence h2 a {
             display: block;
-            width: 43px;
-            height: 17px; }
+            width: 41px;
+            height: 17px;
+            overflow: hidden;
+            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 {
+                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;

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

@@ -438,7 +438,7 @@ body.beta .indicator {
       -webkit-box-shadow: 0 2px 0 #003518;
       -moz-box-shadow: 0 2px 0 #003518;
       box-shadow: 0 2px 0 #003518; }
-  .button:hover, .button:focus, .button:visited {
+  .button:link, .button:hover, .button:focus, .button:visited {
     color: white; }
   .button:before {
     content: "";
@@ -499,7 +499,7 @@ body.beta .indicator {
       -webkit-box-shadow: 0 2px 0 #b5babe;
       -moz-box-shadow: 0 2px 0 #b5babe;
       box-shadow: 0 2px 0 #b5babe; }
-  .button-secondary:hover, .button-secondary:focus, .button-secondary:visited {
+  .button-secondary:link, .button-secondary:hover, .button-secondary:focus, .button-secondary:visited {
     color: #0b0c0c; }
   .button-secondary:before {
     content: "";
@@ -560,7 +560,7 @@ body.beta .indicator {
       -webkit-box-shadow: 0 2px 0 #6a0812;
       -moz-box-shadow: 0 2px 0 #6a0812;
       box-shadow: 0 2px 0 #6a0812; }
-  .button-warning:hover, .button-warning:focus, .button-warning:visited {
+  .button-warning:link, .button-warning:hover, .button-warning:focus, .button-warning:visited {
     color: white; }
   .button-warning:before {
     content: "";

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

@@ -191,7 +191,7 @@
             </ul>
 
             <div class="open-government-licence">
-              <h2><a href="http://www.nationalarchives.gov.uk/doc/open-government-licence/version/2"><img src="<%= asset_path "open-government-licence_2x.png" %>" alt="OGL"></a></h2>
+              <h2><a href="http://www.nationalarchives.gov.uk/doc/open-government-licence/version/2">Open Government Licence</a></h2>
               <p>All content is available under the <a href="http://www.nationalarchives.gov.uk/doc/open-government-licence/version/2">Open Government Licence v2.0</a>, except where otherwise stated</p>
             </div>
           </div>

data/lib/moj_template/version.rb

@@ -1,3 +1,3 @@
 module MojTemplate
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moj_template
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Dom Smith
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: govuk_frontend_toolkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.43.0
+        version: 0.43.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.43.0
+        version: 0.43.2
 - !ruby/object:Gem::Dependency
   name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,6 @@ files:
 - app/assets/images/gov.uk_logotype_crown.png
 - app/assets/images/gov.uk_logotype_crown_invert.png
 - app/assets/images/gov.uk_logotype_crown_invert_trans.png
-- app/assets/images/open-government-licence_2x.png
 - app/assets/images/opengraph-image.png
 - app/assets/javascripts/govuk-template.js
 - app/assets/javascripts/ie.js
@@ -131,10 +130,10 @@ files:
 - app/assets/javascripts/moj.js
 - app/assets/javascripts/vendor/goog/webfont-debug.js
 - app/assets/javascripts/vendor/jquery/jquery-1.11.0.min.js
-- app/assets/stylesheets/external-link-24x24.png
-- app/assets/stylesheets/external-link-black-12x12.png
-- app/assets/stylesheets/external-link-black-24x24.png
-- app/assets/stylesheets/external-link.png
+- app/assets/stylesheets/external-links/external-link-24x24.png
+- app/assets/stylesheets/external-links/external-link-black-12x12.png
+- app/assets/stylesheets/external-links/external-link-black-24x24.png
+- app/assets/stylesheets/external-links/external-link.png
 - app/assets/stylesheets/fonts/NTA-Bold-20130221.eot
 - app/assets/stylesheets/fonts/NTA-Bold-20130221.woff
 - app/assets/stylesheets/fonts/NTA-Light-20130221.eot
@@ -154,6 +153,8 @@ files:
 - app/assets/stylesheets/images/govuk-crest-2x.png
 - app/assets/stylesheets/images/govuk-crest-ie.png
 - app/assets/stylesheets/images/govuk-crest.png
+- app/assets/stylesheets/images/open-government-licence.png
+- app/assets/stylesheets/images/open-government-licence_2x.png
 - app/assets/stylesheets/images/separator-2x.png
 - app/assets/stylesheets/images/separator.png
 - app/assets/stylesheets/moj-template.css.erb
@@ -185,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: MOJ DS Template