dxw_govuk_frontend_rails 2.10.0 → 2.11.0.pre
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +20 -0
- data/lib/dxw_govuk_frontend_rails/version.rb +1 -1
- data/package-lock.json +3 -3
- data/package.json +1 -1
- data/vendor/assets/stylesheets/components/button/_button.scss +74 -5
- data/vendor/assets/stylesheets/components/fieldset/_fieldset.scss +10 -0
- data/vendor/assets/stylesheets/components/footer/_footer.scss +3 -0
- data/vendor/assets/stylesheets/components/summary-list/_summary-list.scss +38 -4
- data/vendor/assets/stylesheets/helpers/_colour.scss +22 -0
- data/vendor/assets/stylesheets/helpers/_device-pixels.scss +0 -1
- metadata +5 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4f6a7096806e2fdb9295de67b39a35da1e2717619a02de5e62625cc56fc7bead
|
4
|
+
data.tar.gz: 453c533225989a938a173f1490bc959c9a66c908aab7407296e4435ef21689d9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a7986102e9e64990dcc04210640339e8fccbc2095b6496230e8b10980c621a7c1c9ac64462710bd25482571eeba0ae24b3a38538ba30b010e6d19b1caa022f17
|
7
|
+
data.tar.gz: 101f28ba552823872015ceed83539f72c7e4f10149f2ca94278d74900e78e71e078b799ad4fbfbd06c2ca6b0eeaf3abb691832ae07fb672dfa7a269ca686978c
|
data/Gemfile.lock
ADDED
@@ -0,0 +1,20 @@
|
|
1
|
+
PATH
|
2
|
+
remote: .
|
3
|
+
specs:
|
4
|
+
dxw_govuk_frontend_rails (2.10.0)
|
5
|
+
|
6
|
+
GEM
|
7
|
+
remote: https://rubygems.org/
|
8
|
+
specs:
|
9
|
+
rake (10.5.0)
|
10
|
+
|
11
|
+
PLATFORMS
|
12
|
+
ruby
|
13
|
+
|
14
|
+
DEPENDENCIES
|
15
|
+
bundler (~> 2.0)
|
16
|
+
dxw_govuk_frontend_rails!
|
17
|
+
rake (~> 10.0)
|
18
|
+
|
19
|
+
BUNDLED WITH
|
20
|
+
2.0.1
|
data/package-lock.json
CHANGED
@@ -5,9 +5,9 @@
|
|
5
5
|
"requires": true,
|
6
6
|
"dependencies": {
|
7
7
|
"govuk-frontend": {
|
8
|
-
"version": "2.
|
9
|
-
"resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-2.
|
10
|
-
"integrity": "sha512-
|
8
|
+
"version": "2.11.0",
|
9
|
+
"resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-2.11.0.tgz",
|
10
|
+
"integrity": "sha512-kZR0ZrSju+Jqh8o5niKklj8/m5XmsNNUSQLL4M4urnMcrLypwW2dU3RkR8UCnzS2DDy4BTHb7CZw0VjQPoi3jg=="
|
11
11
|
}
|
12
12
|
}
|
13
13
|
}
|
data/package.json
CHANGED
@@ -3,12 +3,24 @@
|
|
3
3
|
@import "../../helpers/all";
|
4
4
|
|
5
5
|
@include govuk-exports("govuk/component/button") {
|
6
|
-
|
7
|
-
$govuk-button-colour: #00823b;
|
8
|
-
$govuk-button-hover-colour:
|
9
|
-
$govuk-button-shadow-colour:
|
6
|
+
// Primary button variables
|
7
|
+
$govuk-button-colour: #00823b; // sass-lint:disable no-color-literals
|
8
|
+
$govuk-button-hover-colour: govuk-shade($govuk-button-colour, 20%);
|
9
|
+
$govuk-button-shadow-colour: govuk-shade($govuk-button-colour, 60%);
|
10
10
|
$govuk-button-text-colour: govuk-colour("white");
|
11
11
|
|
12
|
+
// Secondary button variables
|
13
|
+
$govuk-secondary-button-colour: govuk-colour("grey-3");
|
14
|
+
$govuk-secondary-button-hover-colour: govuk-shade($govuk-secondary-button-colour, 10%);
|
15
|
+
$govuk-secondary-button-shadow-colour: govuk-shade($govuk-secondary-button-colour, 40%);
|
16
|
+
$govuk-secondary-button-text-colour: govuk-colour("black");
|
17
|
+
|
18
|
+
// Warning button variables
|
19
|
+
$govuk-warning-button-colour: govuk-colour("red");
|
20
|
+
$govuk-warning-button-hover-colour: govuk-shade($govuk-warning-button-colour, 20%);
|
21
|
+
$govuk-warning-button-shadow-colour: govuk-shade($govuk-warning-button-colour, 60%);
|
22
|
+
$govuk-warning-button-text-colour: govuk-colour("white");
|
23
|
+
|
12
24
|
// Because the shadow (s0) is visually 'part of' the button, we need to reduce
|
13
25
|
// the height of the button to compensate by adjusting its padding (s1) and
|
14
26
|
// increase the bottom margin to include it (s2).
|
@@ -141,6 +153,64 @@
|
|
141
153
|
}
|
142
154
|
}
|
143
155
|
|
156
|
+
.govuk-button--secondary {
|
157
|
+
background-color: $govuk-secondary-button-colour;
|
158
|
+
box-shadow: 0 $button-shadow-size 0 $govuk-secondary-button-shadow-colour;
|
159
|
+
|
160
|
+
&,
|
161
|
+
&:link,
|
162
|
+
&:visited,
|
163
|
+
&:active,
|
164
|
+
&:hover {
|
165
|
+
color: $govuk-secondary-button-text-colour;
|
166
|
+
}
|
167
|
+
|
168
|
+
// alphagov/govuk_template includes a specific a:link:focus selector
|
169
|
+
// designed to make unvisited links a slightly darker blue when focussed, so
|
170
|
+
// we need to override the text colour for that combination of selectors so
|
171
|
+
// so that unvisited links styled as buttons do not end up with dark blue
|
172
|
+
// text when focussed.
|
173
|
+
@include govuk-compatibility(govuk_template) {
|
174
|
+
&:link:focus {
|
175
|
+
color: $govuk-secondary-button-text-colour;
|
176
|
+
}
|
177
|
+
}
|
178
|
+
|
179
|
+
&:hover,
|
180
|
+
&:focus {
|
181
|
+
background-color: $govuk-secondary-button-hover-colour;
|
182
|
+
}
|
183
|
+
}
|
184
|
+
|
185
|
+
.govuk-button--warning {
|
186
|
+
background-color: $govuk-warning-button-colour;
|
187
|
+
box-shadow: 0 $button-shadow-size 0 $govuk-warning-button-shadow-colour;
|
188
|
+
|
189
|
+
&,
|
190
|
+
&:link,
|
191
|
+
&:visited,
|
192
|
+
&:active,
|
193
|
+
&:hover {
|
194
|
+
color: $govuk-warning-button-text-colour;
|
195
|
+
}
|
196
|
+
|
197
|
+
// alphagov/govuk_template includes a specific a:link:focus selector
|
198
|
+
// designed to make unvisited links a slightly darker blue when focussed, so
|
199
|
+
// we need to override the text colour for that combination of selectors so
|
200
|
+
// so that unvisited links styled as buttons do not end up with dark blue
|
201
|
+
// text when focussed.
|
202
|
+
@include govuk-compatibility(govuk_template) {
|
203
|
+
&:link:focus {
|
204
|
+
color: $govuk-warning-button-text-colour;
|
205
|
+
}
|
206
|
+
}
|
207
|
+
|
208
|
+
&:hover,
|
209
|
+
&:focus {
|
210
|
+
background-color: $govuk-warning-button-hover-colour;
|
211
|
+
}
|
212
|
+
}
|
213
|
+
|
144
214
|
.govuk-button--start {
|
145
215
|
@include govuk-typography-weight-bold;
|
146
216
|
@include govuk-typography-responsive($size: 24, $override-line-height: 1);
|
@@ -176,5 +246,4 @@
|
|
176
246
|
padding-top: (govuk-spacing(2) - $govuk-border-width-form-element - ($button-shadow-size / 2) + $offset); // s1
|
177
247
|
padding-bottom: (govuk-spacing(2) - $govuk-border-width-form-element - ($button-shadow-size / 2) - $offset + 1); // s1
|
178
248
|
}
|
179
|
-
|
180
249
|
}
|
@@ -4,12 +4,22 @@
|
|
4
4
|
|
5
5
|
@include govuk-exports("govuk/component/fieldset") {
|
6
6
|
.govuk-fieldset {
|
7
|
+
min-width: 0;
|
7
8
|
margin: 0;
|
8
9
|
padding: 0;
|
9
10
|
border: 0;
|
10
11
|
@include govuk-clearfix;
|
11
12
|
}
|
12
13
|
|
14
|
+
// Fix for Firefox < 53
|
15
|
+
// https://bugzilla.mozilla.org/show_bug.cgi?id=504622
|
16
|
+
@supports not (caret-color: auto) {
|
17
|
+
.govuk-fieldset,
|
18
|
+
x:-moz-any-link {
|
19
|
+
display: table-cell;
|
20
|
+
}
|
21
|
+
}
|
22
|
+
|
13
23
|
.govuk-fieldset__legend {
|
14
24
|
@include govuk-font($size: 19);
|
15
25
|
@include govuk-text-colour;
|
@@ -208,17 +208,20 @@
|
|
208
208
|
padding: 0;
|
209
209
|
list-style: none;
|
210
210
|
-webkit-column-gap: $govuk-gutter;
|
211
|
+
-moz-column-gap: $govuk-gutter;
|
211
212
|
column-gap: $govuk-gutter; // Support: Columns
|
212
213
|
}
|
213
214
|
|
214
215
|
@include mq ($from: desktop) {
|
215
216
|
.govuk-footer__list--columns-2 {
|
216
217
|
-webkit-column-count: 2;
|
218
|
+
-moz-column-count: 2;
|
217
219
|
column-count: 2; // Support: Columns
|
218
220
|
}
|
219
221
|
|
220
222
|
.govuk-footer__list--columns-3 {
|
221
223
|
-webkit-column-count: 3;
|
224
|
+
-moz-column-count: 3;
|
222
225
|
column-count: 3; // Support: Columns
|
223
226
|
}
|
224
227
|
}
|
@@ -80,6 +80,13 @@
|
|
80
80
|
}
|
81
81
|
}
|
82
82
|
|
83
|
+
// Expand width when value is last column (no action)
|
84
|
+
.govuk-summary-list__value:last-child {
|
85
|
+
@include govuk-media-query($from: tablet) {
|
86
|
+
width: 70%;
|
87
|
+
}
|
88
|
+
}
|
89
|
+
|
83
90
|
.govuk-summary-list__value > p {
|
84
91
|
margin-bottom: govuk-spacing(2);
|
85
92
|
}
|
@@ -112,12 +119,39 @@
|
|
112
119
|
border: 0;
|
113
120
|
}
|
114
121
|
|
122
|
+
// No border on entire summary list
|
115
123
|
.govuk-summary-list--no-border {
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
124
|
+
@include govuk-media-query($until: tablet) {
|
125
|
+
.govuk-summary-list__row {
|
126
|
+
border: 0;
|
127
|
+
}
|
128
|
+
}
|
129
|
+
|
130
|
+
@include govuk-media-query($from: tablet) {
|
131
|
+
.govuk-summary-list__key,
|
132
|
+
.govuk-summary-list__value,
|
133
|
+
.govuk-summary-list__actions {
|
134
|
+
// Remove 1px border, add 1px height back on
|
135
|
+
padding-bottom: govuk-spacing(2) + 1px;
|
136
|
+
border: 0;
|
137
|
+
}
|
138
|
+
}
|
139
|
+
}
|
140
|
+
|
141
|
+
// No border on specific rows
|
142
|
+
.govuk-summary-list__row--no-border {
|
143
|
+
@include govuk-media-query($until: tablet) {
|
120
144
|
border: 0;
|
121
145
|
}
|
146
|
+
|
147
|
+
@include govuk-media-query($from: tablet) {
|
148
|
+
.govuk-summary-list__key,
|
149
|
+
.govuk-summary-list__value,
|
150
|
+
.govuk-summary-list__actions {
|
151
|
+
// Remove 1px border, add 1px height back on
|
152
|
+
padding-bottom: govuk-spacing(2) + 1px;
|
153
|
+
border: 0;
|
154
|
+
}
|
155
|
+
}
|
122
156
|
}
|
123
157
|
}
|
@@ -49,3 +49,25 @@
|
|
49
49
|
@return map-get($org-colour, colour);
|
50
50
|
}
|
51
51
|
}
|
52
|
+
|
53
|
+
/// Make a colour darker by mixing it with black
|
54
|
+
///
|
55
|
+
/// @param {Colour} $colour - colour to shade
|
56
|
+
/// @param {Number} $percentage - percentage of `$colour` in returned color
|
57
|
+
/// @return {Colour}
|
58
|
+
/// @access public
|
59
|
+
|
60
|
+
@function govuk-shade($colour, $percentage) {
|
61
|
+
@return mix(#000000, $colour, $percentage);
|
62
|
+
}
|
63
|
+
|
64
|
+
/// Make a colour lighter by mixing it with white
|
65
|
+
///
|
66
|
+
/// @param {Colour} $colour - colour to tint
|
67
|
+
/// @param {Number} $percentage - percentage of `$colour` in returned color
|
68
|
+
/// @return {Colour}
|
69
|
+
/// @access public
|
70
|
+
|
71
|
+
@function govuk-tint($colour, $percentage) {
|
72
|
+
@return mix(govuk-colour("white"), $colour, $percentage);
|
73
|
+
}
|
@@ -29,7 +29,6 @@
|
|
29
29
|
|
30
30
|
@mixin govuk-device-pixel-ratio($ratio: 2) {
|
31
31
|
@media only screen and (-webkit-min-device-pixel-ratio: $ratio),
|
32
|
-
only screen and (min--moz-device-pixel-ratio: $ratio),
|
33
32
|
only screen and ( min-device-pixel-ratio: $ratio),
|
34
33
|
only screen and ( min-resolution: #{($ratio*96)}dpi),
|
35
34
|
only screen and ( min-resolution: #{$ratio}dppx) {
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dxw_govuk_frontend_rails
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.11.0.pre
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- mec
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: exe
|
11
11
|
cert_chain: []
|
12
|
-
date: 2019-04-
|
12
|
+
date: 2019-04-27 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|
@@ -50,6 +50,7 @@ files:
|
|
50
50
|
- ".gitignore"
|
51
51
|
- CODE_OF_CONDUCT.md
|
52
52
|
- Gemfile
|
53
|
+
- Gemfile.lock
|
53
54
|
- LICENSE.txt
|
54
55
|
- README.md
|
55
56
|
- Rakefile
|
@@ -192,9 +193,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
192
193
|
version: '0'
|
193
194
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
194
195
|
requirements:
|
195
|
-
- - "
|
196
|
+
- - ">"
|
196
197
|
- !ruby/object:Gem::Version
|
197
|
-
version:
|
198
|
+
version: 1.3.1
|
198
199
|
requirements: []
|
199
200
|
rubygems_version: 3.0.3
|
200
201
|
signing_key:
|