govuk_admin_template 6.7.0 → 6.8.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.
- checksums.yaml +4 -4
- data/CHANGELOG.md +6 -0
- data/app/assets/stylesheets/govuk_admin_template/_base.scss +4 -4
- data/app/assets/stylesheets/govuk_admin_template/_bootstrap_colour_overrides.scss +42 -1
- data/app/assets/stylesheets/govuk_admin_template/_bootstrap_overrides.scss +48 -3
- data/app/assets/stylesheets/govuk_admin_template/_nav_list.scss +6 -1
- data/app/assets/stylesheets/govuk_admin_template/_navbar.scss +5 -0
- data/app/controllers/govuk_admin_template/style_guide_controller.rb +1 -1
- data/app/views/govuk_admin_template/_govspeak_help.html.erb +13 -16
- data/config/routes.rb +1 -1
- data/lib/govuk_admin_template/config.rb +1 -1
- data/lib/govuk_admin_template/engine.rb +18 -15
- data/lib/govuk_admin_template/simple_form.rb +17 -17
- data/lib/govuk_admin_template/version.rb +1 -1
- data/lib/govuk_admin_template/view_helpers.rb +2 -1
- data/lib/govuk_admin_template.rb +2 -2
- data/lib/tasks/lint.rake +6 -0
- data/lib/tasks/sass/check.rake +52 -0
- metadata +55 -25
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 010b3cd14741108d2a2b276944dc9b5b43606a3078f913b6fd41918662f3ec22
|
4
|
+
data.tar.gz: cd45ef2f5fe57d5f5a32a93237888ff0fca097ac43c8da7a0f0d9edb4e394fdf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 80e19916ad0dc705653a028d580b0c3372f75629e9ed1a4ee5ff6d41e88a02f574ab7778e0fa13dc5d96b2c7c46dde78dd84cd8b81abb41668bd44ab52cf8b7c
|
7
|
+
data.tar.gz: c65437f8401bb0789bfb853dd1df53bcb92c4d0e4a3faee50e772ec55a9294c24fd26c39914c73c36c4824fad43a8b731c87aafbcff53ec7b0685ede97fa0a8f
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,9 @@
|
|
1
|
+
# 6.8.0
|
2
|
+
|
3
|
+
* Replace the development dependency govuk-lint with rubocop-govuk
|
4
|
+
* Fix colour contrast issues flagged by WAVE Web Accessibility Evaluation Tool
|
5
|
+
* Ensure govspeak guidance can be navigated to via keyboard tabbing
|
6
|
+
|
1
7
|
# 6.7.0
|
2
8
|
|
3
9
|
* Update bootstrap-sass dependency to 3.4.1 (from 3.3.5.1)
|
@@ -276,13 +276,13 @@ a.list-group-item {
|
|
276
276
|
|
277
277
|
.link-muted,
|
278
278
|
.link-muted:visited {
|
279
|
-
color: $gray-
|
279
|
+
color: $gray-dark;
|
280
280
|
text-decoration: underline;
|
281
281
|
}
|
282
282
|
|
283
283
|
.link-muted:hover,
|
284
284
|
.link-muted:focus {
|
285
|
-
color:
|
285
|
+
color: #000;
|
286
286
|
}
|
287
287
|
|
288
288
|
.link-inherit,
|
@@ -304,7 +304,7 @@ a.list-group-item {
|
|
304
304
|
font-size: 65%;
|
305
305
|
font-weight: normal;
|
306
306
|
line-height: 1.5;
|
307
|
-
color: $gray
|
307
|
+
color: $gray;
|
308
308
|
display: block;
|
309
309
|
}
|
310
310
|
|
@@ -360,7 +360,7 @@ a.list-group-item {
|
|
360
360
|
}
|
361
361
|
|
362
362
|
.no-content {
|
363
|
-
color:
|
363
|
+
color: $gray;
|
364
364
|
@extend %large-and-spaced;
|
365
365
|
}
|
366
366
|
|
@@ -1,3 +1,7 @@
|
|
1
|
+
$black: #000;
|
2
|
+
$gray-dark: #444;
|
3
|
+
$blue: #1d70b8;
|
4
|
+
|
1
5
|
/*
|
2
6
|
Bootstrap 3.2 made gray-light darker for accessibility and contrast:
|
3
7
|
https://github.com/twbs/bootstrap/releases/tag/v3.2.0
|
@@ -5,4 +9,41 @@
|
|
5
9
|
This assumed gray-light was on a light background. We aren't always
|
6
10
|
using it in that way. Reset to the original value #999.
|
7
11
|
*/
|
8
|
-
|
12
|
+
|
13
|
+
$gray-light: lighten($black, 60%);
|
14
|
+
|
15
|
+
/*
|
16
|
+
Updates a bunch of copy that used to be gray to black for things like labels.
|
17
|
+
*/
|
18
|
+
$text-color: $black;
|
19
|
+
|
20
|
+
/*
|
21
|
+
Updates the input to black so it contrasts with the light gray background.
|
22
|
+
*/
|
23
|
+
$input-color: $black;
|
24
|
+
|
25
|
+
/*
|
26
|
+
Updates muted text to gray so it contrasts with the light gray background.
|
27
|
+
*/
|
28
|
+
$text-muted: $gray-dark;
|
29
|
+
|
30
|
+
/*
|
31
|
+
Updates text in the breadcrumbs to use a darker gray to fix contrast issues.
|
32
|
+
*/
|
33
|
+
$breadcrumb-active-color: $gray-dark;
|
34
|
+
|
35
|
+
/*
|
36
|
+
Updates the spans in headers to use a darker gray to fix contrast issues.
|
37
|
+
*/
|
38
|
+
$headings-small-color: $gray-dark;
|
39
|
+
|
40
|
+
/*
|
41
|
+
Updates the disabled pagination links to use a darker gray to fix contrast issues.
|
42
|
+
*/
|
43
|
+
$pagination-disabled-color: $gray-dark;
|
44
|
+
|
45
|
+
/*
|
46
|
+
Updates the default link to colour to a the same colour used in the
|
47
|
+
GOVUK design system. This fixes some contrast issues.
|
48
|
+
*/
|
49
|
+
$link-color: $blue;
|
@@ -1,5 +1,18 @@
|
|
1
1
|
@import 'govuk_admin_template/buttons'; // overrides bootstrap buttons
|
2
2
|
|
3
|
+
$govuk-tag-dark-grey: #383f43;
|
4
|
+
$govuk-tag-light-gray: #eeefef;
|
5
|
+
$govuk-tag-mid-blue: #1d70b8;
|
6
|
+
$govuk-tag-white: #fff;
|
7
|
+
$govuk-tag-dark-green: #005a30;
|
8
|
+
$govuk-tag-light-green: #cce2d8;
|
9
|
+
$govuk-tag-dark-blue: #144e81;
|
10
|
+
$govuk-tag-light-blue: #d2e2f1;
|
11
|
+
$govuk-tag-dark-yellow: #594d00;
|
12
|
+
$govuk-tag-light-yellow: #fff7bf;
|
13
|
+
$govuk-tag-dark-red: #942514;
|
14
|
+
$govuk-tag-light-red: #f6d7d2;
|
15
|
+
|
3
16
|
/*
|
4
17
|
The admin gem's navbar has a bottom margin, for correct spacing
|
5
18
|
when the page-header class isn't used. To account for this reduce
|
@@ -19,8 +32,40 @@
|
|
19
32
|
.lead {
|
20
33
|
font-weight: normal;
|
21
34
|
color: #555;
|
35
|
+
}
|
36
|
+
|
37
|
+
// Overrides the lables to use same colour scheme as the GOVUK design system
|
38
|
+
|
39
|
+
.label-default {
|
40
|
+
color: $govuk-tag-dark-grey;
|
41
|
+
background: $govuk-tag-light-gray;
|
42
|
+
}
|
43
|
+
|
44
|
+
.label-primary {
|
45
|
+
color: $govuk-tag-mid-blue;
|
46
|
+
background: $govuk-tag-white;
|
47
|
+
}
|
48
|
+
|
49
|
+
.label-success {
|
50
|
+
color: $govuk-tag-dark-green;
|
51
|
+
background: $govuk-tag-light-green;
|
52
|
+
}
|
53
|
+
|
54
|
+
.label-info {
|
55
|
+
color: $govuk-tag-dark-blue;
|
56
|
+
background: $govuk-tag-light-blue;
|
57
|
+
}
|
58
|
+
|
59
|
+
.label-warning {
|
60
|
+
color: $govuk-tag-dark-yellow;
|
61
|
+
background: $govuk-tag-light-yellow;
|
62
|
+
}
|
63
|
+
|
64
|
+
.label-danger {
|
65
|
+
color: $govuk-tag-dark-red;
|
66
|
+
background: $govuk-tag-light-red;
|
67
|
+
}
|
22
68
|
|
23
|
-
|
24
|
-
|
25
|
-
}
|
69
|
+
.label {
|
70
|
+
font-size: 80%;
|
26
71
|
}
|
@@ -20,7 +20,7 @@
|
|
20
20
|
font-size: 11px;
|
21
21
|
font-weight: bold;
|
22
22
|
line-height: $line-height-computed;
|
23
|
-
color: $gray
|
23
|
+
color: $gray;
|
24
24
|
text-transform: uppercase;
|
25
25
|
}
|
26
26
|
|
@@ -30,6 +30,11 @@
|
|
30
30
|
}
|
31
31
|
}
|
32
32
|
|
33
|
+
.nav-tabs .badge {
|
34
|
+
color: #fff;
|
35
|
+
background: #666;
|
36
|
+
}
|
37
|
+
|
33
38
|
.nav-list > li > a,
|
34
39
|
.nav-list .nav-header {
|
35
40
|
margin-left: -15px;
|
@@ -1,7 +1,7 @@
|
|
1
1
|
module GovukAdminTemplate
|
2
2
|
class StyleGuideController < ApplicationController
|
3
3
|
def index
|
4
|
-
@normal_link_href = "#{request.original_url}##{Time.now.utc.to_i}"
|
4
|
+
@normal_link_href = "#{request.original_url}##{Time.zone.now.utc.to_i}"
|
5
5
|
@visited_link_href = request.original_url
|
6
6
|
end
|
7
7
|
end
|
@@ -5,7 +5,7 @@
|
|
5
5
|
<h2>Formatting help</h2>
|
6
6
|
<%= yield :format_specific_help %>
|
7
7
|
<h3>
|
8
|
-
<a data-toggle="collapse"
|
8
|
+
<a data-toggle="collapse" href="#govspeak-headings">
|
9
9
|
Headings
|
10
10
|
</a>
|
11
11
|
</h3>
|
@@ -18,7 +18,7 @@
|
|
18
18
|
</div>
|
19
19
|
|
20
20
|
<h3>
|
21
|
-
<a data-toggle="collapse"
|
21
|
+
<a data-toggle="collapse" href="#govspeak-links">
|
22
22
|
Links
|
23
23
|
</a>
|
24
24
|
</h3>
|
@@ -54,7 +54,7 @@
|
|
54
54
|
</div>
|
55
55
|
|
56
56
|
<h3>
|
57
|
-
<a data-toggle="collapse"
|
57
|
+
<a data-toggle="collapse" href="#govspeak-bullets">
|
58
58
|
Bullets
|
59
59
|
</a>
|
60
60
|
</h3>
|
@@ -67,7 +67,7 @@
|
|
67
67
|
</div>
|
68
68
|
|
69
69
|
<h3>
|
70
|
-
<a data-toggle="collapse"
|
70
|
+
<a data-toggle="collapse" href="#govspeak-numbered-list">
|
71
71
|
Numbered list
|
72
72
|
</a>
|
73
73
|
</h3>
|
@@ -81,7 +81,7 @@
|
|
81
81
|
</div>
|
82
82
|
|
83
83
|
<h3>
|
84
|
-
<a data-toggle="collapse"
|
84
|
+
<a data-toggle="collapse" href="#govspeak-priority-list">
|
85
85
|
Priority list
|
86
86
|
</a>
|
87
87
|
</h3>
|
@@ -98,7 +98,7 @@
|
|
98
98
|
</div>
|
99
99
|
|
100
100
|
<h3>
|
101
|
-
<a data-toggle="collapse"
|
101
|
+
<a data-toggle="collapse" href="#govspeak-legislative-list">
|
102
102
|
Legislative list
|
103
103
|
</a>
|
104
104
|
</h3>
|
@@ -120,7 +120,7 @@
|
|
120
120
|
</div>
|
121
121
|
|
122
122
|
<h3>
|
123
|
-
<a data-toggle="collapse"
|
123
|
+
<a data-toggle="collapse" href="#govspeak-tables">
|
124
124
|
Tables
|
125
125
|
</a>
|
126
126
|
</h3>
|
@@ -139,7 +139,7 @@
|
|
139
139
|
</div>
|
140
140
|
|
141
141
|
<h3>
|
142
|
-
<a data-toggle="collapse"
|
142
|
+
<a data-toggle="collapse" href="#govspeak-cta">
|
143
143
|
Call to action
|
144
144
|
</a>
|
145
145
|
</h3>
|
@@ -150,21 +150,18 @@
|
|
150
150
|
</div>
|
151
151
|
|
152
152
|
<h3>
|
153
|
-
<a data-toggle="collapse"
|
153
|
+
<a data-toggle="collapse" href="#govspeak-abbreviations-and-acronyms">
|
154
154
|
Abbreviations and acronyms
|
155
155
|
</a>
|
156
156
|
</h3>
|
157
157
|
<div class="collapse" id="govspeak-abbreviations-and-acronyms">
|
158
|
-
<pre
|
159
|
-
|
160
|
-
*[EU]: European Union
|
161
|
-
*[DWP]: Department for Work and Pensions</pre>
|
158
|
+
<pre>*[DWP]: Department for Work and Pensions</pre>
|
162
159
|
<p>Text found in content which matches what’s in the brackets <code>[ ]</code> (eg DWP), will have the full text (Department for Work and Pensions) available to screenreaders and when hovering: <abbr title="Department for Work and Pensions">DWP</abbr>. The markdown code will not be displayed.</p>
|
163
160
|
<p>List abbreviation markdown at the end.</p>
|
164
161
|
</div>
|
165
162
|
|
166
163
|
<h3>
|
167
|
-
<a data-toggle="collapse"
|
164
|
+
<a data-toggle="collapse" href="#govspeak-blockquotes">
|
168
165
|
Blockquotes
|
169
166
|
</a>
|
170
167
|
</h3>
|
@@ -178,7 +175,7 @@
|
|
178
175
|
</div>
|
179
176
|
|
180
177
|
<h3>
|
181
|
-
<a data-toggle="collapse"
|
178
|
+
<a data-toggle="collapse" href="#govspeak-addresses">
|
182
179
|
Addresses
|
183
180
|
</a>
|
184
181
|
</h3>
|
@@ -192,7 +189,7 @@
|
|
192
189
|
</div>
|
193
190
|
|
194
191
|
<h3>
|
195
|
-
<a data-toggle="collapse"
|
192
|
+
<a data-toggle="collapse" href="#govspeak-footnotes">
|
196
193
|
Footnotes
|
197
194
|
</a>
|
198
195
|
</h3>
|
data/config/routes.rb
CHANGED
@@ -1,37 +1,40 @@
|
|
1
1
|
module GovukAdminTemplate
|
2
2
|
class Engine < ::Rails::Engine
|
3
|
-
require
|
4
|
-
require
|
5
|
-
|
6
|
-
initializer
|
7
|
-
app.config.assets.precompile += %w
|
8
|
-
app.config.assets.precompile += %w
|
9
|
-
|
10
|
-
|
3
|
+
require "bootstrap-sass"
|
4
|
+
require "jquery-rails"
|
5
|
+
|
6
|
+
initializer "govuk_admin_template.assets.precompile" do |app|
|
7
|
+
app.config.assets.precompile += %w[lte-ie8.js govuk-admin-template.js]
|
8
|
+
app.config.assets.precompile += %w[govuk_admin_template/favicon-development.png
|
9
|
+
govuk_admin_template/favicon-test.png
|
10
|
+
govuk_admin_template/favicon-integration.png
|
11
|
+
govuk_admin_template/favicon-preview.png
|
12
|
+
govuk_admin_template/favicon-production.png
|
13
|
+
govuk_admin_template/favicon.png]
|
11
14
|
end
|
12
15
|
|
13
16
|
# User friendly GOV.UK date formats, based on:
|
14
17
|
# https://www.gov.uk/guidance/style-guide/a-to-z-of-gov-uk-style#dates
|
15
18
|
# https://www.gov.uk/guidance/style-guide/a-to-z-of-gov-uk-style#times
|
16
|
-
initializer
|
19
|
+
initializer "govuk_admin_template.date_formats" do |_app|
|
17
20
|
# 1 January 2013
|
18
|
-
Date::DATE_FORMATS[:govuk_date] =
|
21
|
+
Date::DATE_FORMATS[:govuk_date] = "%-e %B %Y"
|
19
22
|
|
20
23
|
# 1 Jan 2013
|
21
|
-
Date::DATE_FORMATS[:govuk_date_short] =
|
24
|
+
Date::DATE_FORMATS[:govuk_date_short] = "%-e %b %Y"
|
22
25
|
|
23
26
|
# 1:15pm, 1 January 2013
|
24
|
-
Time::DATE_FORMATS[:govuk_date] =
|
27
|
+
Time::DATE_FORMATS[:govuk_date] = "%-I:%M%P, %-e %B %Y"
|
25
28
|
|
26
29
|
# 1:15pm, 1 Jan 2013
|
27
|
-
Time::DATE_FORMATS[:govuk_date_short] =
|
30
|
+
Time::DATE_FORMATS[:govuk_date_short] = "%-I:%M%P, %-e %b %Y"
|
28
31
|
|
29
32
|
# 1:15pm
|
30
|
-
Time::DATE_FORMATS[:govuk_time] =
|
33
|
+
Time::DATE_FORMATS[:govuk_time] = "%-I:%M%P"
|
31
34
|
end
|
32
35
|
|
33
36
|
initializer "govuk_admin_template.view_helpers" do
|
34
|
-
ActionView::Base.
|
37
|
+
ActionView::Base.include ViewHelpers
|
35
38
|
end
|
36
39
|
end
|
37
40
|
end
|
@@ -38,40 +38,40 @@ module GovukAdminTemplate
|
|
38
38
|
b.use :error, wrap_with: { tag: :span, class: :error }
|
39
39
|
end
|
40
40
|
|
41
|
-
config.wrappers :bootstrap, tag:
|
41
|
+
config.wrappers :bootstrap, tag: "div", class: "form-group", error_class: "has-error" do |b|
|
42
42
|
b.use :html5
|
43
43
|
b.use :placeholder
|
44
|
-
b.use :label, class:
|
45
|
-
b.wrapper tag:
|
44
|
+
b.use :label, class: "control-label"
|
45
|
+
b.wrapper tag: "div" do |ba|
|
46
46
|
ba.use :input
|
47
|
-
ba.use :error, wrap_with: { tag:
|
48
|
-
ba.use :hint, wrap_with: { tag:
|
47
|
+
ba.use :error, wrap_with: { tag: "span", class: "help-inline" }
|
48
|
+
ba.use :hint, wrap_with: { tag: "p", class: "help-block" }
|
49
49
|
end
|
50
50
|
end
|
51
51
|
|
52
|
-
config.wrappers :prepend, tag:
|
52
|
+
config.wrappers :prepend, tag: "div", class: "form-group", error_class: "has-error" do |b|
|
53
53
|
b.use :html5
|
54
54
|
b.use :placeholder
|
55
55
|
b.use :label
|
56
|
-
b.wrapper tag:
|
57
|
-
input.wrapper tag:
|
56
|
+
b.wrapper tag: "div", class: "controls" do |input|
|
57
|
+
input.wrapper tag: "div", class: "input-prepend" do |prepend|
|
58
58
|
prepend.use :input
|
59
59
|
end
|
60
|
-
input.use :hint, wrap_with: { tag:
|
61
|
-
input.use :error, wrap_with: { tag:
|
60
|
+
input.use :hint, wrap_with: { tag: "span", class: "help-block" }
|
61
|
+
input.use :error, wrap_with: { tag: "span", class: "help-inline" }
|
62
62
|
end
|
63
63
|
end
|
64
64
|
|
65
|
-
config.wrappers :append, tag:
|
65
|
+
config.wrappers :append, tag: "div", class: "form-group", error_class: "has-error" do |b|
|
66
66
|
b.use :html5
|
67
67
|
b.use :placeholder
|
68
68
|
b.use :label
|
69
|
-
b.wrapper tag:
|
70
|
-
input.wrapper tag:
|
69
|
+
b.wrapper tag: "div", class: "controls" do |input|
|
70
|
+
input.wrapper tag: "div", class: "input-append" do |append|
|
71
71
|
append.use :input
|
72
72
|
end
|
73
|
-
input.use :hint, wrap_with: { tag:
|
74
|
-
input.use :error, wrap_with: { tag:
|
73
|
+
input.use :hint, wrap_with: { tag: "span", class: "help-block" }
|
74
|
+
input.use :error, wrap_with: { tag: "span", class: "help-inline" }
|
75
75
|
end
|
76
76
|
end
|
77
77
|
|
@@ -85,13 +85,13 @@ module GovukAdminTemplate
|
|
85
85
|
config.boolean_style = :inline
|
86
86
|
|
87
87
|
# Default class for buttons
|
88
|
-
config.button_class =
|
88
|
+
config.button_class = "btn"
|
89
89
|
|
90
90
|
# Default tag used for error notification helper.
|
91
91
|
config.error_notification_tag = :div
|
92
92
|
|
93
93
|
# CSS class to add for error notification helper.
|
94
|
-
config.error_notification_class =
|
94
|
+
config.error_notification_class = "alert alert-danger"
|
95
95
|
|
96
96
|
# Tell browsers whether to use default HTML5 validations (novalidate option).
|
97
97
|
# Default is enabled.
|
@@ -5,7 +5,8 @@ module GovukAdminTemplate
|
|
5
5
|
|
6
6
|
flash.each do |type, message|
|
7
7
|
next unless type.to_sym.in?(%i[success info warning danger])
|
8
|
-
|
8
|
+
|
9
|
+
html << tag.div(message, class: "alert alert-#{type}")
|
9
10
|
end
|
10
11
|
|
11
12
|
html.join.html_safe
|
data/lib/govuk_admin_template.rb
CHANGED
@@ -8,11 +8,11 @@ module GovukAdminTemplate
|
|
8
8
|
mattr_accessor :environment_style, :environment_label
|
9
9
|
|
10
10
|
def self.environment_style
|
11
|
-
@@environment_style ||
|
11
|
+
@@environment_style || default_environment_style
|
12
12
|
end
|
13
13
|
|
14
14
|
def self.environment_label
|
15
|
-
@@environment_label ||
|
15
|
+
@@environment_label || environment_style.try(:titleize)
|
16
16
|
end
|
17
17
|
|
18
18
|
# In development we can't consistently set an environment
|
data/lib/tasks/lint.rake
ADDED
@@ -0,0 +1,52 @@
|
|
1
|
+
UNGUARDED_URL_USAGE = /\surl\(/.freeze
|
2
|
+
ABSOLUTE_ASSET_USAGE = /(?:image-path|image-url|asset-path|asset-url)\(["']\/assets/.freeze
|
3
|
+
|
4
|
+
namespace :sass do
|
5
|
+
desc "Check all SCSS for 404-creating problems, takes place of govuk-lint"
|
6
|
+
task check: :environment do
|
7
|
+
scss_files = File.expand_path(
|
8
|
+
"../../app/assets/stylesheets/**/*.scss", __dir__
|
9
|
+
)
|
10
|
+
|
11
|
+
matching_lines = Dir[scss_files].each_with_object([]) do |scss_file, matching|
|
12
|
+
File.readlines(scss_file).each_with_index do |line, number|
|
13
|
+
matching << "Unguarded url usage: #{scss_file}:#{number + 1}" if line =~ UNGUARDED_URL_USAGE
|
14
|
+
matching << "Absolute /assets usage: #{scss_file}:#{number + 1}" if line =~ ABSOLUTE_ASSET_USAGE
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
if matching_lines.any?
|
19
|
+
raise <<~MSG
|
20
|
+
|
21
|
+
One or more problems exist:
|
22
|
+
|
23
|
+
Unguarded url usage
|
24
|
+
-------------------
|
25
|
+
|
26
|
+
Do not use instances of url(...) to refer to images within this gem.
|
27
|
+
Prefer the SASS function image-url. Unguarded url references won't work in
|
28
|
+
Rails 4 and up due to MD5 hashes in asset filenames. Your asset will 404 in
|
29
|
+
production Rails 4 apps.
|
30
|
+
|
31
|
+
Absolute /assets usage
|
32
|
+
----------------------
|
33
|
+
|
34
|
+
When using any of the image/asset helpers, don't refer to /assets absolutely.
|
35
|
+
For example,
|
36
|
+
|
37
|
+
image-url('/assets/govuk_admin_template/header-crown.png')
|
38
|
+
|
39
|
+
should instead be
|
40
|
+
|
41
|
+
image-url('govuk_admin_template/header-crown.png')
|
42
|
+
|
43
|
+
If Sprockets can't find the image on precompilation, it won't rewrite the
|
44
|
+
URL and will pass it through unaltered. This usually means it will 404.
|
45
|
+
|
46
|
+
Problems:
|
47
|
+
#{matching_lines.join("\n ")}
|
48
|
+
|
49
|
+
MSG
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|
metadata
CHANGED
@@ -1,29 +1,15 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: govuk_admin_template
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 6.
|
4
|
+
version: 6.8.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- GOV.UK Dev
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2022-02-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
|
-
- !ruby/object:Gem::Dependency
|
14
|
-
name: rails
|
15
|
-
requirement: !ruby/object:Gem::Requirement
|
16
|
-
requirements:
|
17
|
-
- - ">="
|
18
|
-
- !ruby/object:Gem::Version
|
19
|
-
version: 3.2.0
|
20
|
-
type: :runtime
|
21
|
-
prerelease: false
|
22
|
-
version_requirements: !ruby/object:Gem::Requirement
|
23
|
-
requirements:
|
24
|
-
- - ">="
|
25
|
-
- !ruby/object:Gem::Version
|
26
|
-
version: 3.2.0
|
27
13
|
- !ruby/object:Gem::Dependency
|
28
14
|
name: bootstrap-sass
|
29
15
|
requirement: !ruby/object:Gem::Requirement
|
@@ -67,21 +53,49 @@ dependencies:
|
|
67
53
|
- !ruby/object:Gem::Version
|
68
54
|
version: 2.1.0
|
69
55
|
- !ruby/object:Gem::Dependency
|
70
|
-
name:
|
56
|
+
name: rails
|
57
|
+
requirement: !ruby/object:Gem::Requirement
|
58
|
+
requirements:
|
59
|
+
- - ">="
|
60
|
+
- !ruby/object:Gem::Version
|
61
|
+
version: 3.2.0
|
62
|
+
type: :runtime
|
63
|
+
prerelease: false
|
64
|
+
version_requirements: !ruby/object:Gem::Requirement
|
65
|
+
requirements:
|
66
|
+
- - ">="
|
67
|
+
- !ruby/object:Gem::Version
|
68
|
+
version: 3.2.0
|
69
|
+
- !ruby/object:Gem::Dependency
|
70
|
+
name: capybara
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
73
|
- - "~>"
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version: '
|
75
|
+
version: '3'
|
76
76
|
type: :development
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
80
|
- - "~>"
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version: '
|
82
|
+
version: '3'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
|
-
name:
|
84
|
+
name: govuk_test
|
85
|
+
requirement: !ruby/object:Gem::Requirement
|
86
|
+
requirements:
|
87
|
+
- - "~>"
|
88
|
+
- !ruby/object:Gem::Version
|
89
|
+
version: '2'
|
90
|
+
type: :development
|
91
|
+
prerelease: false
|
92
|
+
version_requirements: !ruby/object:Gem::Requirement
|
93
|
+
requirements:
|
94
|
+
- - "~>"
|
95
|
+
- !ruby/object:Gem::Version
|
96
|
+
version: '2'
|
97
|
+
- !ruby/object:Gem::Dependency
|
98
|
+
name: jasmine
|
85
99
|
requirement: !ruby/object:Gem::Requirement
|
86
100
|
requirements:
|
87
101
|
- - "~>"
|
@@ -95,7 +109,7 @@ dependencies:
|
|
95
109
|
- !ruby/object:Gem::Version
|
96
110
|
version: '3'
|
97
111
|
- !ruby/object:Gem::Dependency
|
98
|
-
name:
|
112
|
+
name: jasmine_selenium_runner
|
99
113
|
requirement: !ruby/object:Gem::Requirement
|
100
114
|
requirements:
|
101
115
|
- - "~>"
|
@@ -109,7 +123,7 @@ dependencies:
|
|
109
123
|
- !ruby/object:Gem::Version
|
110
124
|
version: '3'
|
111
125
|
- !ruby/object:Gem::Dependency
|
112
|
-
name:
|
126
|
+
name: rspec-rails
|
113
127
|
requirement: !ruby/object:Gem::Requirement
|
114
128
|
requirements:
|
115
129
|
- - "~>"
|
@@ -123,7 +137,7 @@ dependencies:
|
|
123
137
|
- !ruby/object:Gem::Version
|
124
138
|
version: '3'
|
125
139
|
- !ruby/object:Gem::Dependency
|
126
|
-
name: govuk
|
140
|
+
name: rubocop-govuk
|
127
141
|
requirement: !ruby/object:Gem::Requirement
|
128
142
|
requirements:
|
129
143
|
- - ">="
|
@@ -136,6 +150,20 @@ dependencies:
|
|
136
150
|
- - ">="
|
137
151
|
- !ruby/object:Gem::Version
|
138
152
|
version: '0'
|
153
|
+
- !ruby/object:Gem::Dependency
|
154
|
+
name: sass-rails
|
155
|
+
requirement: !ruby/object:Gem::Requirement
|
156
|
+
requirements:
|
157
|
+
- - "~>"
|
158
|
+
- !ruby/object:Gem::Version
|
159
|
+
version: '5'
|
160
|
+
type: :development
|
161
|
+
prerelease: false
|
162
|
+
version_requirements: !ruby/object:Gem::Requirement
|
163
|
+
requirements:
|
164
|
+
- - "~>"
|
165
|
+
- !ruby/object:Gem::Version
|
166
|
+
version: '5'
|
139
167
|
description: Styles, scripts and templates for GOV.UK admin applications
|
140
168
|
email:
|
141
169
|
- govuk-dev@digital.cabinet-office.gov.uk
|
@@ -198,6 +226,8 @@ files:
|
|
198
226
|
- lib/govuk_admin_template/simple_form.rb
|
199
227
|
- lib/govuk_admin_template/version.rb
|
200
228
|
- lib/govuk_admin_template/view_helpers.rb
|
229
|
+
- lib/tasks/lint.rake
|
230
|
+
- lib/tasks/sass/check.rake
|
201
231
|
homepage: https://github.com/alphagov/govuk_admin_template
|
202
232
|
licenses: []
|
203
233
|
metadata: {}
|
@@ -209,14 +239,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
209
239
|
requirements:
|
210
240
|
- - ">="
|
211
241
|
- !ruby/object:Gem::Version
|
212
|
-
version:
|
242
|
+
version: 2.7.2
|
213
243
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
214
244
|
requirements:
|
215
245
|
- - ">="
|
216
246
|
- !ruby/object:Gem::Version
|
217
247
|
version: '0'
|
218
248
|
requirements: []
|
219
|
-
rubygems_version: 3.
|
249
|
+
rubygems_version: 3.1.4
|
220
250
|
signing_key:
|
221
251
|
specification_version: 4
|
222
252
|
summary: Styles, scripts and templates for GOV.UK admin applications
|