moj_template 0.15.0 → 0.16.0

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.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/govuk-template-ie6.css.erb +102 -106
  3. data/app/assets/stylesheets/govuk-template-ie7.css.erb +101 -103
  4. data/app/assets/stylesheets/govuk-template-ie8.css.erb +96 -97
  5. data/app/assets/stylesheets/govuk-template.css.erb +120 -141
  6. data/app/assets/stylesheets/moj-template-ie6.css.erb +1 -48
  7. data/app/assets/stylesheets/moj-template-ie7.css.erb +1 -48
  8. data/app/assets/stylesheets/moj-template-ie8.css.erb +1 -48
  9. data/app/assets/stylesheets/moj-template.css.erb +1 -48
  10. data/app/views/layouts/moj_template.html.erb +24 -29
  11. data/lib/moj_template/version.rb +1 -1
  12. metadata +4 -6
  13. data/app/assets/stylesheets/images/separator-2x.png +0 -0
  14. data/app/assets/stylesheets/images/separator.png +0 -0
data/app/assets/stylesheets/moj-template-ie6.css.erb CHANGED
@@ -241,60 +241,13 @@ h2, h3, h4 {
241
241
  #wrapper {
242
242
  background-color: white;
243
243
  padding: 0 0 60px 0;
244
- border-bottom: 10px solid #0b0c0c; }
245
- body.alpha #wrapper {
246
- border-color: #d53880; }
247
- body.beta #wrapper {
248
- border-color: #f47738; }
244
+ border-bottom: 10px solid #005ea5; }
249
245
 
250
246
  .inner {
251
247
  width: auto;
252
248
  padding: 0 1em;
253
249
  padding: 0 2em; }
254
250
 
255
- body.alpha .indicator {
256
- padding: 8px 0;
257
- background-color: #d53880; }
258
- body.alpha .indicator p {
259
- max-width: 960px;
260
- margin: 0 auto;
261
- padding: 0 15px;
262
- color: #0b0c0c;
263
- font-family: "nta", Arial, sans-serif;
264
- font-size: 16px;
265
- line-height: 1.25;
266
- font-weight: 300;
267
- text-transform: none; }
268
- @media (max-width: 640px) {
269
- body.alpha .indicator p {
270
- font-size: 14px;
271
- line-height: 1.14286; } }
272
- body.alpha .indicator a, body.alpha .indicator a:link, body.alpha .indicator a:visited, body.alpha .indicator a:active {
273
- color: #0b0c0c; }
274
- body.alpha .indicator a:hover {
275
- color: #0b0c0c; }
276
- body.beta .indicator {
277
- padding: 8px 0;
278
- background-color: #f47738; }
279
- body.beta .indicator p {
280
- max-width: 960px;
281
- margin: 0 auto;
282
- padding: 0 15px;
283
- color: #0b0c0c;
284
- font-family: "nta", Arial, sans-serif;
285
- font-size: 16px;
286
- line-height: 1.25;
287
- font-weight: 300;
288
- text-transform: none; }
289
- @media (max-width: 640px) {
290
- body.beta .indicator p {
291
- font-size: 14px;
292
- line-height: 1.14286; } }
293
- body.beta .indicator a, body.beta .indicator a:link, body.beta .indicator a:visited, body.beta .indicator a:active {
294
- color: #0b0c0c; }
295
- body.beta .indicator a:hover {
296
- color: #0b0c0c; }
297
-
298
251
  #global-header .header-proposition {
299
252
  padding-top: 8px; }
300
253
  #global-header .header-proposition #proposition-name {
data/app/assets/stylesheets/moj-template-ie7.css.erb CHANGED
@@ -241,60 +241,13 @@ h2, h3, h4 {
241
241
  #wrapper {
242
242
  background-color: white;
243
243
  padding: 0 0 60px 0;
244
- border-bottom: 10px solid #0b0c0c; }
245
- body.alpha #wrapper {
246
- border-color: #d53880; }
247
- body.beta #wrapper {
248
- border-color: #f47738; }
244
+ border-bottom: 10px solid #005ea5; }
249
245
 
250
246
  .inner {
251
247
  width: auto;
252
248
  padding: 0 1em;
253
249
  padding: 0 2em; }
254
250
 
255
- body.alpha .indicator {
256
- padding: 8px 0;
257
- background-color: #d53880; }
258
- body.alpha .indicator p {
259
- max-width: 960px;
260
- margin: 0 auto;
261
- padding: 0 15px;
262
- color: #0b0c0c;
263
- font-family: "nta", Arial, sans-serif;
264
- font-size: 16px;
265
- line-height: 1.25;
266
- font-weight: 300;
267
- text-transform: none; }
268
- @media (max-width: 640px) {
269
- body.alpha .indicator p {
270
- font-size: 14px;
271
- line-height: 1.14286; } }
272
- body.alpha .indicator a, body.alpha .indicator a:link, body.alpha .indicator a:visited, body.alpha .indicator a:active {
273
- color: #0b0c0c; }
274
- body.alpha .indicator a:hover {
275
- color: #0b0c0c; }
276
- body.beta .indicator {
277
- padding: 8px 0;
278
- background-color: #f47738; }
279
- body.beta .indicator p {
280
- max-width: 960px;
281
- margin: 0 auto;
282
- padding: 0 15px;
283
- color: #0b0c0c;
284
- font-family: "nta", Arial, sans-serif;
285
- font-size: 16px;
286
- line-height: 1.25;
287
- font-weight: 300;
288
- text-transform: none; }
289
- @media (max-width: 640px) {
290
- body.beta .indicator p {
291
- font-size: 14px;
292
- line-height: 1.14286; } }
293
- body.beta .indicator a, body.beta .indicator a:link, body.beta .indicator a:visited, body.beta .indicator a:active {
294
- color: #0b0c0c; }
295
- body.beta .indicator a:hover {
296
- color: #0b0c0c; }
297
-
298
251
  #global-header .header-proposition {
299
252
  padding-top: 8px; }
300
253
  #global-header .header-proposition #proposition-name {
data/app/assets/stylesheets/moj-template-ie8.css.erb CHANGED
@@ -237,60 +237,13 @@ h2, h3, h4 {
237
237
  #wrapper {
238
238
  background-color: white;
239
239
  padding: 0 0 60px 0;
240
- border-bottom: 10px solid #0b0c0c; }
241
- body.alpha #wrapper {
242
- border-color: #d53880; }
243
- body.beta #wrapper {
244
- border-color: #f47738; }
240
+ border-bottom: 10px solid #005ea5; }
245
241
 
246
242
  .inner {
247
243
  width: auto;
248
244
  padding: 0 1em;
249
245
  padding: 0 2em; }
250
246
 
251
- body.alpha .indicator {
252
- padding: 8px 0;
253
- background-color: #d53880; }
254
- body.alpha .indicator p {
255
- max-width: 960px;
256
- margin: 0 auto;
257
- padding: 0 15px;
258
- color: #0b0c0c;
259
- font-family: "nta", Arial, sans-serif;
260
- font-size: 16px;
261
- line-height: 1.25;
262
- font-weight: 300;
263
- text-transform: none; }
264
- @media (max-width: 640px) {
265
- body.alpha .indicator p {
266
- font-size: 14px;
267
- line-height: 1.14286; } }
268
- body.alpha .indicator a, body.alpha .indicator a:link, body.alpha .indicator a:visited, body.alpha .indicator a:active {
269
- color: #0b0c0c; }
270
- body.alpha .indicator a:hover {
271
- color: #0b0c0c; }
272
- body.beta .indicator {
273
- padding: 8px 0;
274
- background-color: #f47738; }
275
- body.beta .indicator p {
276
- max-width: 960px;
277
- margin: 0 auto;
278
- padding: 0 15px;
279
- color: #0b0c0c;
280
- font-family: "nta", Arial, sans-serif;
281
- font-size: 16px;
282
- line-height: 1.25;
283
- font-weight: 300;
284
- text-transform: none; }
285
- @media (max-width: 640px) {
286
- body.beta .indicator p {
287
- font-size: 14px;
288
- line-height: 1.14286; } }
289
- body.beta .indicator a, body.beta .indicator a:link, body.beta .indicator a:visited, body.beta .indicator a:active {
290
- color: #0b0c0c; }
291
- body.beta .indicator a:hover {
292
- color: #0b0c0c; }
293
-
294
247
  #global-header .header-proposition {
295
248
  padding-top: 8px; }
296
249
  #global-header .header-proposition #proposition-name {
data/app/assets/stylesheets/moj-template.css.erb CHANGED
@@ -243,11 +243,7 @@ h2, h3, h4 {
243
243
  #wrapper {
244
244
  background-color: white;
245
245
  padding: 0 0 60px 0;
246
- border-bottom: 10px solid #0b0c0c; }
247
- body.alpha #wrapper {
248
- border-color: #d53880; }
249
- body.beta #wrapper {
250
- border-color: #f47738; }
246
+ border-bottom: 10px solid #005ea5; }
251
247
 
252
248
  .inner {
253
249
  width: auto;
@@ -256,49 +252,6 @@ h2, h3, h4 {
256
252
  .inner {
257
253
  padding: 0 2em; } }
258
254
 
259
- body.alpha .indicator {
260
- padding: 8px 0;
261
- background-color: #d53880; }
262
- body.alpha .indicator p {
263
- max-width: 960px;
264
- margin: 0 auto;
265
- padding: 0 15px;
266
- color: #0b0c0c;
267
- font-family: "nta", Arial, sans-serif;
268
- font-size: 16px;
269
- line-height: 1.25;
270
- font-weight: 300;
271
- text-transform: none; }
272
- @media (max-width: 640px) {
273
- body.alpha .indicator p {
274
- font-size: 14px;
275
- line-height: 1.14286; } }
276
- body.alpha .indicator a, body.alpha .indicator a:link, body.alpha .indicator a:visited, body.alpha .indicator a:active {
277
- color: #0b0c0c; }
278
- body.alpha .indicator a:hover {
279
- color: #0b0c0c; }
280
- body.beta .indicator {
281
- padding: 8px 0;
282
- background-color: #f47738; }
283
- body.beta .indicator p {
284
- max-width: 960px;
285
- margin: 0 auto;
286
- padding: 0 15px;
287
- color: #0b0c0c;
288
- font-family: "nta", Arial, sans-serif;
289
- font-size: 16px;
290
- line-height: 1.25;
291
- font-weight: 300;
292
- text-transform: none; }
293
- @media (max-width: 640px) {
294
- body.beta .indicator p {
295
- font-size: 14px;
296
- line-height: 1.14286; } }
297
- body.beta .indicator a, body.beta .indicator a:link, body.beta .indicator a:visited, body.beta .indicator a:active {
298
- color: #0b0c0c; }
299
- body.beta .indicator a:hover {
300
- color: #0b0c0c; }
301
-
302
255
  @media (min-width: 769px) {
303
256
  #global-header .header-proposition {
304
257
  padding-top: 8px; } }
data/app/views/layouts/moj_template.html.erb CHANGED
@@ -72,13 +72,28 @@
72
72
  </div>
73
73
  </div>
74
74
 
75
+ <div id="global-cookie-message">
76
+ <div class="outer-block">
77
+ <div class="inner-block">
78
+
79
+ <% if content_for?(:cookie_message) %>
80
+ <%= yield :cookie_message %>
81
+ <% else %>
82
+ <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>
83
+ <% end %>
84
+
85
+ </div>
86
+ </div>
87
+ </div>
88
+ <!--end global-cookie-message-->
89
+
75
90
 
76
91
  <header role="banner" id="global-header" class="with-proposition <%= yield :header_class %>">
77
92
  <div class="header-wrapper">
78
93
  <div class="header-global">
79
94
  <div class="header-logo">
80
95
  <a href="https://www.gov.uk/" title="Go to the GOV.UK homepage" id="logo" class="content">
81
- <img src="<%= asset_path "gov.uk_logotype_crown.png" %>" alt=""> GOV.UK
96
+ <img src="<%= asset_path "gov.uk_logotype_crown.png" %>" width="35" height="31" alt=""> GOV.UK
82
97
  </a>
83
98
  </div>
84
99
  <%= yield :inside_header %>
@@ -100,34 +115,14 @@
100
115
 
101
116
 
102
117
  <!--[if lte IE 6]><script>document.body.className = document.body.className.replace('js-enabled','');</script><![endif]-->
103
- <div class="indicator cf">
104
- <% if content_for?(:feedback_link_override) %>
105
- <%= yield(:feedback_link_override) %>
106
- <% else %>
107
- <p>
108
- <strong><%= config_item(:phase).to_s.capitalize %>:</strong>
109
- This is a new service -
110
- <% if content_for?(:feedback_link) %>
111
- <%= yield(:feedback_link) %>
112
- <% else %>
113
- <a href="<%= "#{config_item(:feedback_url)}" %>">your feedback</a>
114
- <% end %>
115
- will help us to improve it
116
- </p>
117
- <% end %>
118
- </div>
119
-
120
118
  <%= yield :after_header %>
121
119
 
122
- <div id="global-cookie-message">
123
-
124
- <% if content_for?(:cookie_message) %>
125
- <%= yield :cookie_message %>
126
- <% else %>
127
- <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>
128
- <% end %>
129
-
120
+ <div id="global-header-bar">
121
+ <div class="inner-block">
122
+ <div class="header-bar"></div>
123
+ </div>
130
124
  </div>
125
+ <!--end global-header-bar-->
131
126
 
132
127
  <% if content_for?(:content_override) %>
133
128
  <%= yield(:content_override) %>
@@ -165,13 +160,13 @@
165
160
  </ul>
166
161
 
167
162
  <div class="open-government-licence">
168
- <h2><a href="http://www.nationalarchives.gov.uk/doc/open-government-licence/version/2">Open Government Licence</a></h2>
169
- <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>
163
+ <h2><a href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/2/">Open Government Licence</a></h2>
164
+ <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>
170
165
  </div>
171
166
  </div>
172
167
 
173
168
  <div class="copyright">
174
- <a href="http://www.nationalarchives.gov.uk/information-management/our-services/crown-copyright.htm">&copy; Crown copyright</a>
169
+ <a href="https://www.nationalarchives.gov.uk/information-management/our-services/crown-copyright.htm">&copy; Crown copyright</a>
175
170
  </div>
176
171
  </div>
177
172
  </div>
data/lib/moj_template/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module MojTemplate
2
- VERSION = "0.15.0"
2
+ VERSION = "0.16.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: moj_template
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.15.0
4
+ version: 0.16.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dom Smith
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-30 00:00:00.000000000 Z
11
+ date: 2014-08-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -72,14 +72,14 @@ dependencies:
72
72
  requirements:
73
73
  - - '='
74
74
  - !ruby/object:Gem::Version
75
- version: 0.6.2
75
+ version: 0.8.1
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - '='
81
81
  - !ruby/object:Gem::Version
82
- version: 0.6.2
82
+ version: 0.8.1
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: govuk_frontend_toolkit
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -159,8 +159,6 @@ files:
159
159
  - app/assets/stylesheets/images/govuk-crest.png
160
160
  - app/assets/stylesheets/images/govuk-crest-ie.png
161
161
  - app/assets/stylesheets/images/open-government-licence_2x.png
162
- - app/assets/stylesheets/images/separator-2x.png
163
- - app/assets/stylesheets/images/separator.png
164
162
  - app/assets/stylesheets/images/close.png
165
163
  - app/assets/stylesheets/govuk-template-ie8.css.erb
166
164
  - app/assets/stylesheets/external-links/external-link-24x24.png