moj_template 0.15.0 → 0.16.0

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

@@ -241,60 +241,13 @@ h2, h3, h4 {
 #wrapper {
   background-color: white;
   padding: 0 0 60px 0;
-  border-bottom: 10px solid #0b0c0c; }
-  body.alpha #wrapper {
-    border-color: #d53880; }
-  body.beta #wrapper {
-    border-color: #f47738; }
+  border-bottom: 10px solid #005ea5; }
 
 .inner {
   width: auto;
   padding: 0 1em;
   padding: 0 2em; }
 
-body.alpha .indicator {
-  padding: 8px 0;
-  background-color: #d53880; }
-  body.alpha .indicator p {
-    max-width: 960px;
-    margin: 0 auto;
-    padding: 0 15px;
-    color: #0b0c0c;
-    font-family: "nta", Arial, sans-serif;
-    font-size: 16px;
-    line-height: 1.25;
-    font-weight: 300;
-    text-transform: none; }
-    @media (max-width: 640px) {
-      body.alpha .indicator p {
-        font-size: 14px;
-        line-height: 1.14286; } }
-  body.alpha .indicator a, body.alpha .indicator a:link, body.alpha .indicator a:visited, body.alpha .indicator a:active {
-    color: #0b0c0c; }
-  body.alpha .indicator a:hover {
-    color: #0b0c0c; }
-body.beta .indicator {
-  padding: 8px 0;
-  background-color: #f47738; }
-  body.beta .indicator p {
-    max-width: 960px;
-    margin: 0 auto;
-    padding: 0 15px;
-    color: #0b0c0c;
-    font-family: "nta", Arial, sans-serif;
-    font-size: 16px;
-    line-height: 1.25;
-    font-weight: 300;
-    text-transform: none; }
-    @media (max-width: 640px) {
-      body.beta .indicator p {
-        font-size: 14px;
-        line-height: 1.14286; } }
-  body.beta .indicator a, body.beta .indicator a:link, body.beta .indicator a:visited, body.beta .indicator a:active {
-    color: #0b0c0c; }
-  body.beta .indicator a:hover {
-    color: #0b0c0c; }
-
 #global-header .header-proposition {
   padding-top: 8px; }
   #global-header .header-proposition #proposition-name {

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

@@ -241,60 +241,13 @@ h2, h3, h4 {
 #wrapper {
   background-color: white;
   padding: 0 0 60px 0;
-  border-bottom: 10px solid #0b0c0c; }
-  body.alpha #wrapper {
-    border-color: #d53880; }
-  body.beta #wrapper {
-    border-color: #f47738; }
+  border-bottom: 10px solid #005ea5; }
 
 .inner {
   width: auto;
   padding: 0 1em;
   padding: 0 2em; }
 
-body.alpha .indicator {
-  padding: 8px 0;
-  background-color: #d53880; }
-  body.alpha .indicator p {
-    max-width: 960px;
-    margin: 0 auto;
-    padding: 0 15px;
-    color: #0b0c0c;
-    font-family: "nta", Arial, sans-serif;
-    font-size: 16px;
-    line-height: 1.25;
-    font-weight: 300;
-    text-transform: none; }
-    @media (max-width: 640px) {
-      body.alpha .indicator p {
-        font-size: 14px;
-        line-height: 1.14286; } }
-  body.alpha .indicator a, body.alpha .indicator a:link, body.alpha .indicator a:visited, body.alpha .indicator a:active {
-    color: #0b0c0c; }
-  body.alpha .indicator a:hover {
-    color: #0b0c0c; }
-body.beta .indicator {
-  padding: 8px 0;
-  background-color: #f47738; }
-  body.beta .indicator p {
-    max-width: 960px;
-    margin: 0 auto;
-    padding: 0 15px;
-    color: #0b0c0c;
-    font-family: "nta", Arial, sans-serif;
-    font-size: 16px;
-    line-height: 1.25;
-    font-weight: 300;
-    text-transform: none; }
-    @media (max-width: 640px) {
-      body.beta .indicator p {
-        font-size: 14px;
-        line-height: 1.14286; } }
-  body.beta .indicator a, body.beta .indicator a:link, body.beta .indicator a:visited, body.beta .indicator a:active {
-    color: #0b0c0c; }
-  body.beta .indicator a:hover {
-    color: #0b0c0c; }
-
 #global-header .header-proposition {
   padding-top: 8px; }
   #global-header .header-proposition #proposition-name {

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

@@ -237,60 +237,13 @@ h2, h3, h4 {
 #wrapper {
   background-color: white;
   padding: 0 0 60px 0;
-  border-bottom: 10px solid #0b0c0c; }
-  body.alpha #wrapper {
-    border-color: #d53880; }
-  body.beta #wrapper {
-    border-color: #f47738; }
+  border-bottom: 10px solid #005ea5; }
 
 .inner {
   width: auto;
   padding: 0 1em;
   padding: 0 2em; }
 
-body.alpha .indicator {
-  padding: 8px 0;
-  background-color: #d53880; }
-  body.alpha .indicator p {
-    max-width: 960px;
-    margin: 0 auto;
-    padding: 0 15px;
-    color: #0b0c0c;
-    font-family: "nta", Arial, sans-serif;
-    font-size: 16px;
-    line-height: 1.25;
-    font-weight: 300;
-    text-transform: none; }
-    @media (max-width: 640px) {
-      body.alpha .indicator p {
-        font-size: 14px;
-        line-height: 1.14286; } }
-  body.alpha .indicator a, body.alpha .indicator a:link, body.alpha .indicator a:visited, body.alpha .indicator a:active {
-    color: #0b0c0c; }
-  body.alpha .indicator a:hover {
-    color: #0b0c0c; }
-body.beta .indicator {
-  padding: 8px 0;
-  background-color: #f47738; }
-  body.beta .indicator p {
-    max-width: 960px;
-    margin: 0 auto;
-    padding: 0 15px;
-    color: #0b0c0c;
-    font-family: "nta", Arial, sans-serif;
-    font-size: 16px;
-    line-height: 1.25;
-    font-weight: 300;
-    text-transform: none; }
-    @media (max-width: 640px) {
-      body.beta .indicator p {
-        font-size: 14px;
-        line-height: 1.14286; } }
-  body.beta .indicator a, body.beta .indicator a:link, body.beta .indicator a:visited, body.beta .indicator a:active {
-    color: #0b0c0c; }
-  body.beta .indicator a:hover {
-    color: #0b0c0c; }
-
 #global-header .header-proposition {
   padding-top: 8px; }
   #global-header .header-proposition #proposition-name {

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

@@ -243,11 +243,7 @@ h2, h3, h4 {
 #wrapper {
   background-color: white;
   padding: 0 0 60px 0;
-  border-bottom: 10px solid #0b0c0c; }
-  body.alpha #wrapper {
-    border-color: #d53880; }
-  body.beta #wrapper {
-    border-color: #f47738; }
+  border-bottom: 10px solid #005ea5; }
 
 .inner {
   width: auto;
@@ -256,49 +252,6 @@ h2, h3, h4 {
     .inner {
       padding: 0 2em; } }
 
-body.alpha .indicator {
-  padding: 8px 0;
-  background-color: #d53880; }
-  body.alpha .indicator p {
-    max-width: 960px;
-    margin: 0 auto;
-    padding: 0 15px;
-    color: #0b0c0c;
-    font-family: "nta", Arial, sans-serif;
-    font-size: 16px;
-    line-height: 1.25;
-    font-weight: 300;
-    text-transform: none; }
-    @media (max-width: 640px) {
-      body.alpha .indicator p {
-        font-size: 14px;
-        line-height: 1.14286; } }
-  body.alpha .indicator a, body.alpha .indicator a:link, body.alpha .indicator a:visited, body.alpha .indicator a:active {
-    color: #0b0c0c; }
-  body.alpha .indicator a:hover {
-    color: #0b0c0c; }
-body.beta .indicator {
-  padding: 8px 0;
-  background-color: #f47738; }
-  body.beta .indicator p {
-    max-width: 960px;
-    margin: 0 auto;
-    padding: 0 15px;
-    color: #0b0c0c;
-    font-family: "nta", Arial, sans-serif;
-    font-size: 16px;
-    line-height: 1.25;
-    font-weight: 300;
-    text-transform: none; }
-    @media (max-width: 640px) {
-      body.beta .indicator p {
-        font-size: 14px;
-        line-height: 1.14286; } }
-  body.beta .indicator a, body.beta .indicator a:link, body.beta .indicator a:visited, body.beta .indicator a:active {
-    color: #0b0c0c; }
-  body.beta .indicator a:hover {
-    color: #0b0c0c; }
-
 @media (min-width: 769px) {
   #global-header .header-proposition {
     padding-top: 8px; } }

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

@@ -72,13 +72,28 @@
       </div>
     </div>
 
+    <div id="global-cookie-message">
+      <div class="outer-block">
+        <div class="inner-block">
+          
+            <% if content_for?(:cookie_message) %>
+        <%= yield :cookie_message %>
+      <% else %>
+        <p>GOV.UK uses cookies to make the site simpler. <a href="https://www.gov.uk/help/cookies">Find out more about cookies</a></p>
+      <% end %>
+          
+        </div>
+      </div>
+    </div>
+    <!--end global-cookie-message-->
+
     
     <header role="banner" id="global-header" class="with-proposition <%= yield :header_class %>">
       <div class="header-wrapper">
         <div class="header-global">
           <div class="header-logo">
             <a href="https://www.gov.uk/" title="Go to the GOV.UK homepage" id="logo" class="content">
-              <img src="<%= asset_path "gov.uk_logotype_crown.png" %>" alt=""> GOV.UK
+              <img src="<%= asset_path "gov.uk_logotype_crown.png" %>" width="35" height="31" alt=""> GOV.UK
             </a>
           </div>
           <%= yield :inside_header %>
@@ -100,34 +115,14 @@
     
 
     <!--[if lte IE 6]><script>document.body.className = document.body.className.replace('js-enabled','');</script><![endif]-->
-    <div class="indicator cf">
-      <% if content_for?(:feedback_link_override) %>
-        <%= yield(:feedback_link_override) %>
-      <% else %>
-        <p>
-          <strong><%= config_item(:phase).to_s.capitalize %>:</strong>
-          This is a new service -
-          <% if content_for?(:feedback_link) %>
-            <%= yield(:feedback_link) %>
-          <% else %>
-            <a href="<%= "#{config_item(:feedback_url)}" %>">your feedback</a>
-          <% end %>
-          will help us to improve it
-        </p>
-      <% end %>
-    </div>
-
     <%= yield :after_header %>
 
-    <div id="global-cookie-message">
-      
-        <% if content_for?(:cookie_message) %>
-        <%= yield :cookie_message %>
-      <% else %>
-        <p>GOV.UK uses cookies to make the site simpler. <a href="https://www.gov.uk/help/cookies">Find out more about cookies</a></p>
-      <% end %>
-      
+    <div id="global-header-bar">
+      <div class="inner-block">
+        <div class="header-bar"></div>
+      </div>
     </div>
+    <!--end global-header-bar-->
 
     <% if content_for?(:content_override) %>
       <%= yield(:content_override) %>
@@ -165,13 +160,13 @@
             </ul>
 
             <div class="open-government-licence">
-              <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>
+              <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>
             </div>
           </div>
 
           <div class="copyright">
-            <a href="http://www.nationalarchives.gov.uk/information-management/our-services/crown-copyright.htm">&copy; Crown copyright</a>
+            <a href="https://www.nationalarchives.gov.uk/information-management/our-services/crown-copyright.htm">&copy; Crown copyright</a>
           </div>
         </div>
       </div>

data/lib/moj_template/version.rb

@@ -1,3 +1,3 @@
 module MojTemplate
-  VERSION = "0.15.0"
+  VERSION = "0.16.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moj_template
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Dom Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: govuk_frontend_toolkit
   requirement: !ruby/object:Gem::Requirement
@@ -159,8 +159,6 @@ files:
 - app/assets/stylesheets/images/govuk-crest.png
 - app/assets/stylesheets/images/govuk-crest-ie.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/images/close.png
 - app/assets/stylesheets/govuk-template-ie8.css.erb
 - app/assets/stylesheets/external-links/external-link-24x24.png