govuk_template 0.12.0 → 0.13.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +7 -0
  2. data/LICENCE.txt +1 -1
  3. data/README.md +11 -2
  4. data/app/assets/stylesheets/govuk-template-ie6.css.erb +19 -30
  5. data/app/assets/stylesheets/govuk-template-ie7.css.erb +19 -30
  6. data/app/assets/stylesheets/govuk-template-ie8.css.erb +16 -27
  7. data/app/assets/stylesheets/govuk-template.css.erb +18 -28
  8. data/app/views/layouts/govuk_template.html.erb +8 -16
  9. data/lib/govuk_template/version.rb +1 -1
  10. metadata +48 -74
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: e919e2af104d6f3cd2e41737810fc5a4170aa7b6
4
+ data.tar.gz: e502c3302993e0f35c7480d4546a83564d920459
5
+ SHA512:
6
+ metadata.gz: 6740aabd7dff28aa30bc2765f70dedfeebce3f429405200c35dcb04d572fd8b1104392d875712fc363c0f7adb6838bb1202e3c806a3aa026c84bd8a51614a701
7
+ data.tar.gz: 4bc077de315aafc1af3106f429065a56322db6254b6cd6cbf6bf4793aacbe741a4c58f1269e55ebdbb34228e4c66a3dd9b722a77b2da874b9f68b7edc119d69b
data/LICENCE.txt CHANGED
@@ -1,4 +1,4 @@
1
- Copyright (c) 2013 GDS
1
+ Copyright (c) 2013 Crown Copyright (Government Digital Service)
2
2
 
3
3
  MIT License
4
4
 
data/README.md CHANGED
@@ -14,7 +14,7 @@ The Ruby language (1.9.3+), the build tool [Rake](http://rake.rubyforge.org/) &
14
14
 
15
15
  ## Packaging
16
16
 
17
- At present this generates 8 output formats:
17
+ At present this generates 9 output formats:
18
18
 
19
19
  1. a gem containing a Rails engine
20
20
  2. a tarball containing Play Framework templates
@@ -22,8 +22,9 @@ At present this generates 8 output formats:
22
22
  4. a tarball containing Liquid templates
23
23
  5. a tarball containing Mustache Inheritance templates
24
24
  6. a tarball containing Jinja templates
25
- 7. a tarball
25
+ 7. a tarball containing plain HTML and assets
26
26
  8. a tarball containing EJS (Embedded JavaScript) templates
27
+ 9. a JAR file containing assets (but no templates) structured as per [WebJars](http://www.webjars.org/)
27
28
 
28
29
  ### Gem version
29
30
 
@@ -67,6 +68,10 @@ To generate the tarball, run the `bundle exec rake build:tar`. This will produce
67
68
 
68
69
  To generate the folder of Embedded JavaScript templates run `bundle exec rake build:ejs`. This will produce a tarball in the `pkg` directory.
69
70
 
71
+ ### WebJar version
72
+
73
+ To generate a JAR file of assets in WebJar format run `bundle exec rake build:webjar`. This will produce a JAR file in the `pkg` directory.
74
+
70
75
  ## Publishing
71
76
 
72
77
  Accepted contributions (pull requests merged into master) will run builds for the Gem, Play and Mustache versions. These will then update the following:
@@ -102,6 +107,10 @@ See the `TemplateProcessor` class for details of this implementation.
102
107
 
103
108
  ## Usage
104
109
 
110
+ ### Skip link
111
+
112
+ The [govuk_template sets a skip link](https://github.com/alphagov/govuk_template/blob/master/source/views/layouts/govuk_template.html.erb#L64-L68) to `#content`, but doesn't provide an element with `id="content"`. You'll need to add `id="content"` to your main content area, to ensure the skip link will work.
113
+
105
114
  ### Propositional title and navigation
106
115
 
107
116
  You can get a propositional title and navigation by setting the content for `header_class` to `with-proposition` and `proposition_header` in the form:
data/app/assets/stylesheets/govuk-template-ie6.css.erb CHANGED
@@ -28,14 +28,21 @@
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, #global-header-bar, #global-cookie-message .outer-block, #footer .footer-wrapper, #footer .footer-meta {
31
+ #global-header .header-proposition #proposition-links, #footer .footer-wrapper, #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, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
34
+ #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper: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 {
40
+ max-width: 960px;
41
+ width: 960px;
42
+ margin: 0 15px;
43
+ margin: 0 30px;
44
+ margin: 0 auto; }
45
+
39
46
  @-ms-viewport {
40
47
  width: device-width; }
41
48
 
@@ -43,10 +50,10 @@
43
50
  width: device-width; }
44
51
 
45
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,
46
- #global-header .header-proposition #proposition-links, #global-header-bar, #global-cookie-message .outer-block, #footer .footer-wrapper, #footer .footer-meta {
53
+ #global-header .header-proposition #proposition-links, #footer .footer-wrapper, #footer .footer-meta {
47
54
  zoom: 1; }
48
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,
49
- #global-header .header-proposition #proposition-links:after, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
56
+ #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
50
57
  content: "";
51
58
  display: block;
52
59
  clear: both; }
@@ -308,10 +315,10 @@ button:focus,
308
315
  width: device-width; }
309
316
 
310
317
  #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-link,
311
- #global-header .header-proposition #proposition-links, #global-header-bar, #global-cookie-message .outer-block, #footer .footer-wrapper, #footer .footer-meta {
318
+ #global-header .header-proposition #proposition-links, #footer .footer-wrapper, #footer .footer-meta {
312
319
  zoom: 1; }
313
320
  #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,
314
- #global-header .header-proposition #proposition-links:after, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
321
+ #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
315
322
  content: "";
316
323
  display: block;
317
324
  clear: both; }
@@ -504,19 +511,9 @@ button:focus,
504
511
 
505
512
  /* Global header bar */
506
513
  #global-header-bar {
507
- margin: 0 auto;
508
- width: auto;
509
- max-width: 1020px;
510
- width: 1020px; }
511
- #global-header-bar .inner-block {
512
- padding-left: 15px;
513
- padding-right: 15px;
514
- padding-left: 30px;
515
- padding-right: 30px; }
516
- #global-header-bar .header-bar {
517
- height: 10px;
518
- background-color: #005ea5;
519
- font-size: 0; }
514
+ height: 10px;
515
+ background-color: #005ea5;
516
+ font-size: 0; }
520
517
 
521
518
  /* Global cookie message */
522
519
  .js-enabled #global-cookie-message {
@@ -524,26 +521,18 @@ button:focus,
524
521
  /* shown with JS, always on for non-JS */ }
525
522
 
526
523
  #global-cookie-message {
524
+ width: 100%;
527
525
  background-color: #d5e8f3;
528
526
  padding-top: 10px;
529
527
  padding-bottom: 10px; }
530
- #global-cookie-message .outer-block {
531
- margin: 0 auto;
532
- width: auto;
533
- max-width: 1020px;
534
- width: 1020px; }
535
- #global-cookie-message .inner-block {
536
- padding-left: 15px;
537
- padding-right: 15px;
538
- padding-left: 30px;
539
- padding-right: 30px; }
540
528
  #global-cookie-message p {
541
529
  font-family: "nta", Arial, sans-serif;
542
530
  font-size: 16px;
543
531
  line-height: 1.25;
544
532
  font-weight: 400;
545
533
  text-transform: none;
546
- margin: 0; }
534
+ margin-top: 0;
535
+ margin-bottom: 0; }
547
536
  @media (max-width: 640px) {
548
537
  #global-cookie-message p {
549
538
  font-size: 14px;
data/app/assets/stylesheets/govuk-template-ie7.css.erb CHANGED
@@ -28,14 +28,21 @@
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, #global-header-bar, #global-cookie-message .outer-block, #footer .footer-wrapper, #footer .footer-meta {
31
+ #global-header .header-proposition #proposition-links, #footer .footer-wrapper, #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, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
34
+ #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper: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 {
40
+ max-width: 960px;
41
+ width: 960px;
42
+ margin: 0 15px;
43
+ margin: 0 30px;
44
+ margin: 0 auto; }
45
+
39
46
  @-ms-viewport {
40
47
  width: device-width; }
41
48
 
@@ -43,10 +50,10 @@
43
50
  width: device-width; }
44
51
 
45
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,
46
- #global-header .header-proposition #proposition-links, #global-header-bar, #global-cookie-message .outer-block, #footer .footer-wrapper, #footer .footer-meta {
53
+ #global-header .header-proposition #proposition-links, #footer .footer-wrapper, #footer .footer-meta {
47
54
  zoom: 1; }
48
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,
49
- #global-header .header-proposition #proposition-links:after, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
56
+ #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
50
57
  content: "";
51
58
  display: block;
52
59
  clear: both; }
@@ -308,10 +315,10 @@ button:focus,
308
315
  width: device-width; }
309
316
 
310
317
  #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-link,
311
- #global-header .header-proposition #proposition-links, #global-header-bar, #global-cookie-message .outer-block, #footer .footer-wrapper, #footer .footer-meta {
318
+ #global-header .header-proposition #proposition-links, #footer .footer-wrapper, #footer .footer-meta {
312
319
  zoom: 1; }
313
320
  #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,
314
- #global-header .header-proposition #proposition-links:after, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
321
+ #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
315
322
  content: "";
316
323
  display: block;
317
324
  clear: both; }
@@ -504,19 +511,9 @@ button:focus,
504
511
 
505
512
  /* Global header bar */
506
513
  #global-header-bar {
507
- margin: 0 auto;
508
- width: auto;
509
- max-width: 1020px;
510
- width: 1020px; }
511
- #global-header-bar .inner-block {
512
- padding-left: 15px;
513
- padding-right: 15px;
514
- padding-left: 30px;
515
- padding-right: 30px; }
516
- #global-header-bar .header-bar {
517
- height: 10px;
518
- background-color: #005ea5;
519
- font-size: 0; }
514
+ height: 10px;
515
+ background-color: #005ea5;
516
+ font-size: 0; }
520
517
 
521
518
  /* Global cookie message */
522
519
  .js-enabled #global-cookie-message {
@@ -524,26 +521,18 @@ button:focus,
524
521
  /* shown with JS, always on for non-JS */ }
525
522
 
526
523
  #global-cookie-message {
524
+ width: 100%;
527
525
  background-color: #d5e8f3;
528
526
  padding-top: 10px;
529
527
  padding-bottom: 10px; }
530
- #global-cookie-message .outer-block {
531
- margin: 0 auto;
532
- width: auto;
533
- max-width: 1020px;
534
- width: 1020px; }
535
- #global-cookie-message .inner-block {
536
- padding-left: 15px;
537
- padding-right: 15px;
538
- padding-left: 30px;
539
- padding-right: 30px; }
540
528
  #global-cookie-message p {
541
529
  font-family: "nta", Arial, sans-serif;
542
530
  font-size: 16px;
543
531
  line-height: 1.25;
544
532
  font-weight: 400;
545
533
  text-transform: none;
546
- margin: 0; }
534
+ margin-top: 0;
535
+ margin-bottom: 0; }
547
536
  @media (max-width: 640px) {
548
537
  #global-cookie-message p {
549
538
  font-size: 14px;
data/app/assets/stylesheets/govuk-template-ie8.css.erb CHANGED
@@ -28,11 +28,18 @@
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, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
31
+ #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper: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 {
37
+ max-width: 960px;
38
+ width: 960px;
39
+ margin: 0 15px;
40
+ margin: 0 30px;
41
+ margin: 0 auto; }
42
+
36
43
  @-ms-viewport {
37
44
  width: device-width; }
38
45
 
@@ -40,7 +47,7 @@
40
47
  width: device-width; }
41
48
 
42
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,
43
- #global-header .header-proposition #proposition-links:after, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
50
+ #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
44
51
  content: "";
45
52
  display: block;
46
53
  clear: both; }
@@ -297,7 +304,7 @@ button:focus,
297
304
  width: device-width; }
298
305
 
299
306
  #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,
300
- #global-header .header-proposition #proposition-links:after, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
307
+ #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
301
308
  content: "";
302
309
  display: block;
303
310
  clear: both; }
@@ -490,19 +497,9 @@ button:focus,
490
497
 
491
498
  /* Global header bar */
492
499
  #global-header-bar {
493
- margin: 0 auto;
494
- width: auto;
495
- max-width: 1020px;
496
- width: 1020px; }
497
- #global-header-bar .inner-block {
498
- padding-left: 15px;
499
- padding-right: 15px;
500
- padding-left: 30px;
501
- padding-right: 30px; }
502
- #global-header-bar .header-bar {
503
- height: 10px;
504
- background-color: #005ea5;
505
- font-size: 0; }
500
+ height: 10px;
501
+ background-color: #005ea5;
502
+ font-size: 0; }
506
503
 
507
504
  /* Global cookie message */
508
505
  .js-enabled #global-cookie-message {
@@ -510,26 +507,18 @@ button:focus,
510
507
  /* shown with JS, always on for non-JS */ }
511
508
 
512
509
  #global-cookie-message {
510
+ width: 100%;
513
511
  background-color: #d5e8f3;
514
512
  padding-top: 10px;
515
513
  padding-bottom: 10px; }
516
- #global-cookie-message .outer-block {
517
- margin: 0 auto;
518
- width: auto;
519
- max-width: 1020px;
520
- width: 1020px; }
521
- #global-cookie-message .inner-block {
522
- padding-left: 15px;
523
- padding-right: 15px;
524
- padding-left: 30px;
525
- padding-right: 30px; }
526
514
  #global-cookie-message p {
527
515
  font-family: "nta", Arial, sans-serif;
528
516
  font-size: 16px;
529
517
  line-height: 1.25;
530
518
  font-weight: 400;
531
519
  text-transform: none;
532
- margin: 0; }
520
+ margin-top: 0;
521
+ margin-bottom: 0; }
533
522
  @media (max-width: 640px) {
534
523
  #global-cookie-message p {
535
524
  font-size: 14px;
data/app/assets/stylesheets/govuk-template.css.erb CHANGED
@@ -28,11 +28,21 @@
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, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
31
+ #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper: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 {
37
+ max-width: 960px;
38
+ margin: 0 15px; }
39
+ @media (min-width: 641px) {
40
+ #global-header-bar, #global-cookie-message p {
41
+ margin: 0 30px; } }
42
+ @media (min-width: 1020px) {
43
+ #global-header-bar, #global-cookie-message p {
44
+ margin: 0 auto; } }
45
+
36
46
  @-ms-viewport {
37
47
  width: device-width; }
38
48
 
@@ -40,7 +50,7 @@
40
50
  width: device-width; }
41
51
 
42
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,
43
- #global-header .header-proposition #proposition-links:after, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
53
+ #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
44
54
  content: "";
45
55
  display: block;
46
56
  clear: both; }
@@ -303,7 +313,7 @@ button:focus,
303
313
  width: device-width; }
304
314
 
305
315
  #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,
306
- #global-header .header-proposition #proposition-links:after, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
316
+ #global-header .header-proposition #proposition-links:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
307
317
  content: "";
308
318
  display: block;
309
319
  clear: both; }
@@ -517,19 +527,8 @@ button:focus,
517
527
 
518
528
  /* Global header bar */
519
529
  #global-header-bar {
520
- margin: 0 auto;
521
- width: auto;
522
- max-width: 1020px; }
523
- #global-header-bar .inner-block {
524
- padding-left: 15px;
525
- padding-right: 15px; }
526
- @media (min-width: 641px) {
527
- #global-header-bar .inner-block {
528
- padding-left: 30px;
529
- padding-right: 30px; } }
530
- #global-header-bar .header-bar {
531
- height: 10px;
532
- background-color: #005ea5; }
530
+ height: 10px;
531
+ background-color: #005ea5; }
533
532
 
534
533
  /* Global cookie message */
535
534
  .js-enabled #global-cookie-message {
@@ -537,27 +536,18 @@ button:focus,
537
536
  /* shown with JS, always on for non-JS */ }
538
537
 
539
538
  #global-cookie-message {
539
+ width: 100%;
540
540
  background-color: #d5e8f3;
541
541
  padding-top: 10px;
542
542
  padding-bottom: 10px; }
543
- #global-cookie-message .outer-block {
544
- margin: 0 auto;
545
- width: auto;
546
- max-width: 1020px; }
547
- #global-cookie-message .inner-block {
548
- padding-left: 15px;
549
- padding-right: 15px; }
550
- @media (min-width: 641px) {
551
- #global-cookie-message .inner-block {
552
- padding-left: 30px;
553
- padding-right: 30px; } }
554
543
  #global-cookie-message p {
555
544
  font-family: "nta", Arial, sans-serif;
556
545
  font-size: 16px;
557
546
  line-height: 1.25;
558
547
  font-weight: 400;
559
548
  text-transform: none;
560
- margin: 0; }
549
+ margin-top: 0;
550
+ margin-bottom: 0; }
561
551
  @media (max-width: 640px) {
562
552
  #global-cookie-message p {
563
553
  font-size: 14px;
data/app/views/layouts/govuk_template.html.erb CHANGED
@@ -68,15 +68,11 @@
68
68
  </div>
69
69
 
70
70
  <div id="global-cookie-message">
71
- <div class="outer-block">
72
- <div class="inner-block">
73
- <% if content_for?(:cookie_message) %>
74
- <%= yield :cookie_message %>
75
- <% else %>
76
- <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>
77
- <% end %>
78
- </div>
79
- </div>
71
+ <% if content_for?(:cookie_message) %>
72
+ <%= yield :cookie_message %>
73
+ <% else %>
74
+ <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>
75
+ <% end %>
80
76
  </div>
81
77
  <!--end global-cookie-message-->
82
78
 
@@ -85,8 +81,8 @@
85
81
  <div class="header-wrapper">
86
82
  <div class="header-global">
87
83
  <div class="header-logo">
88
- <a href="https://www.gov.uk/" title="Go to the GOV.UK homepage" id="logo" class="content">
89
- <img src="<%= asset_path 'gov.uk_logotype_crown.png' %>" width="35" height="31" alt=""> GOV.UK
84
+ <a href="<%= content_for?(:homepage_url) ? yield(:homepage_url) : "https://www.gov.uk/" %>" title="Go to the GOV.UK homepage" id="logo" class="content">
85
+ <img src="<%= asset_path 'gov.uk_logotype_crown.png' %>" width="35" height="31" alt=""> <%= content_for?(:global_header_text) ? yield(:global_header_text) : "GOV.UK" %>
90
86
  </a>
91
87
  </div>
92
88
  <%= yield :inside_header %>
@@ -99,11 +95,7 @@
99
95
 
100
96
  <%= yield :after_header %>
101
97
 
102
- <div id="global-header-bar">
103
- <div class="inner-block">
104
- <div class="header-bar"></div>
105
- </div>
106
- </div>
98
+ <div id="global-header-bar"></div>
107
99
  <!--end global-header-bar-->
108
100
 
109
101
  <%= content_for?(:content) ? yield(:content) : yield %>
data/lib/govuk_template/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module GovukTemplate
2
- VERSION = "0.12.0"
2
+ VERSION = "0.13.0"
3
3
  end
metadata CHANGED
@@ -1,52 +1,46 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: govuk_template
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.0
5
- prerelease:
4
+ version: 0.13.0
6
5
  platform: ruby
7
6
  authors:
8
7
  - Alex Tomlins
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2014-12-09 00:00:00.000000000 Z
11
+ date: 2015-05-22 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: rails
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
- - - ! '>='
17
+ - - ">="
20
18
  - !ruby/object:Gem::Version
21
19
  version: '3.1'
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
- - - ! '>='
24
+ - - ">="
28
25
  - !ruby/object:Gem::Version
29
26
  version: '3.1'
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: rake
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
- - - ! '>='
31
+ - - ">="
36
32
  - !ruby/object:Gem::Version
37
33
  version: '0'
38
34
  type: :development
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
- - - ! '>='
38
+ - - ">="
44
39
  - !ruby/object:Gem::Version
45
40
  version: '0'
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: sprockets
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
45
  - - '='
52
46
  - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
54
48
  type: :development
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
52
  - - '='
60
53
  - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: sass
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
59
  - - '='
68
60
  - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
70
62
  type: :development
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
66
  - - '='
76
67
  - !ruby/object:Gem::Version
@@ -78,23 +69,20 @@ dependencies:
78
69
  - !ruby/object:Gem::Dependency
79
70
  name: govuk_frontend_toolkit
80
71
  requirement: !ruby/object:Gem::Requirement
81
- none: false
82
72
  requirements:
83
73
  - - '='
84
74
  - !ruby/object:Gem::Version
85
- version: 2.0.1
75
+ version: 3.5.1
86
76
  type: :development
87
77
  prerelease: false
88
78
  version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
79
  requirements:
91
80
  - - '='
92
81
  - !ruby/object:Gem::Version
93
- version: 2.0.1
82
+ version: 3.5.1
94
83
  - !ruby/object:Gem::Dependency
95
84
  name: gem_publisher
96
85
  requirement: !ruby/object:Gem::Requirement
97
- none: false
98
86
  requirements:
99
87
  - - '='
100
88
  - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
102
90
  type: :development
103
91
  prerelease: false
104
92
  version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
93
  requirements:
107
94
  - - '='
108
95
  - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
110
97
  - !ruby/object:Gem::Dependency
111
98
  name: rspec
112
99
  requirement: !ruby/object:Gem::Requirement
113
- none: false
114
100
  requirements:
115
101
  - - '='
116
102
  - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
118
104
  type: :development
119
105
  prerelease: false
120
106
  version_requirements: !ruby/object:Gem::Requirement
121
- none: false
122
107
  requirements:
123
108
  - - '='
124
109
  - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
126
111
  - !ruby/object:Gem::Dependency
127
112
  name: mustache
128
113
  requirement: !ruby/object:Gem::Requirement
129
- none: false
130
114
  requirements:
131
115
  - - '='
132
116
  - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
134
118
  type: :development
135
119
  prerelease: false
136
120
  version_requirements: !ruby/object:Gem::Requirement
137
- none: false
138
121
  requirements:
139
122
  - - '='
140
123
  - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
142
125
  - !ruby/object:Gem::Dependency
143
126
  name: octokit
144
127
  requirement: !ruby/object:Gem::Requirement
145
- none: false
146
128
  requirements:
147
129
  - - '='
148
130
  - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
150
132
  type: :development
151
133
  prerelease: false
152
134
  version_requirements: !ruby/object:Gem::Requirement
153
- none: false
154
135
  requirements:
155
136
  - - '='
156
137
  - !ruby/object:Gem::Version
@@ -162,78 +143,71 @@ executables: []
162
143
  extensions: []
163
144
  extra_rdoc_files: []
164
145
  files:
165
- - app/views/layouts/govuk_template.html.erb
166
- - app/assets/stylesheets/govuk-template.css.erb
167
- - app/assets/stylesheets/govuk-template-ie7.css.erb
146
+ - LICENCE.txt
147
+ - README.md
148
+ - app/assets/images/apple-touch-icon-120x120.png
149
+ - app/assets/images/apple-touch-icon-152x152.png
150
+ - app/assets/images/apple-touch-icon-60x60.png
151
+ - app/assets/images/apple-touch-icon-76x76.png
152
+ - app/assets/images/favicon.ico
153
+ - app/assets/images/gov.uk_logotype_crown.png
154
+ - app/assets/images/gov.uk_logotype_crown_invert.png
155
+ - app/assets/images/gov.uk_logotype_crown_invert_trans.png
156
+ - app/assets/images/opengraph-image.png
157
+ - app/assets/javascripts/govuk-template.js
158
+ - app/assets/javascripts/ie.js
159
+ - app/assets/javascripts/vendor/goog/webfont-debug.js
160
+ - app/assets/stylesheets/external-links/external-link-24x24.png
161
+ - app/assets/stylesheets/external-links/external-link-black-12x12.png
162
+ - app/assets/stylesheets/external-links/external-link-black-24x24.png
163
+ - app/assets/stylesheets/external-links/external-link.png
168
164
  - app/assets/stylesheets/fonts-ie8.css.erb
169
- - app/assets/stylesheets/images/open-government-licence_2x.png
170
- - app/assets/stylesheets/images/govuk-crest.png
171
- - app/assets/stylesheets/images/open-government-licence.png
172
- - app/assets/stylesheets/images/close.png
173
- - app/assets/stylesheets/images/govuk-crest-2x.png
174
- - app/assets/stylesheets/images/govuk-crest-ie.png
175
- - app/assets/stylesheets/fonts/NTATabularNumbers-Bold.woff
176
- - app/assets/stylesheets/fonts/NTATabularNumbers-Light.woff
177
- - app/assets/stylesheets/fonts/NTATabularNumbers-Bold.eot
178
- - app/assets/stylesheets/fonts/NTA-Light-20130221.woff
179
- - app/assets/stylesheets/fonts/NTATabularNumbers-Light.eot
165
+ - app/assets/stylesheets/fonts.css.erb
180
166
  - app/assets/stylesheets/fonts/NTA-Bold-20130221.eot
181
167
  - app/assets/stylesheets/fonts/NTA-Bold-20130221.woff
182
168
  - app/assets/stylesheets/fonts/NTA-Light-20130221.eot
183
- - app/assets/stylesheets/govuk-template-ie8.css.erb
184
- - app/assets/stylesheets/external-links/external-link-black-12x12.png
185
- - app/assets/stylesheets/external-links/external-link-24x24.png
186
- - app/assets/stylesheets/external-links/external-link.png
187
- - app/assets/stylesheets/external-links/external-link-black-24x24.png
169
+ - app/assets/stylesheets/fonts/NTA-Light-20130221.woff
170
+ - app/assets/stylesheets/fonts/NTATabularNumbers-Bold.eot
171
+ - app/assets/stylesheets/fonts/NTATabularNumbers-Bold.woff
172
+ - app/assets/stylesheets/fonts/NTATabularNumbers-Light.eot
173
+ - app/assets/stylesheets/fonts/NTATabularNumbers-Light.woff
188
174
  - app/assets/stylesheets/govuk-template-ie6.css.erb
189
- - app/assets/stylesheets/fonts.css.erb
175
+ - app/assets/stylesheets/govuk-template-ie7.css.erb
176
+ - app/assets/stylesheets/govuk-template-ie8.css.erb
190
177
  - app/assets/stylesheets/govuk-template-print.css.erb
191
- - app/assets/images/apple-touch-icon-152x152.png
192
- - app/assets/images/opengraph-image.png
193
- - app/assets/images/gov.uk_logotype_crown.png
194
- - app/assets/images/apple-touch-icon-60x60.png
195
- - app/assets/images/gov.uk_logotype_crown_invert.png
196
- - app/assets/images/favicon.ico
197
- - app/assets/images/gov.uk_logotype_crown_invert_trans.png
198
- - app/assets/images/apple-touch-icon-120x120.png
199
- - app/assets/images/apple-touch-icon-76x76.png
200
- - app/assets/javascripts/vendor/goog/webfont-debug.js
201
- - app/assets/javascripts/ie.js
202
- - app/assets/javascripts/govuk-template.js
178
+ - app/assets/stylesheets/govuk-template.css.erb
179
+ - app/assets/stylesheets/images/close.png
180
+ - app/assets/stylesheets/images/govuk-crest-2x.png
181
+ - app/assets/stylesheets/images/govuk-crest-ie.png
182
+ - app/assets/stylesheets/images/govuk-crest.png
183
+ - app/assets/stylesheets/images/open-government-licence.png
184
+ - app/assets/stylesheets/images/open-government-licence_2x.png
185
+ - app/views/layouts/govuk_template.html.erb
186
+ - lib/govuk_template.rb
203
187
  - lib/govuk_template/engine.rb
204
188
  - lib/govuk_template/version.rb
205
- - lib/govuk_template.rb
206
- - LICENCE.txt
207
- - README.md
208
189
  homepage: https://github.com/alphagov/govuk_template
209
190
  licenses:
210
191
  - MIT
192
+ metadata: {}
211
193
  post_install_message:
212
194
  rdoc_options: []
213
195
  require_paths:
214
196
  - lib
215
197
  required_ruby_version: !ruby/object:Gem::Requirement
216
- none: false
217
198
  requirements:
218
- - - ! '>='
199
+ - - ">="
219
200
  - !ruby/object:Gem::Version
220
201
  version: '0'
221
- segments:
222
- - 0
223
- hash: -979245565187890978
224
202
  required_rubygems_version: !ruby/object:Gem::Requirement
225
- none: false
226
203
  requirements:
227
- - - ! '>='
204
+ - - ">="
228
205
  - !ruby/object:Gem::Version
229
206
  version: '0'
230
- segments:
231
- - 0
232
- hash: -979245565187890978
233
207
  requirements: []
234
208
  rubyforge_project:
235
- rubygems_version: 1.8.23.2
209
+ rubygems_version: 2.4.5
236
210
  signing_key:
237
- specification_version: 3
211
+ specification_version: 4
238
212
  summary: Rails engine supplying the GOV.UK header/footer template
239
213
  test_files: []