moj_template 0.10.0 → 0.10.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/moj-template.css.erb +70 -64
  3. data/app/views/layouts/moj_template.html.erb +11 -6
  4. data/lib/moj_template/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b477f0b899f8783a63ef25740d16a079f1a9d3c7
4
- data.tar.gz: b8ee9958abbffe94f3af18c111d5e85fc766e1f7
3
+ metadata.gz: c5bcbe4bca302db93fd3d96d7db5d18a983cf28d
4
+ data.tar.gz: 51607de6dbc4291ff08624b3e12317f6f192c9b7
5
5
  SHA512:
6
- metadata.gz: 6aabdc3db3b93a300b490fdea237c2148558523e4fbda753c17697852d38fc75496ba4e55750c17243615296e78faec8b316a6b34195bbd5e68bc943f5c8288d
7
- data.tar.gz: 98990f067f2f37e1434304427f70f3690c1488ca9501d0a7b829705a278fed19fadc4401e3b742331daac03b8fc643259aa714eed267e7d9ad8e711220759987
6
+ metadata.gz: 4adf78d036e49a51970b86229ab3ff9b6f392885f5db4c567118a87f7f9f3544db9823a2f600c5f42307f1fe844255620a64042f7e5b56c76b07af87255664f4
7
+ data.tar.gz: bab41f047ee4098d4e5ef0994334ff19029c2738ffa08e6ea6d23ae33ff3d256b07ab39b8c108c92bd16030a5310d7f0aec0cadf43a0794a2ccaa3c14da8b27f
data/app/assets/stylesheets/moj-template.css.erb CHANGED
@@ -299,70 +299,59 @@ body.beta .indicator {
299
299
  body.beta .indicator a:hover {
300
300
  color: #0b0c0c; }
301
301
 
302
- .service-header {
303
- float: left;
304
- width: 66.6%;
305
- margin: 7px 0 2px; }
306
- .service-header a.service-name {
307
- font-family: "nta", Arial, sans-serif;
308
- font-size: 24px;
309
- line-height: 1em;
310
- font-weight: 400;
311
- text-transform: none;
312
- color: white;
313
- font-weight: bold;
314
- text-decoration: none;
315
- float: left;
316
- margin-top: 3px; }
317
- @media (max-width: 640px) {
318
- .service-header a.service-name {
319
- font-size: 20px;
320
- line-height: 1.2; } }
321
- .service-header a.service-name:hover {
322
- border-bottom: 1px solid white; }
323
- body.alpha .service-header a.service-phase {
324
- display: -moz-inline-stack;
325
- display: inline-block;
326
- background-color: #d53880;
327
- color: #fff;
328
- font-family: "nta", Arial, sans-serif;
329
- font-size: 16px;
330
- line-height: 1.25;
331
- font-weight: 300;
332
- text-transform: none;
333
- font-weight: 700;
334
- text-transform: uppercase;
335
- letter-spacing: 1px;
336
- text-decoration: none;
337
- margin: 3px 10px 0 5px;
338
- padding: 2px 5px 0; }
339
- @media (max-width: 640px) {
340
- body.alpha .service-header a.service-phase {
341
- font-size: 14px;
342
- line-height: 1.14286; } }
343
- body.beta .service-header a.service-phase {
344
- display: -moz-inline-stack;
345
- display: inline-block;
346
- background-color: #f47738;
347
- color: #fff;
348
- font-family: "nta", Arial, sans-serif;
349
- font-size: 16px;
350
- line-height: 1.25;
351
- font-weight: 300;
352
- text-transform: none;
353
- font-weight: 700;
354
- text-transform: uppercase;
355
- letter-spacing: 1px;
356
- text-decoration: none;
357
- margin: 3px 10px 0 5px;
358
- padding: 2px 5px 0; }
359
- @media (max-width: 640px) {
360
- body.beta .service-header a.service-phase {
361
- font-size: 14px;
362
- line-height: 1.14286; } }
363
- body.alpha .service-header a.service-phase, body.beta .service-header a.service-phase {
364
- margin-left: 1em;
365
- text-decoration: none; }
302
+ @media (min-width: 769px) {
303
+ #global-header .header-proposition {
304
+ padding-top: 8px; } }
305
+ #global-header .header-proposition #proposition-name {
306
+ line-height: 1em;
307
+ display: inline-block; }
308
+ #global-header .header-proposition #proposition-name:hover {
309
+ border-bottom: 1px solid white; }
310
+ body.alpha #global-header .header-proposition .proposition-phase {
311
+ display: -moz-inline-stack;
312
+ display: inline-block;
313
+ background-color: #d53880;
314
+ color: #fff;
315
+ font-family: "nta", Arial, sans-serif;
316
+ font-size: 16px;
317
+ line-height: 1.25;
318
+ font-weight: 300;
319
+ text-transform: none;
320
+ font-weight: 700;
321
+ text-transform: uppercase;
322
+ letter-spacing: 1px;
323
+ text-decoration: none;
324
+ margin: 3px 10px 0 5px;
325
+ padding: 2px 5px 0; }
326
+ @media (max-width: 640px) {
327
+ body.alpha #global-header .header-proposition .proposition-phase {
328
+ font-size: 14px;
329
+ line-height: 1.14286; } }
330
+ body.beta #global-header .header-proposition .proposition-phase {
331
+ display: -moz-inline-stack;
332
+ display: inline-block;
333
+ background-color: #f47738;
334
+ color: #fff;
335
+ font-family: "nta", Arial, sans-serif;
336
+ font-size: 16px;
337
+ line-height: 1.25;
338
+ font-weight: 300;
339
+ text-transform: none;
340
+ font-weight: 700;
341
+ text-transform: uppercase;
342
+ letter-spacing: 1px;
343
+ text-decoration: none;
344
+ margin: 3px 10px 0 5px;
345
+ padding: 2px 5px 0; }
346
+ @media (max-width: 640px) {
347
+ body.beta #global-header .header-proposition .proposition-phase {
348
+ font-size: 14px;
349
+ line-height: 1.14286; } }
350
+ body.alpha #global-header .header-proposition .proposition-phase, body.beta #global-header .header-proposition .proposition-phase {
351
+ margin-left: 1em;
352
+ text-decoration: none;
353
+ position: relative;
354
+ top: -3px; }
366
355
 
367
356
  #global-breadcrumb {
368
357
  background-color: white;
@@ -636,3 +625,20 @@ body.beta .indicator {
636
625
  #footer .footer-inside-government ul li {
637
626
  margin-right: 0;
638
627
  width: 100%; }
628
+
629
+ /* Phase indicator alignment fixes */
630
+ .indicator {
631
+ padding: 0.5em 2em !important;
632
+ /* Set alpha bar to white text */ }
633
+ @media (max-width: 640px) {
634
+ .indicator {
635
+ padding: 0.5em 1em !important; } }
636
+ .indicator p {
637
+ padding: 0 !important;
638
+ /* Set uppercase font for indicator phase */ }
639
+ .indicator p strong {
640
+ text-transform: uppercase; }
641
+ body.alpha .indicator p,
642
+ body.alpha .indicator a:visited,
643
+ body.alpha .indicator a:link {
644
+ color: white; }
data/app/views/layouts/moj_template.html.erb CHANGED
@@ -84,7 +84,7 @@
84
84
  </div>
85
85
 
86
86
 
87
- <header role="banner" id="global-header" class="<%= yield :header_class %>">
87
+ <header role="banner" id="global-header" class="with-proposition <%= yield :header_class %>">
88
88
  <div class="header-wrapper">
89
89
  <div class="header-global">
90
90
  <div class="header-logo">
@@ -92,13 +92,18 @@
92
92
  <img src="<%= asset_path "gov.uk_logotype_crown.png" %>" alt=""> GOV.UK
93
93
  </a>
94
94
  </div>
95
- <div class="service-header">
96
- <a href="/" class="service-name"><%= "#{config_item(:proposition_title)}" %></a>
97
- <% 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 %>
98
- </div>
99
95
  <%= yield :inside_header %>
100
96
  </div>
101
- <%= yield :proposition_header %>
97
+ <% if content_for?(:proposition_header) %>
98
+ <%= yield(:proposition_header) %>
99
+ <% else %>
100
+ <div class="header-proposition">
101
+ <div class="content">
102
+ <a href="/" id="proposition-name"><%= "#{config_item(:proposition_title)}" %></a>
103
+ <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>
104
+ </div>
105
+ </div>
106
+ <% end %>
102
107
  </div>
103
108
  </header>
104
109
  <!--end header-->
data/lib/moj_template/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module MojTemplate
2
- VERSION = "0.10.0"
2
+ VERSION = "0.10.1"
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.10.0
4
+ version: 0.10.1
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-03-11 00:00:00.000000000 Z
11
+ date: 2014-03-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails