moj_template 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b477f0b899f8783a63ef25740d16a079f1a9d3c7
-  data.tar.gz: b8ee9958abbffe94f3af18c111d5e85fc766e1f7
+  metadata.gz: c5bcbe4bca302db93fd3d96d7db5d18a983cf28d
+  data.tar.gz: 51607de6dbc4291ff08624b3e12317f6f192c9b7
 SHA512:
-  metadata.gz: 6aabdc3db3b93a300b490fdea237c2148558523e4fbda753c17697852d38fc75496ba4e55750c17243615296e78faec8b316a6b34195bbd5e68bc943f5c8288d
-  data.tar.gz: 98990f067f2f37e1434304427f70f3690c1488ca9501d0a7b829705a278fed19fadc4401e3b742331daac03b8fc643259aa714eed267e7d9ad8e711220759987
+  metadata.gz: 4adf78d036e49a51970b86229ab3ff9b6f392885f5db4c567118a87f7f9f3544db9823a2f600c5f42307f1fe844255620a64042f7e5b56c76b07af87255664f4
+  data.tar.gz: bab41f047ee4098d4e5ef0994334ff19029c2738ffa08e6ea6d23ae33ff3d256b07ab39b8c108c92bd16030a5310d7f0aec0cadf43a0794a2ccaa3c14da8b27f

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

@@ -299,70 +299,59 @@ body.beta .indicator {
   body.beta .indicator a:hover {
     color: #0b0c0c; }
 
-.service-header {
-  float: left;
-  width: 66.6%;
-  margin: 7px 0 2px; }
-  .service-header a.service-name {
-    font-family: "nta", Arial, sans-serif;
-    font-size: 24px;
-    line-height: 1em;
-    font-weight: 400;
-    text-transform: none;
-    color: white;
-    font-weight: bold;
-    text-decoration: none;
-    float: left;
-    margin-top: 3px; }
-    @media (max-width: 640px) {
-      .service-header a.service-name {
-        font-size: 20px;
-        line-height: 1.2; } }
-    .service-header a.service-name:hover {
-      border-bottom: 1px solid white; }
-  body.alpha .service-header a.service-phase {
-    display: -moz-inline-stack;
-    display: inline-block;
-    background-color: #d53880;
-    color: #fff;
-    font-family: "nta", Arial, sans-serif;
-    font-size: 16px;
-    line-height: 1.25;
-    font-weight: 300;
-    text-transform: none;
-    font-weight: 700;
-    text-transform: uppercase;
-    letter-spacing: 1px;
-    text-decoration: none;
-    margin: 3px 10px 0 5px;
-    padding: 2px 5px 0; }
-    @media (max-width: 640px) {
-      body.alpha .service-header a.service-phase {
-        font-size: 14px;
-        line-height: 1.14286; } }
-  body.beta .service-header a.service-phase {
-    display: -moz-inline-stack;
-    display: inline-block;
-    background-color: #f47738;
-    color: #fff;
-    font-family: "nta", Arial, sans-serif;
-    font-size: 16px;
-    line-height: 1.25;
-    font-weight: 300;
-    text-transform: none;
-    font-weight: 700;
-    text-transform: uppercase;
-    letter-spacing: 1px;
-    text-decoration: none;
-    margin: 3px 10px 0 5px;
-    padding: 2px 5px 0; }
-    @media (max-width: 640px) {
-      body.beta .service-header a.service-phase {
-        font-size: 14px;
-        line-height: 1.14286; } }
-  body.alpha .service-header a.service-phase, body.beta .service-header a.service-phase {
-    margin-left: 1em;
-    text-decoration: none; }
+@media (min-width: 769px) {
+  #global-header .header-proposition {
+    padding-top: 8px; } }
+#global-header .header-proposition #proposition-name {
+  line-height: 1em;
+  display: inline-block; }
+  #global-header .header-proposition #proposition-name:hover {
+    border-bottom: 1px solid white; }
+body.alpha #global-header .header-proposition .proposition-phase {
+  display: -moz-inline-stack;
+  display: inline-block;
+  background-color: #d53880;
+  color: #fff;
+  font-family: "nta", Arial, sans-serif;
+  font-size: 16px;
+  line-height: 1.25;
+  font-weight: 300;
+  text-transform: none;
+  font-weight: 700;
+  text-transform: uppercase;
+  letter-spacing: 1px;
+  text-decoration: none;
+  margin: 3px 10px 0 5px;
+  padding: 2px 5px 0; }
+  @media (max-width: 640px) {
+    body.alpha #global-header .header-proposition .proposition-phase {
+      font-size: 14px;
+      line-height: 1.14286; } }
+body.beta #global-header .header-proposition .proposition-phase {
+  display: -moz-inline-stack;
+  display: inline-block;
+  background-color: #f47738;
+  color: #fff;
+  font-family: "nta", Arial, sans-serif;
+  font-size: 16px;
+  line-height: 1.25;
+  font-weight: 300;
+  text-transform: none;
+  font-weight: 700;
+  text-transform: uppercase;
+  letter-spacing: 1px;
+  text-decoration: none;
+  margin: 3px 10px 0 5px;
+  padding: 2px 5px 0; }
+  @media (max-width: 640px) {
+    body.beta #global-header .header-proposition .proposition-phase {
+      font-size: 14px;
+      line-height: 1.14286; } }
+body.alpha #global-header .header-proposition .proposition-phase, body.beta #global-header .header-proposition .proposition-phase {
+  margin-left: 1em;
+  text-decoration: none;
+  position: relative;
+  top: -3px; }
 
 #global-breadcrumb {
   background-color: white;
@@ -636,3 +625,20 @@ body.beta .indicator {
     #footer .footer-inside-government ul li {
       margin-right: 0;
       width: 100%; }
+
+/* Phase indicator alignment fixes */
+.indicator {
+  padding: 0.5em 2em !important;
+  /* Set alpha bar to white text */ }
+  @media (max-width: 640px) {
+    .indicator {
+      padding: 0.5em 1em !important; } }
+  .indicator p {
+    padding: 0 !important;
+    /* Set uppercase font for indicator phase */ }
+    .indicator p strong {
+      text-transform: uppercase; }
+  body.alpha .indicator p,
+  body.alpha .indicator a:visited,
+  body.alpha .indicator a:link {
+    color: white; }

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

@@ -84,7 +84,7 @@
     </div>
 
     
-    <header role="banner" id="global-header" class="<%= yield :header_class %>">
+    <header role="banner" id="global-header" class="with-proposition <%= yield :header_class %>">
       <div class="header-wrapper">
         <div class="header-global">
           <div class="header-logo">
@@ -92,13 +92,18 @@
               <img src="<%= asset_path "gov.uk_logotype_crown.png" %>" alt=""> GOV.UK
             </a>
           </div>
-          <div class="service-header">
-            <a href="/" class="service-name"><%= "#{config_item(:proposition_title)}" %></a>
-            <% if config_item(:phase) != :live %><a href="https://www.gov.uk/service-manual/phases/<%= "#{config_item(:phase).to_s.downcase}" %>.html" class="service-phase <%= "#{config_item(:phase).to_s.downcase}" %>"><%= "#{config_item(:phase.to_s.downcase)}" %></a><% end %>
-          </div>
           <%= yield :inside_header %>
         </div>
-        <%= yield :proposition_header %>
+        <% if content_for?(:proposition_header) %>
+          <%= yield(:proposition_header) %>
+        <% else %>
+          <div class="header-proposition">
+            <div class="content">
+                <a href="/" id="proposition-name"><%= "#{config_item(:proposition_title)}" %></a>
+                <a href="https://www.gov.uk/service-manual/phases/#{config_item(:phase).to_s.downcas}.html" class="proposition-phase"><%= "#{config_item(:phase).to_s.capitalize}" %></a>
+            </div>
+          </div>
+        <% end %>
       </div>
     </header>
     <!--end header-->

data/lib/moj_template/version.rb

@@ -1,3 +1,3 @@
 module MojTemplate
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moj_template
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Dom Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails