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
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e0b743b407255edecbb3f77b86cd447b6247cbdc
4
- data.tar.gz: 29148033ac82d21428ce5d26306812f0749d6891
3
+ metadata.gz: 42ad957157a4dfd1b590240994193af137b45f14
4
+ data.tar.gz: 8e118b5eeba64ef790e0827af191aa85b2cf5ccd
5
5
  SHA512:
6
- metadata.gz: e197dc6c58826a1e97bc8fe0de94bb7fafe99786eeaf118c08f839e480670a186d09d7ce9085e21a8062aae95605de8e913e054e5bf3c22fbafac47e92964cd3
7
- data.tar.gz: eced44a06cc8ca771b82b9665667767d0e5c0b1a1d1a1a1f1af9caa9fb240ce81f2e5b571c148069622ea197745a9bc0db9b0446375a77a14876ed2bca638bc4
6
+ metadata.gz: 6cb3b8234193e712cf7cc823b85e968f5182ef8103cb7449b1807891a4182b2552fe0b17e5f41240df4dcc526ab4924fc5f9909af168e855a1653c167eee042f
7
+ data.tar.gz: 18e14d29b153d566a2a1331643219f8277e7453659dfcfc7f47c25c944792543182dfed3270cd8d8c6eb99bca45efeff89dcfad1962bb8a5fa67cbc959505d7a
data/app/assets/stylesheets/govuk-template-ie6.css.erb CHANGED
@@ -6,10 +6,6 @@
6
6
  @-o-viewport {
7
7
  width: device-width; }
8
8
 
9
- /* CSS 3 Mixins
10
-
11
- Add them as you need them. This should let us manage vendor prefixes in one place.
12
- */
13
9
  @font-face {
14
10
  font-family: GDS-Logo;
15
11
  src: local("HelveticaNeue"), local("Helvetica Neue"), local("Arial"), local("Helvetica"); }
@@ -20,68 +16,44 @@
20
16
  @-o-viewport {
21
17
  width: device-width; }
22
18
 
23
- /* Cross-browser shims
24
-
25
- Ways of normalising properties across browsers.
26
- */
27
19
  @-ms-viewport {
28
20
  width: device-width; }
29
21
 
30
22
  @-o-viewport {
31
23
  width: device-width; }
32
24
 
33
- /* Usage:
34
- @include inline-block
35
-
36
- or
37
-
38
- @include inline-block("250px")
39
-
40
- which gives a min-height to the inline-block elements.
41
- */
42
- /* Contain floats usage:
25
+ @-ms-viewport {
26
+ width: device-width; }
43
27
 
44
- .this-has-floated-children {
45
- @extend %contain-floats;
46
- }
28
+ @-o-viewport {
29
+ width: device-width; }
47
30
 
48
- */
49
- #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-links {
31
+ #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-links, #global-header-bar, #global-cookie-message .outer-block, #footer .footer-wrapper, #footer .footer-meta {
50
32
  zoom: 1; }
51
- #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-links:after {
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-links:after, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
52
34
  content: "";
53
35
  display: block;
54
36
  clear: both; }
55
37
 
56
- /* CSS 3 Mixins
57
-
58
- Add them as you need them. This should let us manage vendor prefixes in one place.
59
- */
60
38
  @-ms-viewport {
61
39
  width: device-width; }
62
40
 
63
41
  @-o-viewport {
64
42
  width: device-width; }
65
43
 
66
- /*
67
-
68
- Mixin and defaults for making buttons on GOV.UK services.
69
-
70
- For guidance, see: https://www.gov.uk/service-manual/design-and-content/resources/buttons.html
44
+ #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-links, #global-header-bar, #global-cookie-message .outer-block, #footer .footer-wrapper, #footer .footer-meta {
45
+ zoom: 1; }
46
+ #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-links:after, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
47
+ content: "";
48
+ display: block;
49
+ clear: both; }
71
50
 
72
- Example usage:
51
+ @-ms-viewport {
52
+ width: device-width; }
73
53
 
74
- .button{
75
- @include button;
76
- }
77
- .button-secondary{
78
- @include button($grey-3);
79
- }
80
- .button-warning{
81
- @include button($red);
82
- }
54
+ @-o-viewport {
55
+ width: device-width; }
83
56
 
84
- */
85
57
  /* local styleguide includes */
86
58
  /* Old depricated greys, new things should use the toolkit greys */
87
59
  html, body, button, input, table, td, th {
@@ -315,49 +287,38 @@ button:focus,
315
287
  #global-header a:focus {
316
288
  color: #0b0c0c; }
317
289
 
318
- /* Cross-browser shims
319
-
320
- Ways of normalising properties across browsers.
321
- */
322
290
  @-ms-viewport {
323
291
  width: device-width; }
324
292
 
325
293
  @-o-viewport {
326
294
  width: device-width; }
327
295
 
328
- /* Usage:
329
- @include inline-block
330
-
331
- or
332
-
333
- @include inline-block("250px")
334
-
335
- which gives a min-height to the inline-block elements.
336
- */
337
- /* Contain floats usage:
338
-
339
- .this-has-floated-children {
340
- @extend %contain-floats;
341
- }
342
-
343
- */
344
- #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-links {
296
+ #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-links, #global-header-bar, #global-cookie-message .outer-block, #footer .footer-wrapper, #footer .footer-meta {
345
297
  zoom: 1; }
346
- #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-links:after {
298
+ #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-links:after, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
347
299
  content: "";
348
300
  display: block;
349
301
  clear: both; }
350
302
 
303
+ @-ms-viewport {
304
+ width: device-width; }
305
+
306
+ @-o-viewport {
307
+ width: device-width; }
308
+
351
309
  #global-header {
352
310
  background-color: #0b0c0c;
353
311
  width: 100%; }
354
312
  #global-header .header-wrapper {
313
+ background-color: #0b0c0c;
355
314
  max-width: 990px;
356
315
  margin: 0 auto;
357
- padding: 0.5em 15px;
358
- width: 960px; }
316
+ padding-top: 8px;
317
+ padding-bottom: 8px;
318
+ padding-left: 15px;
319
+ padding-right: 15px;
320
+ width: 990px; }
359
321
  #global-header .header-wrapper .header-global .header-logo {
360
- width: 49%;
361
322
  float: left;
362
323
  width: 33.33%; }
363
324
  @media screen and (max-width: 379px) {
@@ -455,6 +416,8 @@ button:focus,
455
416
  content: " \25B2"; }
456
417
  #global-header .header-proposition #proposition-menu {
457
418
  margin-top: 5px; }
419
+ #global-header .header-proposition #proposition-menu.no-proposition-name {
420
+ margin-top: 37px; }
458
421
  #global-header .header-proposition #proposition-links {
459
422
  clear: both;
460
423
  margin: 2px 0 0 0;
@@ -502,7 +465,25 @@ button:focus,
502
465
  #global-header .header-proposition #proposition-links li a:hover {
503
466
  text-decoration: underline; }
504
467
  #global-header .header-proposition #proposition-links li a.active {
505
- color: #28a197; }
468
+ color: #1d8feb; }
469
+ #global-header .header-proposition #proposition-links li a:focus {
470
+ color: #0b0c0c; }
471
+
472
+ /* Global header bar */
473
+ #global-header-bar {
474
+ margin: 0 auto;
475
+ width: auto;
476
+ max-width: 1020px;
477
+ width: 1020px; }
478
+ #global-header-bar .inner-block {
479
+ padding-left: 15px;
480
+ padding-right: 15px;
481
+ padding-left: 30px;
482
+ padding-right: 30px; }
483
+ #global-header-bar .header-bar {
484
+ height: 10px;
485
+ background-color: #005ea5;
486
+ font-size: 0; }
506
487
 
507
488
  /* Global cookie message */
508
489
  .js-enabled #global-cookie-message {
@@ -510,32 +491,44 @@ button:focus,
510
491
  /* shown with JS, always on for non-JS */ }
511
492
 
512
493
  #global-cookie-message {
513
- padding: 0.5em 2em;
514
- background-color: #d5e8f3; }
494
+ background-color: #d5e8f3;
495
+ padding-top: 10px;
496
+ padding-bottom: 10px; }
497
+ #global-cookie-message .outer-block {
498
+ margin: 0 auto;
499
+ width: auto;
500
+ max-width: 1020px;
501
+ width: 1020px; }
502
+ #global-cookie-message .inner-block {
503
+ padding-left: 15px;
504
+ padding-right: 15px;
505
+ padding-left: 30px;
506
+ padding-right: 30px; }
515
507
  #global-cookie-message p {
516
508
  font-family: "nta", Arial, sans-serif;
517
- font-size: 19px;
518
- line-height: 1.31579;
519
- font-weight: 400;
509
+ font-size: 16px;
510
+ line-height: 1.25;
511
+ font-weight: 300;
520
512
  text-transform: none;
521
- margin: 0 auto;
522
- max-width: 960px;
523
- width: 960px; }
513
+ margin: 0; }
524
514
  @media (max-width: 640px) {
525
515
  #global-cookie-message p {
526
- font-size: 16px;
527
- line-height: 1.25; } }
516
+ font-size: 14px;
517
+ line-height: 1.14286; } }
528
518
 
529
519
  /* Global footer */
530
520
  #footer {
531
521
  background-color: #dee0e2;
532
522
  border-top: 1px solid #a1acb2; }
533
523
  #footer .footer-wrapper {
534
- max-width: 60em;
535
524
  margin: 0 auto;
536
- padding: 60px 1em 0 1em;
537
- width: 928px;
538
- /* we want the width for IE to max out at 960px total (including padding) */ }
525
+ width: auto;
526
+ max-width: 1020px;
527
+ width: 1020px;
528
+ padding-top: 20px;
529
+ padding-top: 60px;
530
+ background-color: #dee0e2;
531
+ margin: 0 auto; }
539
532
  #footer a {
540
533
  color: #454a4c; }
541
534
  #footer a:hover {
@@ -556,16 +549,21 @@ button:focus,
556
549
  #footer h2 a {
557
550
  color: inherit; }
558
551
  #footer .footer-meta {
552
+ padding-left: 15px;
553
+ padding-right: 15px;
554
+ padding-left: 30px;
555
+ padding-right: 30px;
556
+ padding-bottom: 60px;
559
557
  clear: both;
560
558
  font-size: 0;
561
- color: #454a4c;
562
- padding-bottom: 60px; }
559
+ color: #454a4c; }
563
560
  #footer .footer-meta .footer-meta-inner {
564
561
  display: inline-block;
565
562
  vertical-align: bottom;
563
+ width: 100%;
566
564
  width: 75%;
567
- display: block;
568
- float: left; }
565
+ float: left;
566
+ display: block; }
569
567
  #footer .footer-meta .footer-meta-inner ul {
570
568
  font-family: "nta", Arial, sans-serif;
571
569
  font-size: 16px;
@@ -574,8 +572,9 @@ button:focus,
574
572
  text-transform: none;
575
573
  display: inline-block;
576
574
  list-style: none;
577
- margin: 0 0 1em;
578
- padding: 0; }
575
+ margin: 0 0 1.5em 0;
576
+ padding: 0;
577
+ margin: 0 0 1em 0; }
579
578
  @media (max-width: 640px) {
580
579
  #footer .footer-meta .footer-meta-inner ul {
581
580
  font-size: 14px;
@@ -592,6 +591,7 @@ button:focus,
592
591
  padding-left: 53px;
593
592
  zoom: 1; }
594
593
  #footer .footer-meta .footer-meta-inner .open-government-licence h2 {
594
+ margin-bottom: 1em;
595
595
  position: absolute;
596
596
  left: 0;
597
597
  top: 0;
@@ -620,28 +620,20 @@ button:focus,
620
620
  #footer .footer-meta .footer-meta-inner .open-government-licence p {
621
621
  font-size: 14px;
622
622
  line-height: 1.14286; } }
623
- #footer .footer-meta .footer-meta-inner .open-government-licence p a {
624
- font-family: "nta", Arial, sans-serif;
625
- font-size: 14px;
626
- line-height: 1.42857;
627
- font-weight: 400;
628
- text-transform: none; }
629
- @media (max-width: 640px) {
630
- #footer .footer-meta .footer-meta-inner .open-government-licence p a {
631
- font-size: 12px;
632
- line-height: 1.25; } }
633
623
  #footer .footer-meta .copyright {
634
624
  font-family: "nta", Arial, sans-serif;
635
625
  font-size: 16px;
636
626
  line-height: 1.25;
637
627
  font-weight: 300;
638
628
  text-transform: none;
629
+ margin: 30px 0 0 0;
630
+ width: 100%;
631
+ display: block;
639
632
  display: inline-block;
640
- float: none;
641
633
  text-align: inherit;
642
634
  width: 25%;
643
635
  padding-top: 15px;
644
- display: block;
636
+ margin-top: 0;
645
637
  float: right;
646
638
  height: 150px;
647
639
  width: 24%; }
@@ -651,11 +643,15 @@ button:focus,
651
643
  line-height: 1.14286; } }
652
644
  #footer .footer-meta .copyright a {
653
645
  display: block;
654
- padding: 115px 0 0 0;
655
- background: transparent url(<%= asset_path 'images/govuk-crest.png' %>) no-repeat 100% 0;
656
- text-align: right;
646
+ background-image: url(<%= asset_path 'images/govuk-crest.png' %>);
647
+ background-repeat: no-repeat;
648
+ background-position: 50% 0%;
649
+ background-position: 100% 0%;
650
+ background-image: url(<%= asset_path 'images/govuk-crest-ie.png' %>);
651
+ text-align: center;
657
652
  text-decoration: none;
658
- background-image: url(<%= asset_path 'images/govuk-crest-ie.png' %>); }
653
+ text-align: right;
654
+ padding: 115px 0 0 0; }
659
655
  @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
660
656
  #footer .footer-meta .copyright a {
661
657
  background-image: url(<%= asset_path 'images/govuk-crest-2x.png' %>);
data/app/assets/stylesheets/govuk-template-ie7.css.erb CHANGED
@@ -6,10 +6,6 @@
6
6
  @-o-viewport {
7
7
  width: device-width; }
8
8
 
9
- /* CSS 3 Mixins
10
-
11
- Add them as you need them. This should let us manage vendor prefixes in one place.
12
- */
13
9
  @font-face {
14
10
  font-family: GDS-Logo;
15
11
  src: local("HelveticaNeue"), local("Helvetica Neue"), local("Arial"), local("Helvetica"); }
@@ -20,68 +16,44 @@
20
16
  @-o-viewport {
21
17
  width: device-width; }
22
18
 
23
- /* Cross-browser shims
24
-
25
- Ways of normalising properties across browsers.
26
- */
27
19
  @-ms-viewport {
28
20
  width: device-width; }
29
21
 
30
22
  @-o-viewport {
31
23
  width: device-width; }
32
24
 
33
- /* Usage:
34
- @include inline-block
35
-
36
- or
37
-
38
- @include inline-block("250px")
39
-
40
- which gives a min-height to the inline-block elements.
41
- */
42
- /* Contain floats usage:
25
+ @-ms-viewport {
26
+ width: device-width; }
43
27
 
44
- .this-has-floated-children {
45
- @extend %contain-floats;
46
- }
28
+ @-o-viewport {
29
+ width: device-width; }
47
30
 
48
- */
49
- #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-links {
31
+ #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-links, #global-header-bar, #global-cookie-message .outer-block, #footer .footer-wrapper, #footer .footer-meta {
50
32
  zoom: 1; }
51
- #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-links:after {
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-links:after, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
52
34
  content: "";
53
35
  display: block;
54
36
  clear: both; }
55
37
 
56
- /* CSS 3 Mixins
57
-
58
- Add them as you need them. This should let us manage vendor prefixes in one place.
59
- */
60
38
  @-ms-viewport {
61
39
  width: device-width; }
62
40
 
63
41
  @-o-viewport {
64
42
  width: device-width; }
65
43
 
66
- /*
67
-
68
- Mixin and defaults for making buttons on GOV.UK services.
69
-
70
- For guidance, see: https://www.gov.uk/service-manual/design-and-content/resources/buttons.html
44
+ #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-links, #global-header-bar, #global-cookie-message .outer-block, #footer .footer-wrapper, #footer .footer-meta {
45
+ zoom: 1; }
46
+ #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-links:after, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
47
+ content: "";
48
+ display: block;
49
+ clear: both; }
71
50
 
72
- Example usage:
51
+ @-ms-viewport {
52
+ width: device-width; }
73
53
 
74
- .button{
75
- @include button;
76
- }
77
- .button-secondary{
78
- @include button($grey-3);
79
- }
80
- .button-warning{
81
- @include button($red);
82
- }
54
+ @-o-viewport {
55
+ width: device-width; }
83
56
 
84
- */
85
57
  /* local styleguide includes */
86
58
  /* Old depricated greys, new things should use the toolkit greys */
87
59
  html, body, button, input, table, td, th {
@@ -315,48 +287,38 @@ button:focus,
315
287
  #global-header a:focus {
316
288
  color: #0b0c0c; }
317
289
 
318
- /* Cross-browser shims
319
-
320
- Ways of normalising properties across browsers.
321
- */
322
290
  @-ms-viewport {
323
291
  width: device-width; }
324
292
 
325
293
  @-o-viewport {
326
294
  width: device-width; }
327
295
 
328
- /* Usage:
329
- @include inline-block
330
-
331
- or
332
-
333
- @include inline-block("250px")
334
-
335
- which gives a min-height to the inline-block elements.
336
- */
337
- /* Contain floats usage:
338
-
339
- .this-has-floated-children {
340
- @extend %contain-floats;
341
- }
342
-
343
- */
344
- #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-links {
296
+ #global-header .header-wrapper, #global-header .header-wrapper .header-global, #global-header .header-wrapper .header-global .header-logo, #global-header .header-proposition #proposition-links, #global-header-bar, #global-cookie-message .outer-block, #footer .footer-wrapper, #footer .footer-meta {
345
297
  zoom: 1; }
346
- #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-links:after {
298
+ #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-links:after, #global-header-bar:after, #global-cookie-message .outer-block:after, #footer .footer-wrapper:after, #footer .footer-meta:after {
347
299
  content: "";
348
300
  display: block;
349
301
  clear: both; }
350
302
 
303
+ @-ms-viewport {
304
+ width: device-width; }
305
+
306
+ @-o-viewport {
307
+ width: device-width; }
308
+
351
309
  #global-header {
352
310
  background-color: #0b0c0c;
353
311
  width: 100%; }
354
312
  #global-header .header-wrapper {
313
+ background-color: #0b0c0c;
355
314
  max-width: 990px;
356
315
  margin: 0 auto;
357
- padding: 0.5em 15px; }
316
+ padding-top: 8px;
317
+ padding-bottom: 8px;
318
+ padding-left: 15px;
319
+ padding-right: 15px;
320
+ width: 990px; }
358
321
  #global-header .header-wrapper .header-global .header-logo {
359
- width: 49%;
360
322
  float: left;
361
323
  width: 33.33%; }
362
324
  @media screen and (max-width: 379px) {
@@ -454,6 +416,8 @@ button:focus,
454
416
  content: " \25B2"; }
455
417
  #global-header .header-proposition #proposition-menu {
456
418
  margin-top: 5px; }
419
+ #global-header .header-proposition #proposition-menu.no-proposition-name {
420
+ margin-top: 37px; }
457
421
  #global-header .header-proposition #proposition-links {
458
422
  clear: both;
459
423
  margin: 2px 0 0 0;
@@ -501,7 +465,25 @@ button:focus,
501
465
  #global-header .header-proposition #proposition-links li a:hover {
502
466
  text-decoration: underline; }
503
467
  #global-header .header-proposition #proposition-links li a.active {
504
- color: #28a197; }
468
+ color: #1d8feb; }
469
+ #global-header .header-proposition #proposition-links li a:focus {
470
+ color: #0b0c0c; }
471
+
472
+ /* Global header bar */
473
+ #global-header-bar {
474
+ margin: 0 auto;
475
+ width: auto;
476
+ max-width: 1020px;
477
+ width: 1020px; }
478
+ #global-header-bar .inner-block {
479
+ padding-left: 15px;
480
+ padding-right: 15px;
481
+ padding-left: 30px;
482
+ padding-right: 30px; }
483
+ #global-header-bar .header-bar {
484
+ height: 10px;
485
+ background-color: #005ea5;
486
+ font-size: 0; }
505
487
 
506
488
  /* Global cookie message */
507
489
  .js-enabled #global-cookie-message {
@@ -509,31 +491,44 @@ button:focus,
509
491
  /* shown with JS, always on for non-JS */ }
510
492
 
511
493
  #global-cookie-message {
512
- padding: 0.5em 2em;
513
- background-color: #d5e8f3; }
494
+ background-color: #d5e8f3;
495
+ padding-top: 10px;
496
+ padding-bottom: 10px; }
497
+ #global-cookie-message .outer-block {
498
+ margin: 0 auto;
499
+ width: auto;
500
+ max-width: 1020px;
501
+ width: 1020px; }
502
+ #global-cookie-message .inner-block {
503
+ padding-left: 15px;
504
+ padding-right: 15px;
505
+ padding-left: 30px;
506
+ padding-right: 30px; }
514
507
  #global-cookie-message p {
515
508
  font-family: "nta", Arial, sans-serif;
516
- font-size: 19px;
517
- line-height: 1.31579;
518
- font-weight: 400;
509
+ font-size: 16px;
510
+ line-height: 1.25;
511
+ font-weight: 300;
519
512
  text-transform: none;
520
- margin: 0 auto;
521
- max-width: 960px; }
513
+ margin: 0; }
522
514
  @media (max-width: 640px) {
523
515
  #global-cookie-message p {
524
- font-size: 16px;
525
- line-height: 1.25; } }
516
+ font-size: 14px;
517
+ line-height: 1.14286; } }
526
518
 
527
519
  /* Global footer */
528
520
  #footer {
529
521
  background-color: #dee0e2;
530
522
  border-top: 1px solid #a1acb2; }
531
523
  #footer .footer-wrapper {
532
- max-width: 60em;
533
524
  margin: 0 auto;
534
- padding: 60px 1em 0 1em;
535
- width: 928px;
536
- /* we want the width for IE to max out at 960px total (including padding) */ }
525
+ width: auto;
526
+ max-width: 1020px;
527
+ width: 1020px;
528
+ padding-top: 20px;
529
+ padding-top: 60px;
530
+ background-color: #dee0e2;
531
+ margin: 0 auto; }
537
532
  #footer a {
538
533
  color: #454a4c; }
539
534
  #footer a:hover {
@@ -554,16 +549,21 @@ button:focus,
554
549
  #footer h2 a {
555
550
  color: inherit; }
556
551
  #footer .footer-meta {
552
+ padding-left: 15px;
553
+ padding-right: 15px;
554
+ padding-left: 30px;
555
+ padding-right: 30px;
556
+ padding-bottom: 60px;
557
557
  clear: both;
558
558
  font-size: 0;
559
- color: #454a4c;
560
- padding-bottom: 60px; }
559
+ color: #454a4c; }
561
560
  #footer .footer-meta .footer-meta-inner {
562
561
  display: inline-block;
563
562
  vertical-align: bottom;
563
+ width: 100%;
564
564
  width: 75%;
565
- display: block;
566
- float: left; }
565
+ float: left;
566
+ display: block; }
567
567
  #footer .footer-meta .footer-meta-inner ul {
568
568
  font-family: "nta", Arial, sans-serif;
569
569
  font-size: 16px;
@@ -572,8 +572,9 @@ button:focus,
572
572
  text-transform: none;
573
573
  display: inline-block;
574
574
  list-style: none;
575
- margin: 0 0 1em;
576
- padding: 0; }
575
+ margin: 0 0 1.5em 0;
576
+ padding: 0;
577
+ margin: 0 0 1em 0; }
577
578
  @media (max-width: 640px) {
578
579
  #footer .footer-meta .footer-meta-inner ul {
579
580
  font-size: 14px;
@@ -589,6 +590,7 @@ button:focus,
589
590
  position: relative;
590
591
  padding-left: 53px; }
591
592
  #footer .footer-meta .footer-meta-inner .open-government-licence h2 {
593
+ margin-bottom: 1em;
592
594
  position: absolute;
593
595
  left: 0;
594
596
  top: 0;
@@ -617,28 +619,20 @@ button:focus,
617
619
  #footer .footer-meta .footer-meta-inner .open-government-licence p {
618
620
  font-size: 14px;
619
621
  line-height: 1.14286; } }
620
- #footer .footer-meta .footer-meta-inner .open-government-licence p a {
621
- font-family: "nta", Arial, sans-serif;
622
- font-size: 14px;
623
- line-height: 1.42857;
624
- font-weight: 400;
625
- text-transform: none; }
626
- @media (max-width: 640px) {
627
- #footer .footer-meta .footer-meta-inner .open-government-licence p a {
628
- font-size: 12px;
629
- line-height: 1.25; } }
630
622
  #footer .footer-meta .copyright {
631
623
  font-family: "nta", Arial, sans-serif;
632
624
  font-size: 16px;
633
625
  line-height: 1.25;
634
626
  font-weight: 300;
635
627
  text-transform: none;
628
+ margin: 30px 0 0 0;
629
+ width: 100%;
630
+ display: block;
636
631
  display: inline-block;
637
- float: none;
638
632
  text-align: inherit;
639
633
  width: 25%;
640
634
  padding-top: 15px;
641
- display: block;
635
+ margin-top: 0;
642
636
  float: right;
643
637
  height: 150px;
644
638
  width: 24%; }
@@ -648,10 +642,14 @@ button:focus,
648
642
  line-height: 1.14286; } }
649
643
  #footer .footer-meta .copyright a {
650
644
  display: block;
651
- padding: 115px 0 0 0;
652
- background: transparent url(<%= asset_path 'images/govuk-crest.png' %>) no-repeat 100% 0;
645
+ background-image: url(<%= asset_path 'images/govuk-crest.png' %>);
646
+ background-repeat: no-repeat;
647
+ background-position: 50% 0%;
648
+ background-position: 100% 0%;
649
+ text-align: center;
650
+ text-decoration: none;
653
651
  text-align: right;
654
- text-decoration: none; }
652
+ padding: 115px 0 0 0; }
655
653
  @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 20 / 10), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
656
654
  #footer .footer-meta .copyright a {
657
655
  background-image: url(<%= asset_path 'images/govuk-crest-2x.png' %>);