moj_internal_template 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8818c08ab2b844412cb4138379139d5d837d813c
-  data.tar.gz: 5222e1541a0cabd4760062338efefab87f770704
+  metadata.gz: f48bb26c4a814acd750bcb0a3f7bf96222cd598a
+  data.tar.gz: a408399a1a772789031ddf90eb4d5bef73b7a54c
 SHA512:
-  metadata.gz: bbc7b0392d1948a9c301997a4a704e6e81bc29348fce3852bcdb14295a52644b43919f71f59a1f3dd952ffa065f078a9cd2d5513950c5ca475daa05f447ac222
-  data.tar.gz: 21f5942145d4ccbec44acb233f3364f8a3e5dca95b87e0131d3afe3f869ae466e1df7696c2e830001413aad52ae3231814f0f6484faf796fddb728435b5eb94e
+  metadata.gz: 36437ceba2202bd69363d28b16cc655a647d21f00b8416f6274d54c68ab71f2c8a04f1d9600279dee6e0d066964dbf4b3cb9abb51cdaa53e1a982e4e09705e14
+  data.tar.gz: 02182e91c9b27f30bd6cbc7d939186c5421f304f35bafd89a6cd305adb2a8fed4e4f6cfe7b614aab934475b8eb2d2f0a7c5b9f3985d85101a8f25c49fdacc738

data/app/assets/stylesheets/elements/_forms.scss

@@ -27,7 +27,6 @@
 // Fieldset is used to group more than one .form-group
 fieldset {
   width: 100%;
-  float: left;
   clear: both;
 }
 
@@ -142,10 +141,19 @@ fieldset {
 .form-checkbox {
   display: block;
   margin: $gutter-half 0;
+  margin-bottom: 30px;
 }
 .form-checkbox input {
   vertical-align: middle;
   margin: -2px 5px 0 0;
+  width: 30px;
+  -webkit-appearance: checkbox;
+}
+.form-checkbox label {
+    display: inline;
+    font-weight: normal;
+    cursor: pointer;
+    font-size: 19px;
 }
 
 // Buttons

data/app/assets/stylesheets/moj/_fonts.scss

@@ -1,12 +1,7 @@
 @font-face {
   font-family: 'Bliss2';
-  src: url('/assets/Bliss2Rg.eot'); /* IE9 Compat Modes */
-  src: url('/assets/Bliss2Rg.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('/assets/Bliss2Rg.woff') format('woff'), /* Modern Browsers */
-       url('/assets/Bliss2Rg.ttf')  format('truetype'), /* Safari, Android, iOS */
-       url('/assets/Bliss2Rg.svg#svgBliss2Rg') format('svg'); /* Legacy iOS */
-}
-
-body {
-  font-family: 'Bliss2', arial, sans-serif;
+  src: font-url('Bliss2Rg.eot'); /* IE9 Compat Modes */
+  src: font-url('Bliss2Rg.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       font-url('Bliss2Rg.woff') format('woff'), /* Modern Browsers */
+       font-url('Bliss2Rg.ttf')  format('truetype') /* Safari, Android, iOS */
 }

data/app/assets/stylesheets/moj/_header.scss

@@ -2,8 +2,8 @@
 @import '_conditionals';
 @import '_measurements';
 
-$header-background-color: #f7f7ed;
-$header-foreground-color: $black;
+$header-background-color: black;
+$header-foreground-color: white;
 
 #global-header {
   background-color: $header-background-color;
@@ -11,6 +11,7 @@ $header-foreground-color: $black;
 
   .header-wrapper {
     background-color: $header-background-color;
+    color: $header-foreground-color;
     max-width: 990px;
     margin: 0 auto;
     padding-top: 8px;
@@ -45,6 +46,18 @@ $header-foreground-color: $black;
       .header-logo {
         margin: 5px 0 2px;
       }
+
+      .header-app-name {
+        float: left;
+        text-align: center;
+        font-size: 28px;
+        font-weight: bold;
+        margin: 0 15px;
+
+        @include media(desktop){
+          width: 33.33%;
+        }
+      }
     }
   }
 
@@ -57,7 +70,6 @@ $header-foreground-color: $black;
     overflow: visible;
     vertical-align: baseline;
 
-    color: $header-foreground-color;
     font-weight: bold;
     font-size: 30px;
     line-height: 1em;
@@ -68,10 +80,10 @@ $header-foreground-color: $black;
 
     img {
       position: relative;
-      top: -2px;
+      top: -5px;
 
-      width: 35px;
-      height: 31px;
+      width: 246px;
+      height: 36px;
 
       padding-right: 6px;
 
@@ -84,8 +96,8 @@ $header-foreground-color: $black;
     &:hover,
     &:focus {
       text-decoration: none;
-      border-bottom: 1px solid;
-      padding-bottom: 0;
+      border-bottom: none;
+      padding-bottom: 1px;
     }
 
     &:active {
@@ -96,7 +108,7 @@ $header-foreground-color: $black;
   #log-in-out {
     font-size: 16px;
     float: right;
-    margin-top: 15px;
+    margin-top: 12px;
     margin-right: 15px;
 
     a {
@@ -117,8 +129,7 @@ $header-foreground-color: $black;
     @include inner-block;
   }
   .header-bar {
-    height: 10px;
-    background-color: $header-foreground-color;
+    height: 0px;
     @include ie-lte(8) {
       font-size: 0;
     }

data/app/assets/stylesheets/moj/_typography.scss

@@ -6,9 +6,24 @@
 
 @import "fonts";
 
+@mixin bliss() {
+  font-family: "Bliss2", Arial, sans-serif;
+}
+
 body {
   @include core-19;
-  font-family: "Bliss2", Arial, sans-serif;
+  @include bliss;
+}
+
+// override things that don't inherit their font
+.form-control,
+.form-label,
+.form-label-bold,
+#global-cookie-message p,
+button.button,
+table th,
+table td {
+  @include bliss;
 }
 
 // Text
@@ -35,6 +50,9 @@ p {
   max-width: 30em;
 }
 
+form .text {
+  max-width: none;
+}
 
 // Code styles
 pre,

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

@@ -1,7 +1,7 @@
 <%= yield :top_of_page %>
 <!DOCTYPE html>
-<!--[if lt IE 9]><html class="lte-ie8" lang="<%= content_for?(:html_lang) ? yield(:html_lang) : "en" %>"><![endif]-->
-<!--[if gt IE 8]><!--><html lang="<%= content_for?(:html_lang) ? yield(:html_lang) : "en" %>"><!--<![endif]-->
+<!--[if lt IE 9]><html class="lte-ie8" lang="<%= content_for?(:html_lang) ? yield(:html_lang) : "en" %>" <%= yield(:html_attributes) %>><![endif]-->
+<!--[if gt IE 8]><!--><html lang="<%= content_for?(:html_lang) ? yield(:html_lang) : "en" %>" <%= yield(:html_attributes) %>><!--<![endif]-->
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 
@@ -11,10 +11,10 @@
       (function(){if(navigator.userAgent.match(/IEMobile\/10\.0/)){var d=document,c="appendChild",a=d.createElement("style");a[c](d.createTextNode("@-ms-viewport{width:auto!important}"));d.getElementsByTagName("head")[0][c](a);}})();
     </script>
 
-    <!--[if gt IE 8]><!--><link href="<%= asset_path "moj-internal.css" %>" media="screen" rel="stylesheet" type="text/css" /><!--<![endif]-->
-    <!--[if IE 6]><link href="<%= asset_path "moj-internal-ie6.css" %>" media="screen" rel="stylesheet" type="text/css" /><![endif]-->
-    <!--[if IE 7]><link href="<%= asset_path "moj-internal-ie7.css" %>" media="screen" rel="stylesheet" type="text/css" /><![endif]-->
-    <!--[if IE 8]><link href="<%= asset_path "moj-internal-ie8.css" %>" media="screen" rel="stylesheet" type="text/css" /><![endif]-->
+    <!--[if gt IE 8]><!--><link href="<%= asset_path "moj-internal.css" %>" media="all" rel="stylesheet" type="text/css" /><!--<![endif]-->
+    <!--[if IE 6]><link href="<%= asset_path "moj-internal-ie6.css" %>" media="all" rel="stylesheet" type="text/css" /><![endif]-->
+    <!--[if IE 7]><link href="<%= asset_path "moj-internal-ie7.css" %>" media="all" rel="stylesheet" type="text/css" /><![endif]-->
+    <!--[if IE 8]><link href="<%= asset_path "moj-internal-ie8.css" %>" media="all" rel="stylesheet" type="text/css" /><![endif]-->
 
     <!--[if lt IE 9]>
       <script src="<%= asset_path "ie.js" %>" type="text/javascript"></script>
@@ -64,10 +64,11 @@
       <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 'moj_logotype_crest.png' %>" width="61" height="50" alt="">
-              <%= content_for?(:app_name) ? yield(:app_name) : "Ministry of Justice" %>
-            </a>
+            <a href="/" title="Go to the homepage" id="logo" class="content"><img src="<%= asset_path 'moj_logo_horizontal_36x246.png' %>"
+                   width="36" height="246" alt="Ministry of Justice"></a>
+          </div>
+          <div class="header-app-name">
+            <%= config_item(:app_title) %>
           </div>
           <div id="log-in-out">
             <%= yield :log_in_out %>
@@ -107,8 +108,6 @@
 
     <div id="global-app-error" class="app-error hidden"></div>
 
-    <script src="<%= asset_path "moj.js" %>" type="text/javascript"></script>
-
     <%= yield :body_end %>
   </body>
 </html>

data/app/views/layouts/partials/_phase.html.erb

@@ -0,0 +1,14 @@
+<div class="inner-block">
+  <div class="phase-banner">
+    <p>
+    <strong class="phase-tag"><%= config_item(:phase).to_s.upcase %>:</strong>
+  <span>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.</span>
+    </p>
+  </div>
+</div>

data/lib/moj_internal_template/engine.rb

@@ -2,10 +2,11 @@ module MojInternalTemplate
   class Engine < ::Rails::Engine
     initializer "moj_internal_template.assets.precompile" do |app|
       app.config.assets.paths << Engine.root.join("app", "assets", "fonts")
-      app.config.assets.precompile += %w(
-        moj-internal*.css
-        moj.js
-      )
+      app.config.assets.precompile += [
+        /moj-internal.*\.css$/,
+        /moj\.js$/,
+        /\.(?:svg|eot|woff|ttf)$/
+      ]
     end
   end
 end

data/lib/moj_internal_template/version.rb

@@ -1,3 +1,3 @@
 module MojInternalTemplate
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: moj_internal_template
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -101,12 +101,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENCE.txt
-- README.md
 - app/assets/fonts/Bliss2Rg.eot
 - app/assets/fonts/Bliss2Rg.ttf
 - app/assets/fonts/Bliss2Rg.woff
-- app/assets/images/moj_logotype_crest.png
+- app/assets/images/moj_logo_horizontal_36x246.png
 - app/assets/javascripts/modules/moj.cookie-message.js
 - app/assets/javascripts/modules/moj.tabs.js
 - app/assets/javascripts/moj.js
@@ -126,16 +124,15 @@ files:
 - app/assets/stylesheets/elements/forms/_form-chunky-labels.scss
 - app/assets/stylesheets/elements/forms/_form-date-of-birth.scss
 - app/assets/stylesheets/elements/forms/_form-validation.scss
+- app/assets/stylesheets/moj/_fonts.scss
+- app/assets/stylesheets/moj/_header.scss
+- app/assets/stylesheets/moj/_typography.scss
 - app/assets/stylesheets/moj-internal-ie6.scss
 - app/assets/stylesheets/moj-internal-ie7.scss
 - app/assets/stylesheets/moj-internal-ie8.scss
 - app/assets/stylesheets/moj-internal.scss
-- app/assets/stylesheets/moj/_fonts.scss
-- app/assets/stylesheets/moj/_header.scss
-- app/assets/stylesheets/moj/_typography.scss
 - app/helpers/moj_helper.rb
 - app/views/layouts/moj_internal_template.html.erb
-- app/views/layouts/partials/_after_header.html.erb
 - app/views/layouts/partials/_body_classes.html.erb
 - app/views/layouts/partials/_body_end.html.erb
 - app/views/layouts/partials/_content.html.erb
@@ -143,10 +140,13 @@ files:
 - app/views/layouts/partials/_footer_support_links.html.erb
 - app/views/layouts/partials/_header_class.html.erb
 - app/views/layouts/partials/_page_title.html.erb
-- lib/moj_internal_template.rb
+- app/views/layouts/partials/_phase.html.erb
 - lib/moj_internal_template/engine.rb
 - lib/moj_internal_template/version.rb
-homepage: https://github.com/ministryofjustice/moj_internal_emplate
+- lib/moj_internal_template.rb
+- LICENCE.txt
+- README.md
+homepage: https://github.com/ministryofjustice/moj_internal_template
 licenses:
 - MIT
 metadata: {}
@@ -156,17 +156,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: MoJ internal template

data/app/views/layouts/partials/_after_header.html.erb

@@ -1,14 +0,0 @@
-<div class="indicator cf">
-      <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>
-    </div>
-
-    <%= yield :after_header %>