moj_internal_template 0.1.0 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8818c08ab2b844412cb4138379139d5d837d813c
4
- data.tar.gz: 5222e1541a0cabd4760062338efefab87f770704
3
+ metadata.gz: f48bb26c4a814acd750bcb0a3f7bf96222cd598a
4
+ data.tar.gz: a408399a1a772789031ddf90eb4d5bef73b7a54c
5
5
  SHA512:
6
- metadata.gz: bbc7b0392d1948a9c301997a4a704e6e81bc29348fce3852bcdb14295a52644b43919f71f59a1f3dd952ffa065f078a9cd2d5513950c5ca475daa05f447ac222
7
- data.tar.gz: 21f5942145d4ccbec44acb233f3364f8a3e5dca95b87e0131d3afe3f869ae466e1df7696c2e830001413aad52ae3231814f0f6484faf796fddb728435b5eb94e
6
+ metadata.gz: 36437ceba2202bd69363d28b16cc655a647d21f00b8416f6274d54c68ab71f2c8a04f1d9600279dee6e0d066964dbf4b3cb9abb51cdaa53e1a982e4e09705e14
7
+ data.tar.gz: 02182e91c9b27f30bd6cbc7d939186c5421f304f35bafd89a6cd305adb2a8fed4e4f6cfe7b614aab934475b8eb2d2f0a7c5b9f3985d85101a8f25c49fdacc738
@@ -27,7 +27,6 @@
27
27
  // Fieldset is used to group more than one .form-group
28
28
  fieldset {
29
29
  width: 100%;
30
- float: left;
31
30
  clear: both;
32
31
  }
33
32
 
@@ -142,10 +141,19 @@ fieldset {
142
141
  .form-checkbox {
143
142
  display: block;
144
143
  margin: $gutter-half 0;
144
+ margin-bottom: 30px;
145
145
  }
146
146
  .form-checkbox input {
147
147
  vertical-align: middle;
148
148
  margin: -2px 5px 0 0;
149
+ width: 30px;
150
+ -webkit-appearance: checkbox;
151
+ }
152
+ .form-checkbox label {
153
+ display: inline;
154
+ font-weight: normal;
155
+ cursor: pointer;
156
+ font-size: 19px;
149
157
  }
150
158
 
151
159
  // Buttons
@@ -1,12 +1,7 @@
1
1
  @font-face {
2
2
  font-family: 'Bliss2';
3
- src: url('/assets/Bliss2Rg.eot'); /* IE9 Compat Modes */
4
- src: url('/assets/Bliss2Rg.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
5
- url('/assets/Bliss2Rg.woff') format('woff'), /* Modern Browsers */
6
- url('/assets/Bliss2Rg.ttf') format('truetype'), /* Safari, Android, iOS */
7
- url('/assets/Bliss2Rg.svg#svgBliss2Rg') format('svg'); /* Legacy iOS */
8
- }
9
-
10
- body {
11
- font-family: 'Bliss2', arial, sans-serif;
3
+ src: font-url('Bliss2Rg.eot'); /* IE9 Compat Modes */
4
+ src: font-url('Bliss2Rg.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
5
+ font-url('Bliss2Rg.woff') format('woff'), /* Modern Browsers */
6
+ font-url('Bliss2Rg.ttf') format('truetype') /* Safari, Android, iOS */
12
7
  }
@@ -2,8 +2,8 @@
2
2
  @import '_conditionals';
3
3
  @import '_measurements';
4
4
 
5
- $header-background-color: #f7f7ed;
6
- $header-foreground-color: $black;
5
+ $header-background-color: black;
6
+ $header-foreground-color: white;
7
7
 
8
8
  #global-header {
9
9
  background-color: $header-background-color;
@@ -11,6 +11,7 @@ $header-foreground-color: $black;
11
11
 
12
12
  .header-wrapper {
13
13
  background-color: $header-background-color;
14
+ color: $header-foreground-color;
14
15
  max-width: 990px;
15
16
  margin: 0 auto;
16
17
  padding-top: 8px;
@@ -45,6 +46,18 @@ $header-foreground-color: $black;
45
46
  .header-logo {
46
47
  margin: 5px 0 2px;
47
48
  }
49
+
50
+ .header-app-name {
51
+ float: left;
52
+ text-align: center;
53
+ font-size: 28px;
54
+ font-weight: bold;
55
+ margin: 0 15px;
56
+
57
+ @include media(desktop){
58
+ width: 33.33%;
59
+ }
60
+ }
48
61
  }
49
62
  }
50
63
 
@@ -57,7 +70,6 @@ $header-foreground-color: $black;
57
70
  overflow: visible;
58
71
  vertical-align: baseline;
59
72
 
60
- color: $header-foreground-color;
61
73
  font-weight: bold;
62
74
  font-size: 30px;
63
75
  line-height: 1em;
@@ -68,10 +80,10 @@ $header-foreground-color: $black;
68
80
 
69
81
  img {
70
82
  position: relative;
71
- top: -2px;
83
+ top: -5px;
72
84
 
73
- width: 35px;
74
- height: 31px;
85
+ width: 246px;
86
+ height: 36px;
75
87
 
76
88
  padding-right: 6px;
77
89
 
@@ -84,8 +96,8 @@ $header-foreground-color: $black;
84
96
  &:hover,
85
97
  &:focus {
86
98
  text-decoration: none;
87
- border-bottom: 1px solid;
88
- padding-bottom: 0;
99
+ border-bottom: none;
100
+ padding-bottom: 1px;
89
101
  }
90
102
 
91
103
  &:active {
@@ -96,7 +108,7 @@ $header-foreground-color: $black;
96
108
  #log-in-out {
97
109
  font-size: 16px;
98
110
  float: right;
99
- margin-top: 15px;
111
+ margin-top: 12px;
100
112
  margin-right: 15px;
101
113
 
102
114
  a {
@@ -117,8 +129,7 @@ $header-foreground-color: $black;
117
129
  @include inner-block;
118
130
  }
119
131
  .header-bar {
120
- height: 10px;
121
- background-color: $header-foreground-color;
132
+ height: 0px;
122
133
  @include ie-lte(8) {
123
134
  font-size: 0;
124
135
  }
@@ -6,9 +6,24 @@
6
6
 
7
7
  @import "fonts";
8
8
 
9
+ @mixin bliss() {
10
+ font-family: "Bliss2", Arial, sans-serif;
11
+ }
12
+
9
13
  body {
10
14
  @include core-19;
11
- font-family: "Bliss2", Arial, sans-serif;
15
+ @include bliss;
16
+ }
17
+
18
+ // override things that don't inherit their font
19
+ .form-control,
20
+ .form-label,
21
+ .form-label-bold,
22
+ #global-cookie-message p,
23
+ button.button,
24
+ table th,
25
+ table td {
26
+ @include bliss;
12
27
  }
13
28
 
14
29
  // Text
@@ -35,6 +50,9 @@ p {
35
50
  max-width: 30em;
36
51
  }
37
52
 
53
+ form .text {
54
+ max-width: none;
55
+ }
38
56
 
39
57
  // Code styles
40
58
  pre,
@@ -1,7 +1,7 @@
1
1
  <%= yield :top_of_page %>
2
2
  <!DOCTYPE html>
3
- <!--[if lt IE 9]><html class="lte-ie8" lang="<%= content_for?(:html_lang) ? yield(:html_lang) : "en" %>"><![endif]-->
4
- <!--[if gt IE 8]><!--><html lang="<%= content_for?(:html_lang) ? yield(:html_lang) : "en" %>"><!--<![endif]-->
3
+ <!--[if lt IE 9]><html class="lte-ie8" lang="<%= content_for?(:html_lang) ? yield(:html_lang) : "en" %>" <%= yield(:html_attributes) %>><![endif]-->
4
+ <!--[if gt IE 8]><!--><html lang="<%= content_for?(:html_lang) ? yield(:html_lang) : "en" %>" <%= yield(:html_attributes) %>><!--<![endif]-->
5
5
  <head>
6
6
  <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
7
7
 
@@ -11,10 +11,10 @@
11
11
  (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);}})();
12
12
  </script>
13
13
 
14
- <!--[if gt IE 8]><!--><link href="<%= asset_path "moj-internal.css" %>" media="screen" rel="stylesheet" type="text/css" /><!--<![endif]-->
15
- <!--[if IE 6]><link href="<%= asset_path "moj-internal-ie6.css" %>" media="screen" rel="stylesheet" type="text/css" /><![endif]-->
16
- <!--[if IE 7]><link href="<%= asset_path "moj-internal-ie7.css" %>" media="screen" rel="stylesheet" type="text/css" /><![endif]-->
17
- <!--[if IE 8]><link href="<%= asset_path "moj-internal-ie8.css" %>" media="screen" rel="stylesheet" type="text/css" /><![endif]-->
14
+ <!--[if gt IE 8]><!--><link href="<%= asset_path "moj-internal.css" %>" media="all" rel="stylesheet" type="text/css" /><!--<![endif]-->
15
+ <!--[if IE 6]><link href="<%= asset_path "moj-internal-ie6.css" %>" media="all" rel="stylesheet" type="text/css" /><![endif]-->
16
+ <!--[if IE 7]><link href="<%= asset_path "moj-internal-ie7.css" %>" media="all" rel="stylesheet" type="text/css" /><![endif]-->
17
+ <!--[if IE 8]><link href="<%= asset_path "moj-internal-ie8.css" %>" media="all" rel="stylesheet" type="text/css" /><![endif]-->
18
18
 
19
19
  <!--[if lt IE 9]>
20
20
  <script src="<%= asset_path "ie.js" %>" type="text/javascript"></script>
@@ -64,10 +64,11 @@
64
64
  <div class="header-wrapper">
65
65
  <div class="header-global">
66
66
  <div class="header-logo">
67
- <a href="https://www.gov.uk/" title="Go to the GOV.UK homepage" id="logo" class="content">
68
- <img src="<%= asset_path 'moj_logotype_crest.png' %>" width="61" height="50" alt="">
69
- <%= content_for?(:app_name) ? yield(:app_name) : "Ministry of Justice" %>
70
- </a>
67
+ <a href="/" title="Go to the homepage" id="logo" class="content"><img src="<%= asset_path 'moj_logo_horizontal_36x246.png' %>"
68
+ width="36" height="246" alt="Ministry of Justice"></a>
69
+ </div>
70
+ <div class="header-app-name">
71
+ <%= config_item(:app_title) %>
71
72
  </div>
72
73
  <div id="log-in-out">
73
74
  <%= yield :log_in_out %>
@@ -107,8 +108,6 @@
107
108
 
108
109
  <div id="global-app-error" class="app-error hidden"></div>
109
110
 
110
- <script src="<%= asset_path "moj.js" %>" type="text/javascript"></script>
111
-
112
111
  <%= yield :body_end %>
113
112
  </body>
114
113
  </html>
@@ -0,0 +1,14 @@
1
+ <div class="inner-block">
2
+ <div class="phase-banner">
3
+ <p>
4
+ <strong class="phase-tag"><%= config_item(:phase).to_s.upcase %>:</strong>
5
+ <span>This is a new service -
6
+ <% if content_for?(:feedback_link) %>
7
+ <%= yield(:feedback_link) %>
8
+ <% else %>
9
+ <a href="<%= "#{config_item(:feedback_url)}" %>">your feedback</a>
10
+ <% end %>
11
+ will help us to improve it.</span>
12
+ </p>
13
+ </div>
14
+ </div>
@@ -2,10 +2,11 @@ module MojInternalTemplate
2
2
  class Engine < ::Rails::Engine
3
3
  initializer "moj_internal_template.assets.precompile" do |app|
4
4
  app.config.assets.paths << Engine.root.join("app", "assets", "fonts")
5
- app.config.assets.precompile += %w(
6
- moj-internal*.css
7
- moj.js
8
- )
5
+ app.config.assets.precompile += [
6
+ /moj-internal.*\.css$/,
7
+ /moj\.js$/,
8
+ /\.(?:svg|eot|woff|ttf)$/
9
+ ]
9
10
  end
10
11
  end
11
12
  end
@@ -1,3 +1,3 @@
1
1
  module MojInternalTemplate
2
- VERSION = "0.1.0"
2
+ VERSION = "0.1.1"
3
3
  end
metadata CHANGED
@@ -1,41 +1,41 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: moj_internal_template
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Paul Battley
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-01 00:00:00.000000000 Z
11
+ date: 2014-10-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ~>
18
18
  - !ruby/object:Gem::Version
19
19
  version: '4'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ~>
25
25
  - !ruby/object:Gem::Version
26
26
  version: '4'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ~>
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ~>
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
@@ -101,12 +101,10 @@ executables: []
101
101
  extensions: []
102
102
  extra_rdoc_files: []
103
103
  files:
104
- - LICENCE.txt
105
- - README.md
106
104
  - app/assets/fonts/Bliss2Rg.eot
107
105
  - app/assets/fonts/Bliss2Rg.ttf
108
106
  - app/assets/fonts/Bliss2Rg.woff
109
- - app/assets/images/moj_logotype_crest.png
107
+ - app/assets/images/moj_logo_horizontal_36x246.png
110
108
  - app/assets/javascripts/modules/moj.cookie-message.js
111
109
  - app/assets/javascripts/modules/moj.tabs.js
112
110
  - app/assets/javascripts/moj.js
@@ -126,16 +124,15 @@ files:
126
124
  - app/assets/stylesheets/elements/forms/_form-chunky-labels.scss
127
125
  - app/assets/stylesheets/elements/forms/_form-date-of-birth.scss
128
126
  - app/assets/stylesheets/elements/forms/_form-validation.scss
127
+ - app/assets/stylesheets/moj/_fonts.scss
128
+ - app/assets/stylesheets/moj/_header.scss
129
+ - app/assets/stylesheets/moj/_typography.scss
129
130
  - app/assets/stylesheets/moj-internal-ie6.scss
130
131
  - app/assets/stylesheets/moj-internal-ie7.scss
131
132
  - app/assets/stylesheets/moj-internal-ie8.scss
132
133
  - app/assets/stylesheets/moj-internal.scss
133
- - app/assets/stylesheets/moj/_fonts.scss
134
- - app/assets/stylesheets/moj/_header.scss
135
- - app/assets/stylesheets/moj/_typography.scss
136
134
  - app/helpers/moj_helper.rb
137
135
  - app/views/layouts/moj_internal_template.html.erb
138
- - app/views/layouts/partials/_after_header.html.erb
139
136
  - app/views/layouts/partials/_body_classes.html.erb
140
137
  - app/views/layouts/partials/_body_end.html.erb
141
138
  - app/views/layouts/partials/_content.html.erb
@@ -143,10 +140,13 @@ files:
143
140
  - app/views/layouts/partials/_footer_support_links.html.erb
144
141
  - app/views/layouts/partials/_header_class.html.erb
145
142
  - app/views/layouts/partials/_page_title.html.erb
146
- - lib/moj_internal_template.rb
143
+ - app/views/layouts/partials/_phase.html.erb
147
144
  - lib/moj_internal_template/engine.rb
148
145
  - lib/moj_internal_template/version.rb
149
- homepage: https://github.com/ministryofjustice/moj_internal_emplate
146
+ - lib/moj_internal_template.rb
147
+ - LICENCE.txt
148
+ - README.md
149
+ homepage: https://github.com/ministryofjustice/moj_internal_template
150
150
  licenses:
151
151
  - MIT
152
152
  metadata: {}
@@ -156,17 +156,17 @@ require_paths:
156
156
  - lib
157
157
  required_ruby_version: !ruby/object:Gem::Requirement
158
158
  requirements:
159
- - - ">="
159
+ - - '>='
160
160
  - !ruby/object:Gem::Version
161
161
  version: '0'
162
162
  required_rubygems_version: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ">="
164
+ - - '>='
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  requirements: []
168
168
  rubyforge_project:
169
- rubygems_version: 2.2.2
169
+ rubygems_version: 2.0.14
170
170
  signing_key:
171
171
  specification_version: 4
172
172
  summary: MoJ internal template
@@ -1,14 +0,0 @@
1
- <div class="indicator cf">
2
- <p>
3
- <strong><%= config_item(:phase).to_s.capitalize %>:</strong>
4
- This is a new service -
5
- <% if content_for?(:feedback_link) %>
6
- <%= yield(:feedback_link) %>
7
- <% else %>
8
- <a href="<%= "#{config_item(:feedback_url)}" %>">your feedback</a>
9
- <% end %>
10
- will help us to improve it
11
- </p>
12
- </div>
13
-
14
- <%= yield :after_header %>