govuk_template 0.17.0 → 0.17.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/govuk-template-ie6.css.erb +15 -20
  3. data/app/assets/stylesheets/govuk-template-ie7.css.erb +15 -20
  4. data/app/assets/stylesheets/govuk-template-ie8.css.erb +12 -17
  5. data/app/assets/stylesheets/govuk-template.css.erb +15 -26
  6. data/app/views/layouts/govuk_template.html.erb +6 -24
  7. data/lib/govuk_template/version.rb +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 080a8f4e46bcdcc310a44a62f3508973cf9a943c
4
- data.tar.gz: e4175cc6641fe1041830a96d2c55f1514b7a49fc
3
+ metadata.gz: 8084b09c3365b06e68b9c1089b72d470ce4c2690
4
+ data.tar.gz: ae8d906500452ac8f093d5e5a1b3ffcacdf33e6c
5
5
  SHA512:
6
- metadata.gz: 1be49dc0ebe66ee0e4eedca2d8404e0ec8a9911e4b105e042274038881063a33d647df52ba418d85d4f028e1220ed412c54a31658b0242afb3c3967d322fc781
7
- data.tar.gz: 283a849d153c769f41b1f70a1f54e4fb0ff328c3f41cfddc5759180e8717d97e63c91573ff40aa0616968fa5e2fd3e5d4798a0f88d09c5f68be68aeda63ad604
6
+ metadata.gz: 937e1e1aded143810fb7766d60e728fc8582f825295a4ddd3c099095118dacf987e1aa71d8db6f7fa185801d04cc8854bef00824a315364dd5d8f54027d77dc1
7
+ data.tar.gz: 3983d6707042c6be7c3bb5b3e71cd62561414dec135a649b2cd3afb39ef49a54865a227ebc65021e261a2dd611394a28cae36afaa44818a19eabf280561e4532
data/app/assets/stylesheets/govuk-template-ie6.css.erb CHANGED
@@ -28,15 +28,15 @@
28
28
  width: device-width; }
29
29
 
30
30
  #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-link,
31
- #global-header .header-proposition #proposition-links, #footer .footer-wrapper, #footer .footer-meta {
31
+ #global-header .header-proposition #proposition-links, #footer .footer-meta {
32
32
  zoom: 1; }
33
33
  #global-header .header-wrapper:after, #global-header .header-wrapper .header-global:after, #global-header .header-wrapper .header-global .header-logo:after, #global-header .header-proposition #proposition-link:after,
34
- #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
34
+ #global-header .header-proposition #proposition-links:after, #footer .footer-meta:after {
35
35
  content: "";
36
36
  display: block;
37
37
  clear: both; }
38
38
 
39
- #global-header-bar, #global-cookie-message p {
39
+ #global-header-bar, #global-cookie-message p, #footer .footer-wrapper {
40
40
  max-width: 960px;
41
41
  width: 960px;
42
42
  margin: 0 15px;
@@ -50,10 +50,10 @@
50
50
  width: device-width; }
51
51
 
52
52
  #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-link,
53
- #global-header .header-proposition #proposition-links, #footer .footer-wrapper, #footer .footer-meta {
53
+ #global-header .header-proposition #proposition-links, #footer .footer-meta {
54
54
  zoom: 1; }
55
55
  #global-header .header-wrapper:after, #global-header .header-wrapper .header-global:after, #global-header .header-wrapper .header-global .header-logo:after, #global-header .header-proposition #proposition-link:after,
56
- #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
56
+ #global-header .header-proposition #proposition-links:after, #footer .footer-meta:after {
57
57
  content: "";
58
58
  display: block;
59
59
  clear: both; }
@@ -65,7 +65,6 @@
65
65
  width: device-width; }
66
66
 
67
67
  /* local styleguide includes */
68
- /* Old depricated greys, new things should use the toolkit greys */
69
68
  html, body, button, input, table, td, th {
70
69
  font-family: "nta", Arial, sans-serif; }
71
70
 
@@ -148,6 +147,11 @@ a[rel="external"]:after {
148
147
  a[rel="external"]:after {
149
148
  background-image: url(<%= asset_path 'external-links/external-link-24x24.png' %>);
150
149
  background-size: 12px 400px; } }
150
+ a[rel="external"]:after {
151
+ content: "\A0\A0\A0\A0\A0";
152
+ background-position: right 3px; }
153
+ a[rel="external"]:hover:after {
154
+ background-position: right -385px; }
151
155
  a[rel="external"]:after {
152
156
  content: "\A0\A0\A0\A0";
153
157
  background-position: right 6px; }
@@ -319,10 +323,10 @@ button:focus,
319
323
  width: device-width; }
320
324
 
321
325
  #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-link,
322
- #global-header .header-proposition #proposition-links, #footer .footer-wrapper, #footer .footer-meta {
326
+ #global-header .header-proposition #proposition-links, #footer .footer-meta {
323
327
  zoom: 1; }
324
328
  #global-header .header-wrapper:after, #global-header .header-wrapper .header-global:after, #global-header .header-wrapper .header-global .header-logo:after, #global-header .header-proposition #proposition-link:after,
325
- #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
329
+ #global-header .header-proposition #proposition-links:after, #footer .footer-meta:after {
326
330
  content: "";
327
331
  display: block;
328
332
  clear: both; }
@@ -550,14 +554,9 @@ button:focus,
550
554
  background-color: #dee0e2;
551
555
  border-top: 1px solid #a1acb2; }
552
556
  #footer .footer-wrapper {
553
- margin: 0 auto;
554
- width: auto;
555
- max-width: 1020px;
556
- width: 1020px;
557
- padding-top: 20px;
558
- padding-top: 60px;
559
557
  background-color: #dee0e2;
560
- margin: 0 auto; }
558
+ padding-top: 20px;
559
+ padding-top: 60px; }
561
560
  #footer a {
562
561
  color: #454a4c; }
563
562
  #footer a:hover {
@@ -569,7 +568,7 @@ button:focus,
569
568
  font-weight: 400;
570
569
  text-transform: none;
571
570
  font-weight: bold;
572
- color: #171819;
571
+ color: #454a4c;
573
572
  margin: 0; }
574
573
  @media (max-width: 640px) {
575
574
  #footer h2 {
@@ -578,10 +577,6 @@ button:focus,
578
577
  #footer h2 a {
579
578
  color: inherit; }
580
579
  #footer .footer-meta {
581
- padding-left: 15px;
582
- padding-right: 15px;
583
- padding-left: 30px;
584
- padding-right: 30px;
585
580
  padding-bottom: 60px;
586
581
  clear: both;
587
582
  font-size: 0;
data/app/assets/stylesheets/govuk-template-ie7.css.erb CHANGED
@@ -28,15 +28,15 @@
28
28
  width: device-width; }
29
29
 
30
30
  #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-link,
31
- #global-header .header-proposition #proposition-links, #footer .footer-wrapper, #footer .footer-meta {
31
+ #global-header .header-proposition #proposition-links, #footer .footer-meta {
32
32
  zoom: 1; }
33
33
  #global-header .header-wrapper:after, #global-header .header-wrapper .header-global:after, #global-header .header-wrapper .header-global .header-logo:after, #global-header .header-proposition #proposition-link:after,
34
- #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
34
+ #global-header .header-proposition #proposition-links:after, #footer .footer-meta:after {
35
35
  content: "";
36
36
  display: block;
37
37
  clear: both; }
38
38
 
39
- #global-header-bar, #global-cookie-message p {
39
+ #global-header-bar, #global-cookie-message p, #footer .footer-wrapper {
40
40
  max-width: 960px;
41
41
  width: 960px;
42
42
  margin: 0 15px;
@@ -50,10 +50,10 @@
50
50
  width: device-width; }
51
51
 
52
52
  #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-link,
53
- #global-header .header-proposition #proposition-links, #footer .footer-wrapper, #footer .footer-meta {
53
+ #global-header .header-proposition #proposition-links, #footer .footer-meta {
54
54
  zoom: 1; }
55
55
  #global-header .header-wrapper:after, #global-header .header-wrapper .header-global:after, #global-header .header-wrapper .header-global .header-logo:after, #global-header .header-proposition #proposition-link:after,
56
- #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
56
+ #global-header .header-proposition #proposition-links:after, #footer .footer-meta:after {
57
57
  content: "";
58
58
  display: block;
59
59
  clear: both; }
@@ -65,7 +65,6 @@
65
65
  width: device-width; }
66
66
 
67
67
  /* local styleguide includes */
68
- /* Old depricated greys, new things should use the toolkit greys */
69
68
  html, body, button, input, table, td, th {
70
69
  font-family: "nta", Arial, sans-serif; }
71
70
 
@@ -148,6 +147,11 @@ a[rel="external"]:after {
148
147
  a[rel="external"]:after {
149
148
  background-image: url(<%= asset_path 'external-links/external-link-24x24.png' %>);
150
149
  background-size: 12px 400px; } }
150
+ a[rel="external"]:after {
151
+ content: "\A0\A0\A0\A0\A0";
152
+ background-position: right 3px; }
153
+ a[rel="external"]:hover:after {
154
+ background-position: right -385px; }
151
155
  a[rel="external"]:after {
152
156
  content: "\A0\A0\A0\A0";
153
157
  background-position: right 6px; }
@@ -319,10 +323,10 @@ button:focus,
319
323
  width: device-width; }
320
324
 
321
325
  #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-link,
322
- #global-header .header-proposition #proposition-links, #footer .footer-wrapper, #footer .footer-meta {
326
+ #global-header .header-proposition #proposition-links, #footer .footer-meta {
323
327
  zoom: 1; }
324
328
  #global-header .header-wrapper:after, #global-header .header-wrapper .header-global:after, #global-header .header-wrapper .header-global .header-logo:after, #global-header .header-proposition #proposition-link:after,
325
- #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
329
+ #global-header .header-proposition #proposition-links:after, #footer .footer-meta:after {
326
330
  content: "";
327
331
  display: block;
328
332
  clear: both; }
@@ -550,14 +554,9 @@ button:focus,
550
554
  background-color: #dee0e2;
551
555
  border-top: 1px solid #a1acb2; }
552
556
  #footer .footer-wrapper {
553
- margin: 0 auto;
554
- width: auto;
555
- max-width: 1020px;
556
- width: 1020px;
557
- padding-top: 20px;
558
- padding-top: 60px;
559
557
  background-color: #dee0e2;
560
- margin: 0 auto; }
558
+ padding-top: 20px;
559
+ padding-top: 60px; }
561
560
  #footer a {
562
561
  color: #454a4c; }
563
562
  #footer a:hover {
@@ -569,7 +568,7 @@ button:focus,
569
568
  font-weight: 400;
570
569
  text-transform: none;
571
570
  font-weight: bold;
572
- color: #171819;
571
+ color: #454a4c;
573
572
  margin: 0; }
574
573
  @media (max-width: 640px) {
575
574
  #footer h2 {
@@ -578,10 +577,6 @@ button:focus,
578
577
  #footer h2 a {
579
578
  color: inherit; }
580
579
  #footer .footer-meta {
581
- padding-left: 15px;
582
- padding-right: 15px;
583
- padding-left: 30px;
584
- padding-right: 30px;
585
580
  padding-bottom: 60px;
586
581
  clear: both;
587
582
  font-size: 0;
data/app/assets/stylesheets/govuk-template-ie8.css.erb CHANGED
@@ -28,12 +28,12 @@
28
28
  width: device-width; }
29
29
 
30
30
  #global-header .header-wrapper:after, #global-header .header-wrapper .header-global:after, #global-header .header-wrapper .header-global .header-logo:after, #global-header .header-proposition #proposition-link:after,
31
- #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
31
+ #global-header .header-proposition #proposition-links:after, #footer .footer-meta:after {
32
32
  content: "";
33
33
  display: block;
34
34
  clear: both; }
35
35
 
36
- #global-header-bar, #global-cookie-message p {
36
+ #global-header-bar, #global-cookie-message p, #footer .footer-wrapper {
37
37
  max-width: 960px;
38
38
  width: 960px;
39
39
  margin: 0 15px;
@@ -47,7 +47,7 @@
47
47
  width: device-width; }
48
48
 
49
49
  #global-header .header-wrapper:after, #global-header .header-wrapper .header-global:after, #global-header .header-wrapper .header-global .header-logo:after, #global-header .header-proposition #proposition-link:after,
50
- #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
50
+ #global-header .header-proposition #proposition-links:after, #footer .footer-meta:after {
51
51
  content: "";
52
52
  display: block;
53
53
  clear: both; }
@@ -59,7 +59,6 @@
59
59
  width: device-width; }
60
60
 
61
61
  /* local styleguide includes */
62
- /* Old depricated greys, new things should use the toolkit greys */
63
62
  html, body, button, input, table, td, th {
64
63
  font-family: "nta", Arial, sans-serif; }
65
64
 
@@ -142,6 +141,11 @@ a[rel="external"]:after {
142
141
  a[rel="external"]:after {
143
142
  background-image: url(<%= asset_path 'external-links/external-link-24x24.png' %>);
144
143
  background-size: 12px 400px; } }
144
+ a[rel="external"]:after {
145
+ content: "\A0\A0\A0\A0\A0";
146
+ background-position: right 3px; }
147
+ a[rel="external"]:hover:after {
148
+ background-position: right -385px; }
145
149
  a[rel="external"]:after {
146
150
  content: "\A0\A0\A0\A0";
147
151
  background-position: right 6px; }
@@ -308,7 +312,7 @@ button:focus,
308
312
  width: device-width; }
309
313
 
310
314
  #global-header .header-wrapper:after, #global-header .header-wrapper .header-global:after, #global-header .header-wrapper .header-global .header-logo:after, #global-header .header-proposition #proposition-link:after,
311
- #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
315
+ #global-header .header-proposition #proposition-links:after, #footer .footer-meta:after {
312
316
  content: "";
313
317
  display: block;
314
318
  clear: both; }
@@ -536,14 +540,9 @@ button:focus,
536
540
  background-color: #dee0e2;
537
541
  border-top: 1px solid #a1acb2; }
538
542
  #footer .footer-wrapper {
539
- margin: 0 auto;
540
- width: auto;
541
- max-width: 1020px;
542
- width: 1020px;
543
- padding-top: 20px;
544
- padding-top: 60px;
545
543
  background-color: #dee0e2;
546
- margin: 0 auto; }
544
+ padding-top: 20px;
545
+ padding-top: 60px; }
547
546
  #footer a {
548
547
  color: #454a4c; }
549
548
  #footer a:hover {
@@ -555,7 +554,7 @@ button:focus,
555
554
  font-weight: 400;
556
555
  text-transform: none;
557
556
  font-weight: bold;
558
- color: #171819;
557
+ color: #454a4c;
559
558
  margin: 0; }
560
559
  @media (max-width: 640px) {
561
560
  #footer h2 {
@@ -564,10 +563,6 @@ button:focus,
564
563
  #footer h2 a {
565
564
  color: inherit; }
566
565
  #footer .footer-meta {
567
- padding-left: 15px;
568
- padding-right: 15px;
569
- padding-left: 30px;
570
- padding-right: 30px;
571
566
  padding-bottom: 60px;
572
567
  clear: both;
573
568
  font-size: 0;
data/app/assets/stylesheets/govuk-template.css.erb CHANGED
@@ -28,19 +28,19 @@
28
28
  width: device-width; }
29
29
 
30
30
  #global-header .header-wrapper:after, #global-header .header-wrapper .header-global:after, #global-header .header-wrapper .header-global .header-logo:after, #global-header .header-proposition #proposition-link:after,
31
- #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
31
+ #global-header .header-proposition #proposition-links:after, #footer .footer-meta:after {
32
32
  content: "";
33
33
  display: block;
34
34
  clear: both; }
35
35
 
36
- #global-header-bar, #global-cookie-message p {
36
+ #global-header-bar, #global-cookie-message p, #footer .footer-wrapper {
37
37
  max-width: 960px;
38
38
  margin: 0 15px; }
39
39
  @media (min-width: 641px) {
40
- #global-header-bar, #global-cookie-message p {
40
+ #global-header-bar, #global-cookie-message p, #footer .footer-wrapper {
41
41
  margin: 0 30px; } }
42
42
  @media (min-width: 1020px) {
43
- #global-header-bar, #global-cookie-message p {
43
+ #global-header-bar, #global-cookie-message p, #footer .footer-wrapper {
44
44
  margin: 0 auto; } }
45
45
 
46
46
  @-ms-viewport {
@@ -50,7 +50,7 @@
50
50
  width: device-width; }
51
51
 
52
52
  #global-header .header-wrapper:after, #global-header .header-wrapper .header-global:after, #global-header .header-wrapper .header-global .header-logo:after, #global-header .header-proposition #proposition-link:after,
53
- #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
53
+ #global-header .header-proposition #proposition-links:after, #footer .footer-meta:after {
54
54
  content: "";
55
55
  display: block;
56
56
  clear: both; }
@@ -62,7 +62,6 @@
62
62
  width: device-width; }
63
63
 
64
64
  /* local styleguide includes */
65
- /* Old depricated greys, new things should use the toolkit greys */
66
65
  html, body, button, input, table, td, th {
67
66
  font-family: "nta", Arial, sans-serif; }
68
67
 
@@ -146,16 +145,16 @@ a[rel="external"]:after {
146
145
  background-image: url(<%= asset_path 'external-links/external-link-24x24.png' %>);
147
146
  background-size: 12px 400px; } }
148
147
  a[rel="external"]:after {
149
- content: "\A0\A0\A0\A0";
150
- background-position: right 6px; }
148
+ content: "\A0\A0\A0\A0\A0";
149
+ background-position: right 3px; }
151
150
  a[rel="external"]:hover:after {
152
- background-position: right -382px; }
153
- @media (max-width: 640px) {
151
+ background-position: right -385px; }
152
+ @media (min-width: 641px) {
154
153
  a[rel="external"]:after {
155
- content: "\A0\A0\A0\A0\A0";
156
- background-position: right 3px; }
154
+ content: "\A0\A0\A0\A0";
155
+ background-position: right 6px; }
157
156
  a[rel="external"]:hover:after {
158
- background-position: right -385px; } }
157
+ background-position: right -382px; } }
159
158
 
160
159
  .external-link:after {
161
160
  content: "\A0\A0\A0\A0\A0\A0\A0\A0";
@@ -317,7 +316,7 @@ button:focus,
317
316
  width: device-width; }
318
317
 
319
318
  #global-header .header-wrapper:after, #global-header .header-wrapper .header-global:after, #global-header .header-wrapper .header-global .header-logo:after, #global-header .header-proposition #proposition-link:after,
320
- #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
319
+ #global-header .header-proposition #proposition-links:after, #footer .footer-meta:after {
321
320
  content: "";
322
321
  display: block;
323
322
  clear: both; }
@@ -564,12 +563,8 @@ button:focus,
564
563
  background-color: #dee0e2;
565
564
  border-top: 1px solid #a1acb2; }
566
565
  #footer .footer-wrapper {
567
- margin: 0 auto;
568
- width: auto;
569
- max-width: 1020px;
570
- padding-top: 20px;
571
566
  background-color: #dee0e2;
572
- margin: 0 auto; }
567
+ padding-top: 20px; }
573
568
  @media (min-width: 641px) {
574
569
  #footer .footer-wrapper {
575
570
  padding-top: 60px; } }
@@ -584,7 +579,7 @@ button:focus,
584
579
  font-weight: 400;
585
580
  text-transform: none;
586
581
  font-weight: bold;
587
- color: #171819;
582
+ color: #454a4c;
588
583
  margin: 0; }
589
584
  @media (max-width: 640px) {
590
585
  #footer h2 {
@@ -593,16 +588,10 @@ button:focus,
593
588
  #footer h2 a {
594
589
  color: inherit; }
595
590
  #footer .footer-meta {
596
- padding-left: 15px;
597
- padding-right: 15px;
598
591
  padding-bottom: 60px;
599
592
  clear: both;
600
593
  font-size: 0;
601
594
  color: #454a4c; }
602
- @media (min-width: 641px) {
603
- #footer .footer-meta {
604
- padding-left: 30px;
605
- padding-right: 30px; } }
606
595
  #footer .footer-meta .footer-meta-inner {
607
596
  display: inline-block;
608
597
  vertical-align: bottom;
data/app/views/layouts/govuk_template.html.erb CHANGED
@@ -3,19 +3,17 @@
3
3
  <!--[if lt IE 9]><html class="lte-ie8" lang="<%= content_for?(:html_lang) ? yield(:html_lang) : "en" %>"><![endif]-->
4
4
  <!--[if gt IE 8]><!--><html lang="<%= content_for?(:html_lang) ? yield(:html_lang) : "en" %>"><!--<![endif]-->
5
5
  <head>
6
- <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
7
-
6
+ <meta charset="utf-8" />
8
7
  <title><%= content_for?(:page_title) ? yield(:page_title) : "GOV.UK - The best place to find government services and information" %></title>
9
8
 
10
9
  <!--[if gt IE 8]><!--><link href="<%= asset_path "govuk-template.css" %>" media="screen" rel="stylesheet" type="text/css" /><!--<![endif]-->
11
10
  <!--[if IE 6]><link href="<%= asset_path "govuk-template-ie6.css" %>" media="screen" rel="stylesheet" type="text/css" /><![endif]-->
12
11
  <!--[if IE 7]><link href="<%= asset_path "govuk-template-ie7.css" %>" media="screen" rel="stylesheet" type="text/css" /><![endif]-->
13
12
  <!--[if IE 8]><link href="<%= asset_path "govuk-template-ie8.css" %>" media="screen" rel="stylesheet" type="text/css" /><![endif]-->
14
-
15
13
  <link href="<%= asset_path "govuk-template-print.css" %>" media="print" rel="stylesheet" type="text/css" />
16
14
 
17
15
  <!--[if IE 8]>
18
- <script type="text/javascript">
16
+ <script>
19
17
  (function(){if(window.opera){return;}
20
18
  setTimeout(function(){var a=document,g,b={families:(g=
21
19
  ["nta"]),urls:["<%= asset_path "fonts-ie8.css" %>"]},
@@ -26,25 +24,14 @@
26
24
  })()
27
25
  </script>
28
26
  <![endif]-->
29
- <!--[if gte IE 9]><!-->
30
- <link href="<%= asset_path "fonts.css" %>" media="all" rel="stylesheet" type="text/css" />
31
- <!--<![endif]-->
32
-
33
-
34
- <!--[if lt IE 9]>
35
- <script src="<%= asset_path "ie.js" %>" type="text/javascript"></script>
36
- <![endif]-->
27
+ <!--[if gte IE 9]><!--><link href="<%= asset_path "fonts.css" %>" media="all" rel="stylesheet" type="text/css" /><!--<![endif]-->
28
+ <!--[if lt IE 9]><script src="<%= asset_path "ie.js" %>"></script><![endif]-->
37
29
 
38
30
  <link rel="shortcut icon" href="<%= asset_path 'favicon.ico' %>" type="image/x-icon" />
39
31
  <link rel="mask-icon" href="<%= asset_path 'gov.uk_logotype_crown.svg' %>" color="#0b0c0c">
40
-
41
- <!-- Size for iPad and iPad mini (high resolution) -->
42
32
  <link rel="apple-touch-icon-precomposed" sizes="152x152" href="<%= asset_path "apple-touch-icon-152x152.png" %>">
43
- <!-- Size for iPhone and iPod touch (high resolution) -->
44
33
  <link rel="apple-touch-icon-precomposed" sizes="120x120" href="<%= asset_path "apple-touch-icon-120x120.png" %>">
45
- <!-- Size for iPad 2 and iPad mini (standard resolution) -->
46
34
  <link rel="apple-touch-icon-precomposed" sizes="76x76" href="<%= asset_path "apple-touch-icon-76x76.png" %>">
47
- <!-- Default non-defined size, also used for Android 2.1+ devices -->
48
35
  <link rel="apple-touch-icon-precomposed" href="<%= asset_path "apple-touch-icon-60x60.png" %>">
49
36
 
50
37
  <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -54,7 +41,7 @@
54
41
  </head>
55
42
 
56
43
  <body<%= content_for?(:body_classes) ? raw(" class=\"#{yield(:body_classes)}\"") : '' %>>
57
- <script type="text/javascript">document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
44
+ <script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
58
45
 
59
46
  <%= yield :body_start %>
60
47
 
@@ -71,7 +58,6 @@
71
58
  <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>
72
59
  <% end %>
73
60
  </div>
74
- <!--end global-cookie-message-->
75
61
 
76
62
  <% unless @omit_header %>
77
63
  <header role="banner" id="global-header" class="<%= yield(:header_class) %>">
@@ -87,13 +73,11 @@
87
73
  <%= yield :proposition_header %>
88
74
  </div>
89
75
  </header>
90
- <!--end header-->
91
76
  <% end %>
92
77
 
93
78
  <%= yield :after_header %>
94
79
 
95
80
  <div id="global-header-bar"></div>
96
- <!--end global-header-bar-->
97
81
 
98
82
  <%= content_for?(:content) ? yield(:content) : yield %>
99
83
 
@@ -123,11 +107,9 @@
123
107
  </div>
124
108
  </footer>
125
109
 
126
- <!--end footer-->
127
-
128
110
  <div id="global-app-error" class="app-error hidden"></div>
129
111
 
130
- <script src="<%= asset_path "govuk-template.js" %>" type="text/javascript"></script>
112
+ <script src="<%= asset_path "govuk-template.js" %>"></script>
131
113
 
132
114
  <%= yield :body_end %>
133
115
  </body>
data/lib/govuk_template/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module GovukTemplate
2
- VERSION = "0.17.0"
2
+ VERSION = "0.17.1"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: govuk_template
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.17.0
4
+ version: 0.17.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alex Tomlins
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-02-24 00:00:00.000000000 Z
11
+ date: 2016-04-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails