govuk_publishing_components 23.0.0 → 23.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/govuk_publishing_components/analytics/init.js +56 -0
- data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/magna-charta.js +9 -8
- data/app/assets/stylesheets/govuk_publishing_components/components/_image-card.scss +1 -0
- data/app/assets/stylesheets/govuk_publishing_components/components/_input.scss +0 -46
- data/app/assets/stylesheets/govuk_publishing_components/components/_layout-header.scss +5 -0
- data/app/assets/stylesheets/govuk_publishing_components/components/_print-link.scss +0 -2
- data/app/assets/stylesheets/govuk_publishing_components/components/_search.scss +7 -1
- data/app/assets/stylesheets/govuk_publishing_components/components/print/_govspeak.scss +4 -0
- data/app/views/govuk_publishing_components/components/_input.html.erb +6 -6
- data/app/views/govuk_publishing_components/components/_print_link.html.erb +18 -11
- data/app/views/govuk_publishing_components/components/docs/govspeak.yml +14 -0
- data/app/views/govuk_publishing_components/components/docs/print_link.yml +5 -0
- data/lib/govuk_publishing_components/version.rb +1 -1
- data/node_modules/govuk-frontend/govuk/all.js +31 -37
- data/node_modules/govuk-frontend/govuk/components/accordion/README.md +1 -1
- data/node_modules/govuk-frontend/govuk/components/accordion/_index.scss +0 -1
- data/node_modules/govuk-frontend/govuk/components/accordion/fixtures.json +235 -0
- data/node_modules/govuk-frontend/govuk/components/back-link/_index.scss +0 -2
- data/node_modules/govuk-frontend/govuk/components/back-link/fixtures.json +56 -0
- data/node_modules/govuk-frontend/govuk/components/breadcrumbs/_index.scss +0 -1
- data/node_modules/govuk-frontend/govuk/components/breadcrumbs/fixtures.json +172 -0
- data/node_modules/govuk-frontend/govuk/components/button/_index.scss +3 -3
- data/node_modules/govuk-frontend/govuk/components/button/fixtures.json +275 -0
- data/node_modules/govuk-frontend/govuk/components/character-count/fixtures.json +170 -0
- data/node_modules/govuk-frontend/govuk/components/checkboxes/_index.scss +13 -13
- data/node_modules/govuk-frontend/govuk/components/checkboxes/fixtures.json +1015 -0
- data/node_modules/govuk-frontend/govuk/components/date-input/fixtures.json +499 -0
- data/node_modules/govuk-frontend/govuk/components/details/_index.scss +0 -1
- data/node_modules/govuk-frontend/govuk/components/details/fixtures.json +83 -0
- data/node_modules/govuk-frontend/govuk/components/error-message/fixtures.json +66 -0
- data/node_modules/govuk-frontend/govuk/components/error-summary/_index.scss +0 -2
- data/node_modules/govuk-frontend/govuk/components/error-summary/fixtures.json +181 -0
- data/node_modules/govuk-frontend/govuk/components/fieldset/_index.scss +1 -1
- data/node_modules/govuk-frontend/govuk/components/fieldset/fixtures.json +93 -0
- data/node_modules/govuk-frontend/govuk/components/fieldset/macro-options.json +6 -0
- data/node_modules/govuk-frontend/govuk/components/fieldset/template.njk +5 -1
- data/node_modules/govuk-frontend/govuk/components/file-upload/fixtures.json +151 -0
- data/node_modules/govuk-frontend/govuk/components/footer/_index.scss +0 -1
- data/node_modules/govuk-frontend/govuk/components/footer/fixtures.json +482 -0
- data/node_modules/govuk-frontend/govuk/components/header/_index.scss +2 -5
- data/node_modules/govuk-frontend/govuk/components/header/fixtures.json +360 -0
- data/node_modules/govuk-frontend/govuk/components/header/header.js +665 -316
- data/node_modules/govuk-frontend/govuk/components/header/macro-options.json +13 -1
- data/node_modules/govuk-frontend/govuk/components/header/template.njk +9 -5
- data/node_modules/govuk-frontend/govuk/components/hint/_index.scss +0 -2
- data/node_modules/govuk-frontend/govuk/components/hint/fixtures.json +50 -0
- data/node_modules/govuk-frontend/govuk/components/hint/macro-options.json +1 -1
- data/node_modules/govuk-frontend/govuk/components/input/_index.scss +91 -0
- data/node_modules/govuk-frontend/govuk/components/input/fixtures.json +538 -0
- data/node_modules/govuk-frontend/govuk/components/input/macro-options.json +64 -0
- data/node_modules/govuk-frontend/govuk/components/input/template.njk +17 -0
- data/node_modules/govuk-frontend/govuk/components/inset-text/fixtures.json +49 -0
- data/node_modules/govuk-frontend/govuk/components/label/fixtures.json +75 -0
- data/node_modules/govuk-frontend/govuk/components/panel/_index.scss +6 -2
- data/node_modules/govuk-frontend/govuk/components/panel/fixtures.json +74 -0
- data/node_modules/govuk-frontend/govuk/components/phase-banner/fixtures.json +65 -0
- data/node_modules/govuk-frontend/govuk/components/radios/_index.scss +13 -13
- data/node_modules/govuk-frontend/govuk/components/radios/fixtures.json +1066 -0
- data/node_modules/govuk-frontend/govuk/components/radios/macro-options.json +2 -2
- data/node_modules/govuk-frontend/govuk/components/select/_index.scss +0 -1
- data/node_modules/govuk-frontend/govuk/components/select/fixtures.json +248 -0
- data/node_modules/govuk-frontend/govuk/components/skip-link/fixtures.json +72 -0
- data/node_modules/govuk-frontend/govuk/components/summary-list/README.md +1 -1
- data/node_modules/govuk-frontend/govuk/components/summary-list/_index.scss +2 -10
- data/node_modules/govuk-frontend/govuk/components/summary-list/fixtures.json +991 -0
- data/node_modules/govuk-frontend/govuk/components/table/fixtures.json +468 -0
- data/node_modules/govuk-frontend/govuk/components/tabs/_index.scss +3 -6
- data/node_modules/govuk-frontend/govuk/components/tabs/fixtures.json +229 -0
- data/node_modules/govuk-frontend/govuk/components/tag/_index.scss +0 -1
- data/node_modules/govuk-frontend/govuk/components/tag/fixtures.json +117 -0
- data/node_modules/govuk-frontend/govuk/components/textarea/_index.scss +0 -1
- data/node_modules/govuk-frontend/govuk/components/textarea/fixtures.json +199 -0
- data/node_modules/govuk-frontend/govuk/components/warning-text/_index.scss +0 -1
- data/node_modules/govuk-frontend/govuk/components/warning-text/fixtures.json +68 -0
- data/node_modules/govuk-frontend/govuk/helpers/_device-pixels.scss +3 -3
- data/node_modules/govuk-frontend/govuk/helpers/_font-faces.scss +9 -11
- data/node_modules/govuk-frontend/govuk/helpers/_links.scss +1 -3
- data/node_modules/govuk-frontend/govuk/helpers/_media-queries.scss +1 -5
- data/node_modules/govuk-frontend/govuk/helpers/_spacing.scss +2 -1
- data/node_modules/govuk-frontend/govuk/helpers/_typography.scss +7 -6
- data/node_modules/govuk-frontend/govuk/objects/_form-group.scss +0 -1
- data/node_modules/govuk-frontend/govuk/objects/_grid.scss +2 -3
- data/node_modules/govuk-frontend/govuk/objects/_main-wrapper.scss +0 -1
- data/node_modules/govuk-frontend/govuk/overrides/_display.scss +1 -1
- data/node_modules/govuk-frontend/govuk/overrides/_width.scss +1 -0
- data/node_modules/govuk-frontend/govuk/settings/_colours-applied.scss +0 -3
- data/node_modules/govuk-frontend/govuk/settings/_colours-organisations.scss +3 -0
- data/node_modules/govuk-frontend/govuk/settings/_colours-palette.scss +9 -2
- data/node_modules/govuk-frontend/govuk/settings/_compatibility.scss +0 -1
- data/node_modules/govuk-frontend/govuk/settings/_measurements.scss +0 -4
- data/node_modules/govuk-frontend/govuk/settings/_typography-font-families.scss +2 -2
- data/node_modules/govuk-frontend/govuk/settings/_typography-font.scss +11 -5
- data/node_modules/govuk-frontend/govuk/settings/_typography-responsive.scss +6 -2
- data/node_modules/govuk-frontend/govuk/tools/_font-url.scss +0 -3
- data/node_modules/govuk-frontend/govuk/tools/_image-url.scss +0 -3
- data/node_modules/govuk-frontend/govuk/utilities/_visually-hidden.scss +0 -1
- data/node_modules/govuk-frontend/govuk/vendor/_sass-mq.scss +0 -4
- data/node_modules/govuk-frontend/package.json +1 -1
- metadata +32 -3
- data/app/assets/javascripts/govuk_publishing_components/analytics/init.js.erb +0 -50
@@ -0,0 +1,68 @@
|
|
1
|
+
{
|
2
|
+
"component": "warning-text",
|
3
|
+
"fixtures": [
|
4
|
+
{
|
5
|
+
"name": "default",
|
6
|
+
"options": {
|
7
|
+
"text": "You can be fined up to £5,000 if you don’t register.",
|
8
|
+
"iconFallbackText": "Warning"
|
9
|
+
},
|
10
|
+
"html": "<div class=\"govuk-warning-text\">\n <span class=\"govuk-warning-text__icon\" aria-hidden=\"true\">!</span>\n <strong class=\"govuk-warning-text__text\">\n <span class=\"govuk-warning-text__assistive\">Warning</span>\n You can be fined up to £5,000 if you don’t register.\n </strong>\n</div>"
|
11
|
+
},
|
12
|
+
{
|
13
|
+
"name": "multiple lines",
|
14
|
+
"options": {
|
15
|
+
"text": "If you are not covered by this License), You must: (a) comply with the terms stated above for the purpose of this license. It explains, for example, the production of a Source form, including but not limited to, the implied warranties or conditions of this License, without any additional file created by such Respondent to you under Sections 2.1 and 2.2 above. Larger Works. You may choose to distribute such a notice and a brief idea of what it does.",
|
16
|
+
"iconFallbackText": "Warning"
|
17
|
+
},
|
18
|
+
"html": "<div class=\"govuk-warning-text\">\n <span class=\"govuk-warning-text__icon\" aria-hidden=\"true\">!</span>\n <strong class=\"govuk-warning-text__text\">\n <span class=\"govuk-warning-text__assistive\">Warning</span>\n If you are not covered by this License), You must: (a) comply with the terms stated above for the purpose of this license. It explains, for example, the production of a Source form, including but not limited to, the implied warranties or conditions of this License, without any additional file created by such Respondent to you under Sections 2.1 and 2.2 above. Larger Works. You may choose to distribute such a notice and a brief idea of what it does.\n </strong>\n</div>"
|
19
|
+
},
|
20
|
+
{
|
21
|
+
"name": "attributes",
|
22
|
+
"options": {
|
23
|
+
"attributes": {
|
24
|
+
"id": "my-warning-text",
|
25
|
+
"data-test": "attribute"
|
26
|
+
}
|
27
|
+
},
|
28
|
+
"html": "<div class=\"govuk-warning-text\" id=\"my-warning-text\" data-test=\"attribute\">\n <span class=\"govuk-warning-text__icon\" aria-hidden=\"true\">!</span>\n <strong class=\"govuk-warning-text__text\">\n <span class=\"govuk-warning-text__assistive\"></span>\n \n </strong>\n</div>"
|
29
|
+
},
|
30
|
+
{
|
31
|
+
"name": "classes",
|
32
|
+
"options": {
|
33
|
+
"text": "Warning text",
|
34
|
+
"iconFallbackText": "Warning",
|
35
|
+
"classes": "govuk-warning-text--custom-class"
|
36
|
+
},
|
37
|
+
"html": "<div class=\"govuk-warning-text govuk-warning-text--custom-class\">\n <span class=\"govuk-warning-text__icon\" aria-hidden=\"true\">!</span>\n <strong class=\"govuk-warning-text__text\">\n <span class=\"govuk-warning-text__assistive\">Warning</span>\n Warning text\n </strong>\n</div>"
|
38
|
+
},
|
39
|
+
{
|
40
|
+
"name": "html",
|
41
|
+
"options": {
|
42
|
+
"html": "<span>Some custom warning text</span>"
|
43
|
+
},
|
44
|
+
"html": "<div class=\"govuk-warning-text\">\n <span class=\"govuk-warning-text__icon\" aria-hidden=\"true\">!</span>\n <strong class=\"govuk-warning-text__text\">\n <span class=\"govuk-warning-text__assistive\"></span>\n <span>Some custom warning text</span>\n </strong>\n</div>"
|
45
|
+
},
|
46
|
+
{
|
47
|
+
"name": "html as text",
|
48
|
+
"options": {
|
49
|
+
"text": "<span>Some custom warning text</span>"
|
50
|
+
},
|
51
|
+
"html": "<div class=\"govuk-warning-text\">\n <span class=\"govuk-warning-text__icon\" aria-hidden=\"true\">!</span>\n <strong class=\"govuk-warning-text__text\">\n <span class=\"govuk-warning-text__assistive\"></span>\n <span>Some custom warning text</span>\n </strong>\n</div>"
|
52
|
+
},
|
53
|
+
{
|
54
|
+
"name": "icon fallback text only",
|
55
|
+
"options": {
|
56
|
+
"iconFallbackText": "Some custom fallback text"
|
57
|
+
},
|
58
|
+
"html": "<div class=\"govuk-warning-text\">\n <span class=\"govuk-warning-text__icon\" aria-hidden=\"true\">!</span>\n <strong class=\"govuk-warning-text__text\">\n <span class=\"govuk-warning-text__assistive\">Some custom fallback text</span>\n \n </strong>\n</div>"
|
59
|
+
},
|
60
|
+
{
|
61
|
+
"name": "text only",
|
62
|
+
"options": {
|
63
|
+
"text": "Some custom warning text"
|
64
|
+
},
|
65
|
+
"html": "<div class=\"govuk-warning-text\">\n <span class=\"govuk-warning-text__icon\" aria-hidden=\"true\">!</span>\n <strong class=\"govuk-warning-text__text\">\n <span class=\"govuk-warning-text__assistive\"></span>\n Some custom warning text\n </strong>\n</div>"
|
66
|
+
}
|
67
|
+
]
|
68
|
+
}
|
@@ -28,10 +28,10 @@
|
|
28
28
|
/// @access public
|
29
29
|
|
30
30
|
@mixin govuk-device-pixel-ratio($ratio: 2) {
|
31
|
+
// stylelint-disable indentation
|
31
32
|
@media only screen and (-webkit-min-device-pixel-ratio: $ratio),
|
32
|
-
only screen and (
|
33
|
-
only screen and (
|
34
|
-
only screen and ( min-resolution: #{$ratio}dppx) {
|
33
|
+
only screen and (min-resolution: #{($ratio * 96)}dpi),
|
34
|
+
only screen and (min-resolution: #{$ratio}dppx) {
|
35
35
|
@content;
|
36
36
|
}
|
37
37
|
}
|
@@ -2,9 +2,6 @@
|
|
2
2
|
/// @group helpers
|
3
3
|
////
|
4
4
|
|
5
|
-
// Disables linting for this file only
|
6
|
-
// sass-lint:disable no-css-comments, no-duplicate-properties, property-sort-order, indentation
|
7
|
-
|
8
5
|
@import "../tools/exports";
|
9
6
|
|
10
7
|
/// Font Face - GDS Transport
|
@@ -18,23 +15,24 @@
|
|
18
15
|
@include govuk-not-ie8 { // In IE8, which cannot render WOFF format, we fall back to system fonts
|
19
16
|
@include govuk-exports("govuk/helpers/font-faces") {
|
20
17
|
@at-root {
|
21
|
-
/*! Copyright (c) 2011 by Margaret Calvert & Henrik Kubel. All rights reserved. The font has been customised for exclusive use on gov.uk. This cut is not commercially available. */
|
22
|
-
|
18
|
+
/*! Copyright (c) 2011 by Margaret Calvert & Henrik Kubel. All rights reserved. The font has been customised for exclusive use on gov.uk. This cut is not commercially available. */ /* stylelint-disable-line scss/comment-no-loud */
|
23
19
|
@font-face {
|
24
20
|
font-family: "GDS Transport";
|
25
|
-
src: govuk-font-url("light-94a07e06a1-v2.woff2") format("woff2"),
|
26
|
-
govuk-font-url("light-f591b13f7d-v2.woff") format("woff");
|
27
|
-
font-weight: normal;
|
28
21
|
font-style: normal;
|
22
|
+
font-weight: normal;
|
23
|
+
src:
|
24
|
+
govuk-font-url("light-94a07e06a1-v2.woff2") format("woff2"),
|
25
|
+
govuk-font-url("light-f591b13f7d-v2.woff") format("woff");
|
29
26
|
font-display: fallback;
|
30
27
|
}
|
31
28
|
|
32
29
|
@font-face {
|
33
30
|
font-family: "GDS Transport";
|
34
|
-
src: govuk-font-url("bold-b542beb274-v2.woff2") format("woff2"),
|
35
|
-
govuk-font-url("bold-affa96571d-v2.woff") format("woff");
|
36
|
-
font-weight: bold;
|
37
31
|
font-style: normal;
|
32
|
+
font-weight: bold;
|
33
|
+
src:
|
34
|
+
govuk-font-url("bold-b542beb274-v2.woff2") format("woff2"),
|
35
|
+
govuk-font-url("bold-affa96571d-v2.woff") format("woff");
|
38
36
|
font-display: fallback;
|
39
37
|
}
|
40
38
|
}
|
@@ -142,7 +142,6 @@
|
|
142
142
|
}
|
143
143
|
}
|
144
144
|
|
145
|
-
|
146
145
|
/// No visited state link mixin
|
147
146
|
///
|
148
147
|
/// Used in cases where it is not helpful to distinguish between visited and
|
@@ -196,11 +195,10 @@
|
|
196
195
|
|
197
196
|
@mixin govuk-link-print-friendly {
|
198
197
|
@include govuk-media-query($media-type: print) {
|
199
|
-
|
200
198
|
&[href^="/"],
|
201
199
|
&[href^="http://"],
|
202
200
|
&[href^="https://"] {
|
203
|
-
|
201
|
+
&:after {
|
204
202
|
content: " (" attr(href) ")";
|
205
203
|
font-size: 90%;
|
206
204
|
|
@@ -2,8 +2,6 @@
|
|
2
2
|
/// @group helpers/layout
|
3
3
|
////
|
4
4
|
|
5
|
-
|
6
|
-
|
7
5
|
// =========================================================
|
8
6
|
// Wrangle sass-mq config...
|
9
7
|
// =========================================================
|
@@ -41,8 +39,6 @@ $sass-mq-already-included: false !default;
|
|
41
39
|
|
42
40
|
$sass-mq-already-included: true;
|
43
41
|
|
44
|
-
|
45
|
-
|
46
42
|
// =========================================================
|
47
43
|
// Helpers
|
48
44
|
// =========================================================
|
@@ -91,5 +87,5 @@ $sass-mq-already-included: true;
|
|
91
87
|
@mixin govuk-media-query($args...) {
|
92
88
|
@include mq($args...) {
|
93
89
|
@content;
|
94
|
-
}
|
90
|
+
}
|
95
91
|
}
|
@@ -2,6 +2,8 @@
|
|
2
2
|
/// @group helpers/spacing
|
3
3
|
////
|
4
4
|
|
5
|
+
// stylelint-disable indentation
|
6
|
+
|
5
7
|
/// Single point spacing
|
6
8
|
///
|
7
9
|
/// Returns measurement corresponding to the spacing point requested.
|
@@ -146,7 +148,6 @@
|
|
146
148
|
///
|
147
149
|
/// @access public
|
148
150
|
|
149
|
-
|
150
151
|
@mixin govuk-responsive-padding($responsive-spacing-point, $direction: "all", $important: false, $adjustment: false) {
|
151
152
|
@include _govuk-responsive-spacing($responsive-spacing-point, "padding", $direction, $important, $adjustment);
|
152
153
|
}
|
@@ -127,7 +127,8 @@
|
|
127
127
|
$font-size-rem: govuk-px-to-rem($font-size);
|
128
128
|
|
129
129
|
$line-height: _govuk-line-height(
|
130
|
-
$line-height: if(
|
130
|
+
$line-height: if(
|
131
|
+
$override-line-height,
|
131
132
|
$override-line-height,
|
132
133
|
map-get($breakpoint-map, "line-height")
|
133
134
|
),
|
@@ -142,9 +143,9 @@
|
|
142
143
|
$line-height: $line-height if($important, !important, null);
|
143
144
|
|
144
145
|
@if $breakpoint == null {
|
145
|
-
font-size: $font-size;
|
146
|
+
font-size: $font-size;
|
146
147
|
@if $govuk-typography-use-rem {
|
147
|
-
font-size: $font-size-rem;
|
148
|
+
font-size: $font-size-rem;
|
148
149
|
}
|
149
150
|
line-height: $line-height;
|
150
151
|
} @else if $breakpoint == "print" {
|
@@ -154,9 +155,9 @@
|
|
154
155
|
}
|
155
156
|
} @else {
|
156
157
|
@include govuk-media-query($from: $breakpoint) {
|
157
|
-
font-size: $font-size;
|
158
|
+
font-size: $font-size;
|
158
159
|
@if $govuk-typography-use-rem {
|
159
|
-
font-size: $font-size-rem;
|
160
|
+
font-size: $font-size-rem;
|
160
161
|
}
|
161
162
|
line-height: $line-height;
|
162
163
|
}
|
@@ -184,7 +185,7 @@
|
|
184
185
|
-webkit-font-feature-settings: "tnum" 1;
|
185
186
|
font-feature-settings: "tnum" 1;
|
186
187
|
|
187
|
-
@supports(font-variant-numeric: tabular-nums) {
|
188
|
+
@supports (font-variant-numeric: tabular-nums) {
|
188
189
|
-webkit-font-feature-settings: normal;
|
189
190
|
font-feature-settings: normal;
|
190
191
|
font-variant-numeric: tabular-nums;
|
@@ -1,7 +1,6 @@
|
|
1
1
|
@import "../base";
|
2
2
|
|
3
3
|
@include govuk-exports("govuk/objects/grid") {
|
4
|
-
|
5
4
|
.govuk-grid-row {
|
6
5
|
@include govuk-clearfix;
|
7
6
|
margin-right: - ($govuk-gutter-half);
|
@@ -10,7 +9,7 @@
|
|
10
9
|
|
11
10
|
@each $width in map-keys($govuk-grid-widths) {
|
12
11
|
.govuk-grid-column-#{$width} {
|
13
|
-
@include govuk-grid-column($width)
|
12
|
+
@include govuk-grid-column($width);
|
14
13
|
}
|
15
14
|
}
|
16
15
|
|
@@ -19,7 +18,7 @@
|
|
19
18
|
// them in the outputted CSS
|
20
19
|
@each $width in map-keys($govuk-grid-widths) {
|
21
20
|
.govuk-grid-column-#{$width}-from-desktop {
|
22
|
-
@include govuk-grid-column($width, $at: desktop)
|
21
|
+
@include govuk-grid-column($width, $at: desktop);
|
23
22
|
}
|
24
23
|
}
|
25
24
|
}
|
@@ -4,8 +4,6 @@
|
|
4
4
|
|
5
5
|
@import "../helpers/colour";
|
6
6
|
|
7
|
-
|
8
|
-
|
9
7
|
// =========================================================
|
10
8
|
// Generic
|
11
9
|
// =========================================================
|
@@ -115,7 +113,6 @@ $govuk-input-border-colour: govuk-colour("black") !default;
|
|
115
113
|
|
116
114
|
$govuk-hover-colour: govuk-colour("mid-grey", $legacy: "grey-3");
|
117
115
|
|
118
|
-
|
119
116
|
// =============================================================================
|
120
117
|
// Links
|
121
118
|
// =============================================================================
|
@@ -1,5 +1,8 @@
|
|
1
1
|
@import "compatibility";
|
2
2
|
|
3
|
+
// stylelint-disable value-list-max-empty-lines -- allow empty lines in lists
|
4
|
+
// in this file to allow grouping
|
5
|
+
|
3
6
|
////
|
4
7
|
/// @group settings/colours
|
5
8
|
////
|
@@ -13,11 +16,15 @@
|
|
13
16
|
/// @type Boolean
|
14
17
|
/// @access public
|
15
18
|
|
16
|
-
$govuk-use-legacy-palette: if(
|
19
|
+
$govuk-use-legacy-palette: if(
|
20
|
+
(
|
17
21
|
$govuk-compatibility-govukfrontendtoolkit or
|
18
22
|
$govuk-compatibility-govuktemplate or
|
19
23
|
$govuk-compatibility-govukelements
|
20
|
-
),
|
24
|
+
),
|
25
|
+
true,
|
26
|
+
false
|
27
|
+
) !default;
|
21
28
|
|
22
29
|
/// Modern colour palette
|
23
30
|
///
|
@@ -2,8 +2,6 @@
|
|
2
2
|
/// @group settings/measurements
|
3
3
|
////
|
4
4
|
|
5
|
-
|
6
|
-
|
7
5
|
// =========================================================
|
8
6
|
// Page layout
|
9
7
|
// =========================================================
|
@@ -43,8 +41,6 @@ $govuk-gutter: 30px !default;
|
|
43
41
|
|
44
42
|
$govuk-gutter-half: $govuk-gutter / 2;
|
45
43
|
|
46
|
-
|
47
|
-
|
48
44
|
// =========================================================
|
49
45
|
// Borders
|
50
46
|
// =========================================================
|
@@ -8,7 +8,7 @@
|
|
8
8
|
/// @type List
|
9
9
|
/// @access public
|
10
10
|
|
11
|
-
$govuk-font-family-gds-transport: "GDS Transport",
|
11
|
+
$govuk-font-family-gds-transport: "GDS Transport", arial, sans-serif;
|
12
12
|
|
13
13
|
/// List of font families to use if using NTA (old font 'stack' for
|
14
14
|
/// GOV.UK)
|
@@ -17,7 +17,7 @@ $govuk-font-family-gds-transport: "GDS Transport", Arial, sans-serif;
|
|
17
17
|
/// @access public
|
18
18
|
/// @deprecated To be removed once support for compatibility mode is dropped
|
19
19
|
|
20
|
-
$govuk-font-family-nta: "nta",
|
20
|
+
$govuk-font-family-nta: "nta", arial, sans-serif;
|
21
21
|
|
22
22
|
/// List of font families to use if using the 'tabular numbers' subset of NTA
|
23
23
|
/// (the default font 'stack' for GOV.UK)
|
@@ -14,11 +14,15 @@
|
|
14
14
|
/// @type Boolean
|
15
15
|
/// @access public
|
16
16
|
|
17
|
-
$govuk-use-legacy-font: if(
|
17
|
+
$govuk-use-legacy-font: if(
|
18
|
+
(
|
18
19
|
$govuk-compatibility-govukfrontendtoolkit or
|
19
20
|
$govuk-compatibility-govuktemplate or
|
20
21
|
$govuk-compatibility-govukelements
|
21
|
-
),
|
22
|
+
),
|
23
|
+
true,
|
24
|
+
false
|
25
|
+
) !default;
|
22
26
|
|
23
27
|
// =========================================================
|
24
28
|
// Font families
|
@@ -29,7 +33,8 @@ $govuk-use-legacy-font: if((
|
|
29
33
|
/// @type List
|
30
34
|
/// @access public
|
31
35
|
|
32
|
-
$govuk-font-family: if(
|
36
|
+
$govuk-font-family: if(
|
37
|
+
$govuk-use-legacy-font,
|
33
38
|
$govuk-font-family-nta,
|
34
39
|
$govuk-font-family-gds-transport
|
35
40
|
) !default;
|
@@ -39,7 +44,8 @@ $govuk-font-family: if($govuk-use-legacy-font,
|
|
39
44
|
/// @type List
|
40
45
|
/// @access public
|
41
46
|
|
42
|
-
$govuk-font-family-tabular: if(
|
47
|
+
$govuk-font-family-tabular: if(
|
48
|
+
$govuk-use-legacy-font,
|
43
49
|
$govuk-font-family-nta-tabular,
|
44
50
|
false
|
45
51
|
) !default;
|
@@ -61,7 +67,7 @@ $govuk-font-family-print: sans-serif !default;
|
|
61
67
|
|
62
68
|
$govuk-include-default-font-face: (
|
63
69
|
$govuk-font-family == $govuk-font-family-gds-transport
|
64
|
-
|
70
|
+
) !default;
|
65
71
|
|
66
72
|
// =========================================================
|
67
73
|
// Font weights
|