dxw_govuk_frontend_rails 4.0.0 → 4.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/dxw_govuk_frontend_rails/version.rb +1 -1
- data/package-lock.json +4 -4
- data/package.json +1 -1
- data/vendor/assets/javascripts/govuk_frontend_rails.js +4537 -2583
- data/vendor/assets/stylesheets/all-ie8.scss +8 -0
- data/vendor/assets/stylesheets/components/_all.scss +2 -1
- data/vendor/assets/stylesheets/components/accordion/_index.scss +30 -12
- data/vendor/assets/stylesheets/components/back-link/_index.scss +20 -20
- data/vendor/assets/stylesheets/components/breadcrumbs/_index.scss +22 -13
- data/vendor/assets/stylesheets/components/button/_index.scss +37 -27
- data/vendor/assets/stylesheets/components/character-count/_index.scss +9 -0
- data/vendor/assets/stylesheets/components/checkboxes/_index.scss +9 -8
- data/vendor/assets/stylesheets/components/file-upload/_index.scss +6 -1
- data/vendor/assets/stylesheets/components/footer/_index.scss +13 -30
- data/vendor/assets/stylesheets/components/header/_index.scss +36 -24
- data/vendor/assets/stylesheets/components/input/_index.scss +28 -26
- data/vendor/assets/stylesheets/components/pagination/_index.scss +247 -0
- data/vendor/assets/stylesheets/components/pagination/_pagination.scss +2 -0
- data/vendor/assets/stylesheets/components/panel/_index.scss +1 -1
- data/vendor/assets/stylesheets/components/radios/_index.scss +10 -17
- data/vendor/assets/stylesheets/components/select/_index.scss +18 -1
- data/vendor/assets/stylesheets/components/skip-link/_index.scss +1 -3
- data/vendor/assets/stylesheets/components/summary-list/_index.scss +152 -13
- data/vendor/assets/stylesheets/components/table/_index.scss +1 -1
- data/vendor/assets/stylesheets/components/tag/_index.scss +18 -18
- data/vendor/assets/stylesheets/components/textarea/_index.scss +8 -1
- data/vendor/assets/stylesheets/core/_all.scss +1 -0
- data/vendor/assets/stylesheets/core/_govuk-frontend-version.scss +5 -0
- data/vendor/assets/stylesheets/core/_section-break.scss +1 -1
- data/vendor/assets/stylesheets/helpers/_colour.scss +10 -7
- data/vendor/assets/stylesheets/helpers/_focused.scss +6 -1
- data/vendor/assets/stylesheets/helpers/_font-faces.scss +1 -1
- data/vendor/assets/stylesheets/helpers/_links.scss +13 -11
- data/vendor/assets/stylesheets/helpers/_media-queries.scss +2 -2
- data/vendor/assets/stylesheets/helpers/_shape-arrow.scss +1 -1
- data/vendor/assets/stylesheets/helpers/_spacing.scss +3 -3
- data/vendor/assets/stylesheets/helpers/_typography.scss +16 -9
- data/vendor/assets/stylesheets/objects/_button-group.scss +10 -26
- data/vendor/assets/stylesheets/objects/_template.scss +1 -1
- data/vendor/assets/stylesheets/objects/_width-container.scss +1 -5
- data/vendor/assets/stylesheets/overrides/_spacing.scss +56 -12
- data/vendor/assets/stylesheets/settings/_all.scss +1 -0
- data/vendor/assets/stylesheets/settings/_colours-organisations.scss +4 -0
- data/vendor/assets/stylesheets/settings/_colours-palette.scss +12 -0
- data/vendor/assets/stylesheets/settings/_compatibility.scss +26 -0
- data/vendor/assets/stylesheets/settings/_ie8.scss +16 -0
- data/vendor/assets/stylesheets/settings/_links.scss +5 -1
- data/vendor/assets/stylesheets/settings/_measurements.scss +5 -5
- data/vendor/assets/stylesheets/settings/_spacing.scss +4 -8
- data/vendor/assets/stylesheets/settings/_typography-font.scss +23 -0
- data/vendor/assets/stylesheets/settings/_typography-responsive.scss +12 -0
- data/vendor/assets/stylesheets/settings/_warnings.scss +53 -0
- data/vendor/assets/stylesheets/tools/_compatibility.scss +20 -6
- data/vendor/assets/stylesheets/tools/_exports.scss +1 -1
- data/vendor/assets/stylesheets/tools/_font-url.scss +1 -1
- data/vendor/assets/stylesheets/tools/_ie8.scss +38 -2
- data/vendor/assets/stylesheets/tools/_image-url.scss +1 -1
- data/vendor/assets/stylesheets/tools/_px-to-em.scss +2 -2
- data/vendor/assets/stylesheets/tools/_px-to-rem.scss +1 -1
- metadata +5 -1
@@ -1,3 +1,11 @@
|
|
1
|
+
// Ignore IE8 related warnings whilst we continue to generate IE8 specific
|
2
|
+
// stylesheets for the review app or dist versions of GOV.UK Frontend
|
3
|
+
$govuk-suppressed-warnings: if(
|
4
|
+
variable-exists(govuk-suppressed-warnings),
|
5
|
+
append($govuk-suppressed-warnings, "ie8"),
|
6
|
+
("ie8")
|
7
|
+
);
|
8
|
+
|
1
9
|
// By setting $govuk-is-ie8 to true, we create a version of the stylesheet that
|
2
10
|
// targets IE8 – e.g. conditionally including or excluding styles, and
|
3
11
|
// rasterizing media queries.
|
@@ -7,7 +7,6 @@
|
|
7
7
|
@import "checkboxes/index";
|
8
8
|
@import "character-count/index";
|
9
9
|
@import "cookie-banner/index";
|
10
|
-
@import "summary-list/index";
|
11
10
|
@import "date-input/index";
|
12
11
|
@import "details/index";
|
13
12
|
@import "error-message/index";
|
@@ -21,6 +20,7 @@
|
|
21
20
|
@import "inset-text/index";
|
22
21
|
@import "label/index";
|
23
22
|
@import "notification-banner/index";
|
23
|
+
@import "pagination/index";
|
24
24
|
@import "panel/index";
|
25
25
|
@import "phase-banner/index";
|
26
26
|
@import "tabs/index";
|
@@ -28,6 +28,7 @@
|
|
28
28
|
@import "radios/index";
|
29
29
|
@import "select/index";
|
30
30
|
@import "skip-link/index";
|
31
|
+
@import "summary-list/index";
|
31
32
|
@import "table/index";
|
32
33
|
@import "textarea/index";
|
33
34
|
@import "warning-text/index";
|
@@ -1,7 +1,7 @@
|
|
1
1
|
@include govuk-exports("govuk/component/accordion") {
|
2
2
|
$govuk-accordion-base-colour: govuk-colour("black");
|
3
3
|
$govuk-accordion-hover-colour: govuk-colour("light-grey", $legacy: "grey-3");
|
4
|
-
$govuk-accordion-icon-focus-colour: govuk-colour
|
4
|
+
$govuk-accordion-icon-focus-colour: $govuk-focus-colour;
|
5
5
|
$govuk-accordion-bottom-border-width: 1px;
|
6
6
|
|
7
7
|
.govuk-accordion {
|
@@ -22,6 +22,7 @@
|
|
22
22
|
}
|
23
23
|
|
24
24
|
.govuk-accordion__section-button {
|
25
|
+
@include govuk-font($size: 24, $weight: bold);
|
25
26
|
@include govuk-text-colour;
|
26
27
|
|
27
28
|
display: block;
|
@@ -29,10 +30,6 @@
|
|
29
30
|
padding-top: govuk-spacing(3);
|
30
31
|
}
|
31
32
|
|
32
|
-
.govuk-accordion__section-heading-text {
|
33
|
-
@include govuk-font($size: 24, $weight: bold);
|
34
|
-
}
|
35
|
-
|
36
33
|
// Remove the bottom margin from the last item inside the content
|
37
34
|
.govuk-accordion__section-content > :last-child {
|
38
35
|
margin-bottom: 0;
|
@@ -49,12 +46,28 @@
|
|
49
46
|
padding-top: 0;
|
50
47
|
}
|
51
48
|
|
52
|
-
// Hide the body of collapsed sections
|
49
|
+
// Hide the body of collapsed sections by default for browsers that lack
|
50
|
+
// support for `content-visibility` paired with [hidden=until-found]
|
53
51
|
.govuk-accordion__section-content {
|
54
52
|
display: none;
|
53
|
+
|
54
|
+
@include govuk-responsive-padding(3, "top");
|
55
55
|
@include govuk-responsive-padding(8, "bottom");
|
56
56
|
}
|
57
57
|
|
58
|
+
// Hide the body of collapsed sections using `content-visibility` to enable
|
59
|
+
// page search within [hidden=until-found] regions where browser supported
|
60
|
+
.govuk-accordion__section-content[hidden] {
|
61
|
+
@supports (content-visibility: hidden) {
|
62
|
+
content-visibility: hidden;
|
63
|
+
display: inherit;
|
64
|
+
}
|
65
|
+
|
66
|
+
// Hide the padding of collapsed sections
|
67
|
+
padding-top: 0;
|
68
|
+
padding-bottom: 0;
|
69
|
+
}
|
70
|
+
|
58
71
|
// Show the body of expanded sections
|
59
72
|
.govuk-accordion__section--expanded .govuk-accordion__section-content {
|
60
73
|
display: block;
|
@@ -76,7 +89,7 @@
|
|
76
89
|
cursor: pointer;
|
77
90
|
-webkit-appearance: none;
|
78
91
|
|
79
|
-
@include govuk-media-query ($from:
|
92
|
+
@include govuk-media-query ($from: tablet) {
|
80
93
|
margin-bottom: 14px;
|
81
94
|
}
|
82
95
|
|
@@ -142,7 +155,7 @@
|
|
142
155
|
vertical-align: middle;
|
143
156
|
|
144
157
|
// IE8 fallback of icon
|
145
|
-
@include
|
158
|
+
@include _govuk-if-ie8 {
|
146
159
|
display: inline-block;
|
147
160
|
max-height: 20px;
|
148
161
|
line-height: 1;
|
@@ -171,7 +184,7 @@
|
|
171
184
|
border-right: govuk-px-to-rem(2px) solid;
|
172
185
|
|
173
186
|
// IE8 fallback of icon with HTML symbol
|
174
|
-
@include
|
187
|
+
@include _govuk-if-ie8 {
|
175
188
|
content: "\25B2"; // "▲"
|
176
189
|
position: relative;
|
177
190
|
border: 0;
|
@@ -186,7 +199,7 @@
|
|
186
199
|
transform: rotate(180deg);
|
187
200
|
|
188
201
|
// IE8 fallback of arrow icon
|
189
|
-
@include
|
202
|
+
@include _govuk-if-ie8 {
|
190
203
|
&:after {
|
191
204
|
content: "\25BC"; // "▼"
|
192
205
|
-webkit-transform: none;
|
@@ -276,8 +289,12 @@
|
|
276
289
|
// relates to the content below. Adjust padding to maintain the height of the element.
|
277
290
|
// See https://github.com/alphagov/govuk-frontend/pull/2257#issuecomment-951920798
|
278
291
|
.govuk-accordion__section--expanded .govuk-accordion__section-button {
|
279
|
-
padding-bottom: govuk-spacing(
|
292
|
+
padding-bottom: govuk-spacing(3);
|
280
293
|
border-bottom: 0;
|
294
|
+
|
295
|
+
@include govuk-media-query ($from: tablet) {
|
296
|
+
padding-bottom: govuk-spacing(4);
|
297
|
+
}
|
281
298
|
}
|
282
299
|
|
283
300
|
// As Chevron icon is vertically aligned it overlaps with the focus state bottom border
|
@@ -305,7 +322,8 @@
|
|
305
322
|
|
306
323
|
// Add toggle link with Chevron icon on left.
|
307
324
|
.govuk-accordion__section-toggle {
|
308
|
-
@include govuk-
|
325
|
+
@include govuk-typography-responsive($size: 19);
|
326
|
+
@include govuk-typography-weight-regular;
|
309
327
|
color: $govuk-link-colour;
|
310
328
|
}
|
311
329
|
|
@@ -1,16 +1,19 @@
|
|
1
1
|
@include govuk-exports("govuk/component/back-link") {
|
2
|
+
// Component font-size on the Frontend (used for calculations)
|
3
|
+
$font-size: 16;
|
2
4
|
|
3
5
|
// Size of chevron (excluding border)
|
4
|
-
$chevron-size: 7px;
|
6
|
+
$chevron-size: govuk-em(7px, $font-size);
|
5
7
|
|
6
8
|
// Size of chevron border
|
7
|
-
$chevron-border-width: 1px;
|
9
|
+
$chevron-border-min-width: 1px;
|
10
|
+
$chevron-border-width: govuk-em($chevron-border-min-width, $font-size);
|
8
11
|
|
9
12
|
// Colour of chevron
|
10
13
|
$chevron-border-colour: $govuk-secondary-text-colour;
|
11
14
|
|
12
15
|
.govuk-back-link {
|
13
|
-
@include govuk-typography-responsive($size:
|
16
|
+
@include govuk-typography-responsive($size: $font-size);
|
14
17
|
@include govuk-link-common;
|
15
18
|
@include govuk-link-style-text;
|
16
19
|
|
@@ -21,7 +24,7 @@
|
|
21
24
|
margin-bottom: govuk-spacing(3);
|
22
25
|
|
23
26
|
// Allow space for the arrow
|
24
|
-
padding-left: 14px;
|
27
|
+
padding-left: govuk-em(14px, $font-size);
|
25
28
|
}
|
26
29
|
|
27
30
|
// Prepend left pointing chevron
|
@@ -35,14 +38,15 @@
|
|
35
38
|
@if $govuk-use-legacy-font {
|
36
39
|
// Begin adjustments for font baseline offset
|
37
40
|
// These should be removed when legacy font support is dropped
|
38
|
-
|
39
|
-
|
41
|
+
$offset: govuk-em(1px, $font-size);
|
42
|
+
top: $offset * -1;
|
43
|
+
bottom: $offset;
|
40
44
|
} @else {
|
41
45
|
top: 0;
|
42
46
|
bottom: 0;
|
43
47
|
}
|
44
48
|
|
45
|
-
left: 3px;
|
49
|
+
left: govuk-em(3px, $font-size);
|
46
50
|
|
47
51
|
width: $chevron-size;
|
48
52
|
height: $chevron-size;
|
@@ -56,11 +60,18 @@
|
|
56
60
|
transform: rotate(225deg);
|
57
61
|
|
58
62
|
border: solid;
|
59
|
-
border-width: $chevron-border-width $chevron-border-width 0 0;
|
63
|
+
border-width: $chevron-border-min-width $chevron-border-min-width 0 0;
|
60
64
|
border-color: $chevron-border-colour;
|
61
65
|
|
66
|
+
@supports (border-width: unquote("max(0px)")) {
|
67
|
+
border-width: unquote("max(#{$chevron-border-min-width}, #{$chevron-border-width}) max(#{$chevron-border-min-width}, #{$chevron-border-width})") 0 0;
|
68
|
+
|
69
|
+
// Ensure that the chevron never gets smaller than 16px
|
70
|
+
font-size: unquote("max(#{$font-size * 1px}, 1em)");
|
71
|
+
}
|
72
|
+
|
62
73
|
// Fall back to a less than sign for IE8
|
63
|
-
@include
|
74
|
+
@include _govuk-if-ie8 {
|
64
75
|
content: "\003c"; // Less than sign (<)
|
65
76
|
width: auto;
|
66
77
|
height: auto;
|
@@ -85,15 +96,4 @@
|
|
85
96
|
bottom: -14px;
|
86
97
|
left: 0;
|
87
98
|
}
|
88
|
-
|
89
|
-
@if $govuk-use-legacy-font {
|
90
|
-
// Begin adjustments for font baseline offset
|
91
|
-
// These should be removed when legacy font support is dropped
|
92
|
-
.govuk-back-link:before {
|
93
|
-
$offset: 1px;
|
94
|
-
|
95
|
-
top: $offset * -1;
|
96
|
-
bottom: $offset;
|
97
|
-
}
|
98
|
-
}
|
99
99
|
}
|
@@ -1,10 +1,13 @@
|
|
1
1
|
@include govuk-exports("govuk/component/breadcrumbs") {
|
2
|
+
// Component font-size on the Frontend (used for calculations)
|
3
|
+
$font-size: 16;
|
2
4
|
|
3
5
|
// Size of chevron (excluding border)
|
4
|
-
$chevron-size: 7px;
|
6
|
+
$chevron-size: govuk-em(7px, $font-size);
|
5
7
|
|
6
8
|
// Size of chevron border
|
7
|
-
$chevron-border-width: 1px;
|
9
|
+
$chevron-border-min-width: 1px;
|
10
|
+
$chevron-border-width: govuk-em($chevron-border-min-width, $font-size);
|
8
11
|
|
9
12
|
// Colour of chevron
|
10
13
|
$chevron-border-colour: $govuk-secondary-text-colour;
|
@@ -13,10 +16,10 @@
|
|
13
16
|
// of length 8 (7px + 1px border):
|
14
17
|
//
|
15
18
|
// √(8² + 8²) * 0.5 ≅ 5.655
|
16
|
-
$chevron-altitude-calculated: 5.655px;
|
19
|
+
$chevron-altitude-calculated: govuk-em(5.655px, $font-size);
|
17
20
|
|
18
21
|
.govuk-breadcrumbs {
|
19
|
-
@include govuk-font($size:
|
22
|
+
@include govuk-font($size: $font-size);
|
20
23
|
@include govuk-text-colour;
|
21
24
|
|
22
25
|
margin-top: govuk-spacing(3);
|
@@ -40,8 +43,8 @@
|
|
40
43
|
|
41
44
|
// Add both margin and padding such that the chevron appears centrally
|
42
45
|
// between each breadcrumb item
|
43
|
-
margin-left: govuk-spacing(2);
|
44
|
-
padding-left: govuk-spacing(2) + $chevron-altitude-calculated;
|
46
|
+
margin-left: govuk-em(govuk-spacing(2), $font-size);
|
47
|
+
padding-left: govuk-em(govuk-spacing(2), $font-size) + $chevron-altitude-calculated;
|
45
48
|
|
46
49
|
float: left;
|
47
50
|
|
@@ -55,8 +58,9 @@
|
|
55
58
|
@if $govuk-use-legacy-font {
|
56
59
|
// Begin adjustments for font baseline offset
|
57
60
|
// These should be removed when legacy font support is dropped
|
58
|
-
|
59
|
-
|
61
|
+
$offset: govuk-em(1px, $font-size);
|
62
|
+
top: $offset * -1;
|
63
|
+
bottom: $offset;
|
60
64
|
} @else {
|
61
65
|
top: 0;
|
62
66
|
bottom: 0;
|
@@ -78,11 +82,18 @@
|
|
78
82
|
transform: rotate(45deg);
|
79
83
|
|
80
84
|
border: solid;
|
81
|
-
border-width: $chevron-border-width $chevron-border-width 0 0;
|
85
|
+
border-width: $chevron-border-min-width $chevron-border-min-width 0 0;
|
82
86
|
border-color: $chevron-border-colour;
|
83
87
|
|
88
|
+
@supports (border-width: unquote("max(0px)")) {
|
89
|
+
border-width: unquote("max(#{$chevron-border-min-width}, #{$chevron-border-width}) max(#{$chevron-border-min-width}, #{$chevron-border-width})") 0 0;
|
90
|
+
|
91
|
+
// Ensure that the chevron never gets smaller than 16px
|
92
|
+
font-size: unquote("max(#{$font-size * 1px}, 1em)");
|
93
|
+
}
|
94
|
+
|
84
95
|
// Fall back to a greater than sign for IE8
|
85
|
-
@include
|
96
|
+
@include _govuk-if-ie8 {
|
86
97
|
content: "\003e"; // Greater than sign (>)
|
87
98
|
width: auto;
|
88
99
|
height: auto;
|
@@ -122,14 +133,12 @@
|
|
122
133
|
}
|
123
134
|
|
124
135
|
&:before {
|
125
|
-
top: 6px;
|
136
|
+
top: govuk-em(6px, $font-size);
|
126
137
|
margin: 0;
|
127
138
|
}
|
128
139
|
}
|
129
140
|
|
130
141
|
.govuk-breadcrumbs__list {
|
131
|
-
display: -webkit-box;
|
132
|
-
display: -webkit-flex;
|
133
142
|
display: -ms-flexbox;
|
134
143
|
display: flex;
|
135
144
|
}
|
@@ -1,8 +1,26 @@
|
|
1
|
+
////
|
2
|
+
/// @group components/button
|
3
|
+
////
|
4
|
+
|
5
|
+
/// Button component background colour
|
6
|
+
///
|
7
|
+
/// @type Colour
|
8
|
+
/// @access public
|
9
|
+
|
10
|
+
$govuk-button-background-colour: govuk-colour("green", $legacy: #00823b) !default;
|
11
|
+
|
12
|
+
/// Button component text colour
|
13
|
+
///
|
14
|
+
/// @type Colour
|
15
|
+
/// @access public
|
16
|
+
|
17
|
+
$govuk-button-text-colour: govuk-colour("white") !default;
|
18
|
+
|
1
19
|
@include govuk-exports("govuk/component/button") {
|
2
|
-
$govuk-button-colour: govuk-colour
|
20
|
+
$govuk-button-colour: $govuk-button-background-colour;
|
3
21
|
$govuk-button-hover-colour: govuk-shade($govuk-button-colour, 20%);
|
4
22
|
$govuk-button-shadow-colour: govuk-shade($govuk-button-colour, 60%);
|
5
|
-
$govuk-button-text-colour: govuk-colour
|
23
|
+
$govuk-button-text-colour: $govuk-button-text-colour;
|
6
24
|
|
7
25
|
// Secondary button variables
|
8
26
|
$govuk-secondary-button-colour: govuk-colour("light-grey", $legacy: "grey-3");
|
@@ -43,7 +61,7 @@
|
|
43
61
|
cursor: pointer;
|
44
62
|
-webkit-appearance: none;
|
45
63
|
|
46
|
-
@include
|
64
|
+
@include _govuk-if-ie8 {
|
47
65
|
border-bottom: $button-shadow-size solid $govuk-button-shadow-colour;
|
48
66
|
}
|
49
67
|
|
@@ -74,7 +92,7 @@
|
|
74
92
|
// Bump the button down so it looks like its being pressed in
|
75
93
|
top: $button-shadow-size;
|
76
94
|
|
77
|
-
@include
|
95
|
+
@include _govuk-if-ie8 {
|
78
96
|
border-bottom-width: 0;
|
79
97
|
}
|
80
98
|
}
|
@@ -85,11 +103,11 @@
|
|
85
103
|
// backgrounds and box-shadows disappear, so we need to ensure there's a
|
86
104
|
// transparent outline which will be set to a visible colour.
|
87
105
|
// Since Internet Explorer 8 does not support box-shadow, we want to force the user-agent outlines
|
88
|
-
@include
|
106
|
+
@include _govuk-not-ie8 {
|
89
107
|
outline: $govuk-focus-width solid transparent;
|
90
108
|
}
|
91
109
|
// Since Internet Explorer does not support `:not()` we set a clearer focus style to match user-agent outlines.
|
92
|
-
@include
|
110
|
+
@include _govuk-if-ie8 {
|
93
111
|
color: $govuk-focus-text-colour;
|
94
112
|
background-color: $govuk-focus-colour;
|
95
113
|
}
|
@@ -101,7 +119,7 @@
|
|
101
119
|
// we need to override the text colour for that combination of selectors so
|
102
120
|
// so that unvisited links styled as buttons do not end up with dark blue
|
103
121
|
// text when focussed.
|
104
|
-
@include
|
122
|
+
@include _govuk-compatibility(govuk_template) {
|
105
123
|
&:link:focus {
|
106
124
|
color: $govuk-button-text-colour;
|
107
125
|
}
|
@@ -148,6 +166,8 @@
|
|
148
166
|
}
|
149
167
|
}
|
150
168
|
|
169
|
+
// @deprecated Disabling buttons using the .govuk-button--disabled class is
|
170
|
+
// deprecated and will be removed in the next major version.
|
151
171
|
.govuk-button--disabled,
|
152
172
|
.govuk-button[disabled="disabled"],
|
153
173
|
.govuk-button[disabled] {
|
@@ -155,13 +175,13 @@
|
|
155
175
|
|
156
176
|
&:hover {
|
157
177
|
background-color: $govuk-button-colour;
|
158
|
-
cursor:
|
178
|
+
cursor: not-allowed;
|
159
179
|
}
|
160
180
|
|
161
181
|
&:active {
|
162
182
|
top: 0;
|
163
183
|
box-shadow: 0 $button-shadow-size 0 $govuk-button-shadow-colour; // s0
|
164
|
-
@include
|
184
|
+
@include _govuk-if-ie8 {
|
165
185
|
border-bottom: $button-shadow-size solid $govuk-button-shadow-colour; // s0
|
166
186
|
}
|
167
187
|
}
|
@@ -184,7 +204,7 @@
|
|
184
204
|
// we need to override the text colour for that combination of selectors so
|
185
205
|
// so that unvisited links styled as buttons do not end up with dark blue
|
186
206
|
// text when focussed.
|
187
|
-
@include
|
207
|
+
@include _govuk-compatibility(govuk_template) {
|
188
208
|
&:link:focus {
|
189
209
|
color: $govuk-secondary-button-text-colour;
|
190
210
|
}
|
@@ -216,7 +236,7 @@
|
|
216
236
|
// we need to override the text colour for that combination of selectors so
|
217
237
|
// so that unvisited links styled as buttons do not end up with dark blue
|
218
238
|
// text when focussed.
|
219
|
-
@include
|
239
|
+
@include _govuk-compatibility(govuk_template) {
|
220
240
|
&:link:focus {
|
221
241
|
color: $govuk-warning-button-text-colour;
|
222
242
|
}
|
@@ -235,22 +255,14 @@
|
|
235
255
|
@include govuk-typography-weight-bold;
|
236
256
|
@include govuk-typography-responsive($size: 24, $override-line-height: 1);
|
237
257
|
|
238
|
-
display: -webkit-inline-box;
|
239
|
-
|
240
|
-
display: -webkit-inline-flex;
|
241
|
-
|
242
258
|
display: -ms-inline-flexbox;
|
243
259
|
|
244
260
|
display: inline-flex;
|
245
261
|
min-height: auto;
|
246
262
|
|
247
|
-
-
|
248
|
-
|
249
|
-
-webkit-justify-content: center;
|
250
|
-
|
251
|
-
-ms-flex-pack: center;
|
263
|
+
-ms-flex-pack: center;
|
252
264
|
|
253
|
-
|
265
|
+
justify-content: center;
|
254
266
|
}
|
255
267
|
|
256
268
|
.govuk-button__start-icon {
|
@@ -260,12 +272,10 @@
|
|
260
272
|
margin-left: govuk-spacing(2);
|
261
273
|
}
|
262
274
|
vertical-align: middle;
|
263
|
-
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
-ms-flex-item-align: center;
|
268
|
-
align-self: center;
|
275
|
+
-ms-flex-negative: 0;
|
276
|
+
flex-shrink: 0;
|
277
|
+
-ms-flex-item-align: center;
|
278
|
+
align-self: center;
|
269
279
|
// Work around SVGs not inheriting color from parent in forced color mode
|
270
280
|
// (https://github.com/w3c/csswg-drafts/issues/6310)
|
271
281
|
forced-color-adjust: auto;
|
@@ -17,6 +17,15 @@
|
|
17
17
|
@include govuk-font($size: false, $tabular: true);
|
18
18
|
margin-top: 0;
|
19
19
|
margin-bottom: 0;
|
20
|
+
|
21
|
+
&:after {
|
22
|
+
// Zero-width space that will reserve vertical space when no hint is provided
|
23
|
+
// as:
|
24
|
+
// - setting a min-height is not possible without a magic number
|
25
|
+
// because the line-height is set by the `govuk-font` call above
|
26
|
+
// - using `:empty` is not possible as the hint macro outputs line breaks
|
27
|
+
content: "\200B";
|
28
|
+
}
|
20
29
|
}
|
21
30
|
|
22
31
|
.govuk-character-count__message--disabled {
|
@@ -36,7 +36,7 @@
|
|
36
36
|
|
37
37
|
// IE8 doesn’t support pseudo-elements, so we don’t want to hide native
|
38
38
|
// elements there.
|
39
|
-
@include
|
39
|
+
@include _govuk-not-ie8 {
|
40
40
|
position: absolute;
|
41
41
|
|
42
42
|
z-index: 1;
|
@@ -50,7 +50,7 @@
|
|
50
50
|
opacity: 0;
|
51
51
|
}
|
52
52
|
|
53
|
-
@include
|
53
|
+
@include _govuk-if-ie8 {
|
54
54
|
margin-top: 10px;
|
55
55
|
margin-right: $govuk-checkboxes-size / -2;
|
56
56
|
margin-left: $govuk-checkboxes-size / -2;
|
@@ -73,7 +73,7 @@
|
|
73
73
|
touch-action: manipulation;
|
74
74
|
}
|
75
75
|
|
76
|
-
@include
|
76
|
+
@include _govuk-not-ie8 {
|
77
77
|
// [ ] Check box
|
78
78
|
.govuk-checkboxes__label:before {
|
79
79
|
content: "";
|
@@ -83,7 +83,7 @@
|
|
83
83
|
left: 0;
|
84
84
|
width: $govuk-checkboxes-size;
|
85
85
|
height: $govuk-checkboxes-size;
|
86
|
-
border: $govuk-border-width-form-element solid
|
86
|
+
border: $govuk-border-width-form-element solid currentcolor;
|
87
87
|
background: transparent;
|
88
88
|
}
|
89
89
|
|
@@ -152,10 +152,11 @@
|
|
152
152
|
// Disabled state
|
153
153
|
.govuk-checkboxes__input:disabled,
|
154
154
|
.govuk-checkboxes__input:disabled + .govuk-checkboxes__label {
|
155
|
-
cursor:
|
155
|
+
cursor: not-allowed;
|
156
156
|
}
|
157
157
|
|
158
|
-
.govuk-checkboxes__input:disabled + .govuk-checkboxes__label
|
158
|
+
.govuk-checkboxes__input:disabled + .govuk-checkboxes__label,
|
159
|
+
.govuk-checkboxes__input:disabled ~ .govuk-hint {
|
159
160
|
opacity: .5;
|
160
161
|
}
|
161
162
|
|
@@ -228,11 +229,11 @@
|
|
228
229
|
// ▲┆└─ Check box pseudo element, aligned with margin
|
229
230
|
// └─── Touch target (invisible input), shifted into the margin
|
230
231
|
.govuk-checkboxes__input {
|
231
|
-
@include
|
232
|
+
@include _govuk-not-ie8 {
|
232
233
|
left: $input-offset * -1;
|
233
234
|
}
|
234
235
|
|
235
|
-
@include
|
236
|
+
@include _govuk-if-ie8 {
|
236
237
|
margin-left: $govuk-small-checkboxes-size * -1;
|
237
238
|
}
|
238
239
|
}
|
@@ -30,7 +30,7 @@
|
|
30
30
|
// yellow focus state.
|
31
31
|
box-shadow: inset 0 0 0 4px $govuk-input-border-colour;
|
32
32
|
|
33
|
-
@include
|
33
|
+
@include _govuk-if-ie8 {
|
34
34
|
// IE8 doesn't support `box-shadow` so add an actual border
|
35
35
|
border: 4px solid $govuk-input-border-colour;
|
36
36
|
}
|
@@ -46,5 +46,10 @@
|
|
46
46
|
|
47
47
|
box-shadow: inset 0 0 0 4px $govuk-input-border-colour;
|
48
48
|
}
|
49
|
+
|
50
|
+
&:disabled {
|
51
|
+
opacity: .5;
|
52
|
+
cursor: not-allowed;
|
53
|
+
}
|
49
54
|
}
|
50
55
|
}
|
@@ -8,7 +8,7 @@
|
|
8
8
|
$govuk-footer-text: $govuk-text-colour;
|
9
9
|
$govuk-footer-link-hover-colour: null; // Only used with the legacy palette
|
10
10
|
|
11
|
-
@if
|
11
|
+
@if $govuk-use-legacy-palette {
|
12
12
|
$govuk-footer-border-top: #a1acb2;
|
13
13
|
$govuk-footer-border: govuk-colour("grey-2");
|
14
14
|
$govuk-footer-text: #454a4c;
|
@@ -35,7 +35,7 @@
|
|
35
35
|
.govuk-footer__link {
|
36
36
|
@include govuk-link-common;
|
37
37
|
|
38
|
-
@if
|
38
|
+
@if $govuk-use-legacy-palette {
|
39
39
|
&:link,
|
40
40
|
&:visited {
|
41
41
|
color: $govuk-footer-text;
|
@@ -52,7 +52,7 @@
|
|
52
52
|
// alphagov/govuk_template includes a specific a:link:focus selector
|
53
53
|
// designed to make unvisited links a slightly darker blue when focussed, so
|
54
54
|
// we need to override the text colour for that combination of selectors.
|
55
|
-
@include
|
55
|
+
@include _govuk-compatibility(govuk_template) {
|
56
56
|
&:link:focus {
|
57
57
|
@include govuk-text-colour;
|
58
58
|
}
|
@@ -67,23 +67,16 @@
|
|
67
67
|
}
|
68
68
|
|
69
69
|
.govuk-footer__meta {
|
70
|
-
display: -webkit-box;
|
71
|
-
display: -webkit-flex;
|
72
70
|
display: -ms-flexbox;
|
73
71
|
display: flex; // Support: Flexbox
|
74
72
|
margin-right: -$govuk-gutter-half;
|
75
73
|
margin-left: -$govuk-gutter-half;
|
76
|
-
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
-
|
81
|
-
-
|
82
|
-
align-items: flex-end; // Support: Flexbox
|
83
|
-
-webkit-box-pack: center;
|
84
|
-
-webkit-justify-content: center;
|
85
|
-
-ms-flex-pack: center;
|
86
|
-
justify-content: center; // Support: Flexbox
|
74
|
+
-ms-flex-wrap: wrap;
|
75
|
+
flex-wrap: wrap; // Support: Flexbox
|
76
|
+
-ms-flex-align: end;
|
77
|
+
align-items: flex-end; // Support: Flexbox
|
78
|
+
-ms-flex-pack: center;
|
79
|
+
justify-content: center; // Support: Flexbox
|
87
80
|
}
|
88
81
|
|
89
82
|
.govuk-footer__meta-item {
|
@@ -93,14 +86,11 @@
|
|
93
86
|
}
|
94
87
|
|
95
88
|
.govuk-footer__meta-item--grow {
|
96
|
-
-
|
97
|
-
|
98
|
-
-ms-flex: 1;
|
99
|
-
flex: 1; // Support: Flexbox
|
89
|
+
-ms-flex: 1;
|
90
|
+
flex: 1; // Support: Flexbox
|
100
91
|
@include govuk-media-query ($until: tablet) {
|
101
|
-
-
|
102
|
-
|
103
|
-
flex-basis: 320px; // Support: Flexbox
|
92
|
+
-ms-flex-preferred-size: 320px;
|
93
|
+
flex-basis: 320px; // Support: Flexbox
|
104
94
|
}
|
105
95
|
}
|
106
96
|
|
@@ -179,13 +169,6 @@
|
|
179
169
|
list-style: none;
|
180
170
|
-webkit-column-gap: $govuk-gutter;
|
181
171
|
column-gap: $govuk-gutter; // Support: Columns
|
182
|
-
|
183
|
-
// Disable thicker underlines on hover because of a bug in Chromium
|
184
|
-
// affecting links within columns
|
185
|
-
// https://bugs.chromium.org/p/chromium/issues/detail?id=1190987
|
186
|
-
.govuk-footer__link:hover {
|
187
|
-
text-decoration-thickness: auto;
|
188
|
-
}
|
189
172
|
}
|
190
173
|
|
191
174
|
@include govuk-media-query ($from: desktop) {
|