govuk_admin_template 6.8.1 → 6.9.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +14 -0
- data/CSS.md +8 -8
- data/JAVASCRIPT.md +1 -1
- data/README.md +37 -21
- data/app/views/govuk_admin_template/style_guide/index.html.erb +11 -11
- data/app/views/layouts/govuk_admin_template.html.erb +1 -1
- data/lib/govuk_admin_template/version.rb +1 -1
- metadata +22 -66
- data/lib/tasks/lint.rake +0 -6
- data/lib/tasks/sass/check.rake +0 -52
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 29eb8926a645b99d811437c15b008bfa7f4ca1ee2203d6923571c9a2c994a311
|
4
|
+
data.tar.gz: 49b87aab449542d6dca6fd181aa526b2cad5643bd3752ea7f73b5dcde1434be7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: dc12a3a13ebcb6f5bf62c47ba860e23b95811f04cea1c1ac1c5efd76ae7a8307a9db031bcb9cd2063b7d43a1302856c8c0ea06ea52daffdadb21816d193e05bc
|
7
|
+
data.tar.gz: 95fe3e1b8ae9398c28595c52a51f877030232596ba7c84ab8cd01a41c539688fdb4a32015809085a10246ece40857e98cdbb1447cd35df00086d3ac98bcc83c2
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,17 @@
|
|
1
|
+
# 6.9.2
|
2
|
+
|
3
|
+
* Fix providing gem internal Rake tasks to applications embedding this gem as an engine.
|
4
|
+
|
5
|
+
# 6.9.1
|
6
|
+
|
7
|
+
* Fix broken Rails 6 compatibility: use `Date#to_formatted_s` instead of `Date#to_fs`
|
8
|
+
|
9
|
+
# 6.9.0
|
10
|
+
|
11
|
+
* Rails 7 compatibility: use `Time#to_fs` instead of deprecated use of `Time#to_s`
|
12
|
+
* Bump minimum supported Rails version to 6
|
13
|
+
* Fix broken 'Crown Copyright' link in the layout template page footer
|
14
|
+
|
1
15
|
# 6.8.1
|
2
16
|
|
3
17
|
* Ensure labels have sufficient colour contrast
|
data/CSS.md
CHANGED
@@ -9,20 +9,20 @@ CSS in the gem follows two conventions:
|
|
9
9
|
## Available helper classes
|
10
10
|
|
11
11
|
Firstly, the admin styles are based on Bootstrap:
|
12
|
-
* [Bootstrap CSS](
|
13
|
-
* [Bootstrap Components](
|
12
|
+
* [Bootstrap CSS](https://getbootstrap.com/docs/3.4/css/)
|
13
|
+
* [Bootstrap Components](https://getbootstrap.com/docs/3.4/components/)
|
14
14
|
|
15
15
|
For admin components, see the admin style guide (`/style-guide` in your app).
|
16
16
|
|
17
17
|
### Hide and show content
|
18
|
-
[
|
18
|
+
See: [toggles.scss](app/assets/stylesheets/govuk_admin_template/_toggles.scss)
|
19
19
|
|
20
20
|
Class | Purpose
|
21
21
|
------ |--------
|
22
22
|
`hide` | Hide content from all users, including screenreaders
|
23
23
|
`if-no-js-hide` | Hide from users without Javascript
|
24
24
|
`if-js-hide` | Hide from users with Javascript
|
25
|
-
`rm` | [Hide visually](
|
25
|
+
`rm` | [Hide visually](https://snook.ca/archives/html_and_css/hiding-content-for-accessibility) but keep available to screenreaders
|
26
26
|
`if-js-rm` | Hide visually from users with Javascript
|
27
27
|
|
28
28
|
### Margin helpers
|
@@ -35,7 +35,7 @@ Rather than creating a class purely to remove or add margins (many Bootstrap sty
|
|
35
35
|
|
36
36
|
The mixins don’t include `!important` by default, but can be added as a parameter:
|
37
37
|
|
38
|
-
```
|
38
|
+
```scss
|
39
39
|
.class {
|
40
40
|
@include add-top-margin;
|
41
41
|
@include add-top-margin('!important');
|
@@ -61,7 +61,7 @@ Like the margin helpers, the padding classes include `!important` so they’ll a
|
|
61
61
|
<h3 class="add-bottom-padding"></h3>
|
62
62
|
```
|
63
63
|
|
64
|
-
```
|
64
|
+
```scss
|
65
65
|
.class {
|
66
66
|
@include add-top-padding;
|
67
67
|
@include add-top-padding('!important');
|
@@ -105,7 +105,7 @@ Class | Purpose
|
|
105
105
|
`inline-block` | Display inline-block
|
106
106
|
|
107
107
|
### Tables
|
108
|
-
[tables.
|
108
|
+
See: [tables.scss](app/assets/stylesheets/govuk_admin_template/_tables.scss)
|
109
109
|
|
110
110
|
Class | Purpose
|
111
111
|
------ |--------
|
@@ -114,7 +114,7 @@ Class | Purpose
|
|
114
114
|
|
115
115
|
### SASS Variables
|
116
116
|
|
117
|
-
Along with Bootstrap’s many [mixins](https://github.com/twbs/bootstrap-sass/blob/
|
117
|
+
Along with Bootstrap’s many [mixins](https://github.com/twbs/bootstrap-sass/blob/v3.4.1/assets/stylesheets/bootstrap/_mixins.scss) and [variables](https://github.com/twbs/bootstrap-sass/blob/v3.4.1/assets/stylesheets/bootstrap/_variables.scss), the admin gem comes with [some of its own](app/assets/stylesheets/govuk_admin_template/_theme.scss).
|
118
118
|
|
119
119
|
Class | Purpose
|
120
120
|
------ |--------
|
data/JAVASCRIPT.md
CHANGED
@@ -39,7 +39,7 @@ The simplest of modules looks like this:
|
|
39
39
|
|
40
40
|
## Writing modules
|
41
41
|
|
42
|
-
Whilst this isn’t prescriptive, it helps if modules look and behave in a similar manner. Modules should live within your app’s `app
|
42
|
+
Whilst this isn’t prescriptive, it helps if modules look and behave in a similar manner. Modules should live within your app’s `app/assets/javascripts/modules` directory.
|
43
43
|
|
44
44
|
### Use `js-` prefixed classes for interaction hooks
|
45
45
|
|
data/README.md
CHANGED
@@ -4,7 +4,7 @@
|
|
4
4
|
|
5
5
|
---
|
6
6
|
|
7
|
-
Styles, scripts and templates wrapped up in a gem for getting up and running with [Bootstrap](
|
7
|
+
Styles, scripts and templates wrapped up in a gem for getting up and running with [Bootstrap 3.4](https://getbootstrap.com/docs/3.4/) based backend admin apps.
|
8
8
|
|
9
9
|
This gem provides (via a Rails engine):
|
10
10
|
* jQuery
|
@@ -35,10 +35,10 @@ Firstly, include the gem in your Gemfile, pinned to the appropriate version and
|
|
35
35
|
|
36
36
|
```ruby
|
37
37
|
# Gemfile
|
38
|
-
gem 'govuk_admin_template', '~>
|
38
|
+
gem 'govuk_admin_template', '~> 6.8'
|
39
39
|
```
|
40
40
|
|
41
|
-
At the top of `application.scss` include the styles (this provides all the mixins and variables from the gem as well as from bootstrap — [bootstrap mixins](https://github.com/twbs/bootstrap-sass/blob/
|
41
|
+
At the top of `application.scss` include the styles (this provides all the mixins and variables from the gem as well as from bootstrap — [bootstrap mixins](https://github.com/twbs/bootstrap-sass/blob/v3.4.1/assets/stylesheets/bootstrap/_mixins.scss)):
|
42
42
|
```css
|
43
43
|
/* application.scss */
|
44
44
|
@import 'govuk_admin_template';
|
@@ -71,11 +71,13 @@ You will also need to include your styles and javascripts:
|
|
71
71
|
Note that `jquery` and `jquery_ujs` are already imported by `govuk_admin_template`,
|
72
72
|
so you should remove them from your `app/assets/javascripts/application.js`. This may
|
73
73
|
cause your jasmine tests to fail, so you'll need to include `assets/govuk-admin-template.js`
|
74
|
-
in your `spec/
|
74
|
+
in your `spec/support/jasmine-browser.json` like this:
|
75
75
|
|
76
|
-
```
|
77
|
-
|
78
|
-
|
76
|
+
```json
|
77
|
+
"srcFiles": [
|
78
|
+
"govuk-admin-template-*.js",
|
79
|
+
"application-*.js"
|
80
|
+
]
|
79
81
|
```
|
80
82
|
|
81
83
|
It is recommended that the style guide is also made available within your app at the route `/style-guide`. Add this to your `config/routes.rb` file:
|
@@ -87,7 +89,7 @@ if Rails.env.development?
|
|
87
89
|
end
|
88
90
|
```
|
89
91
|
|
90
|
-
The gem source includes a [dummy app](spec/dummy) configured to behave like an app using the gem. If you have the gem checked out it can be run from the `spec
|
92
|
+
The gem source includes a [dummy app](spec/dummy) configured to behave like an app using the gem. If you have the gem checked out it can be run from the `spec/dummy` directory using `rails s`.
|
91
93
|
|
92
94
|
For Javascript usage, available modules and writing modules, see the [Javascript guide](JAVASCRIPT.md).
|
93
95
|
|
@@ -118,7 +120,7 @@ To use this configuration:
|
|
118
120
|
0. Add an initializer in `config/initializers/simple_form.rb` containing the
|
119
121
|
following:
|
120
122
|
|
121
|
-
```
|
123
|
+
```ruby
|
122
124
|
SimpleForm.setup do |config|
|
123
125
|
GovukAdminTemplate.setup_simple_form(config)
|
124
126
|
end
|
@@ -130,7 +132,7 @@ specific customisations are required.
|
|
130
132
|
|
131
133
|
### Content blocks
|
132
134
|
|
133
|
-
The gem [uses nested layouts](
|
135
|
+
The gem [uses nested layouts](https://guides.rubyonrails.org/layouts_and_rendering.html#using-nested-layouts) for customisation.
|
134
136
|
|
135
137
|
`content_for` | Description
|
136
138
|
--------------- | -------------
|
@@ -164,19 +166,19 @@ The [gem includes](lib/govuk_admin_template/engine.rb) date and time formats whi
|
|
164
166
|
|
165
167
|
```ruby
|
166
168
|
# 1 January 2013
|
167
|
-
date.
|
169
|
+
date.to_fs(:govuk_date)
|
168
170
|
|
169
171
|
# 1:15pm, 1 January 2013
|
170
|
-
time.
|
172
|
+
time.to_fs(:govuk_date)
|
171
173
|
|
172
174
|
# 1 Jan 2013
|
173
|
-
date.
|
175
|
+
date.to_fs(:govuk_date_short)
|
174
176
|
|
175
177
|
# 1:15pm, 1 Jan 2013
|
176
|
-
time.
|
178
|
+
time.to_fs(:govuk_date_short)
|
177
179
|
|
178
180
|
# 1:15pm
|
179
|
-
time.
|
181
|
+
time.to_fs(:govuk_time)
|
180
182
|
```
|
181
183
|
|
182
184
|
### Environment indicators
|
@@ -225,7 +227,7 @@ We support `:success`, `:info`, `:warning` and `:danger`:
|
|
225
227
|
|
226
228
|
![Flash types](docs/flash-types.png)
|
227
229
|
|
228
|
-
|
230
|
+
You can register your types to allow them to be used as arguments
|
229
231
|
to `redirect_to`.
|
230
232
|
|
231
233
|
```ruby
|
@@ -241,13 +243,15 @@ redirect_to :back, danger: "This didn't work."
|
|
241
243
|
|
242
244
|
## Development
|
243
245
|
|
244
|
-
Clone the repository
|
246
|
+
1. Clone the repository
|
247
|
+
2. Run `bundle install`
|
248
|
+
3. Run `yarn install`
|
245
249
|
|
246
250
|
The source files are in the [app](app) directory. Unlike other GOVUK frontend gems, there is no compile step. The app directory is included in the gem and hooked in as a Rails engine.
|
247
251
|
|
248
252
|
While developing it may be helpful to see how the gem will render. The dummy app at [spec/dummy](spec/dummy) is configured to act like an application using the gem and can be started from that directory using `rails s`. Changes will show immediately. The tests also run against this app.
|
249
253
|
|
250
|
-
The dummy app’s rake tasks have been loaded into the gem’s task list under the namespace `
|
254
|
+
The dummy app’s rake tasks have been loaded into the gem’s task list under the namespace `app` for convenience – e.g. `bundle exec rake app:assets:precompile`
|
251
255
|
|
252
256
|
### Running tests
|
253
257
|
|
@@ -261,15 +265,27 @@ Layout and nested layouts are tested using RSpec and Capybara:
|
|
261
265
|
bundle exec rake spec
|
262
266
|
```
|
263
267
|
|
264
|
-
Javascript is tested using Jasmine and
|
268
|
+
Javascript is tested using Jasmine and [jasmine-browser-runner](https://jasmine.github.io/setup/browser.html). Tests can be run either in the browser or on the command line:
|
265
269
|
```sh
|
266
270
|
# browser
|
267
|
-
|
271
|
+
yarn run jasmine:browser
|
268
272
|
|
269
273
|
# command line
|
270
|
-
|
274
|
+
yarn run jasmine:ci
|
271
275
|
```
|
272
276
|
|
277
|
+
### Testing against different Rails versions
|
278
|
+
|
279
|
+
The CI pipeline is configured to test this gem against multiple versions of Rails.
|
280
|
+
|
281
|
+
Each Rails version has a corresponding Gemfile located in the [gemfiles](gemfiles/) directory. And the CI pipeline defines a [matrix of Gemfiles](https://github.com/alphagov/govuk_admin_template/blob/8f53865fa3d33f741642783f9bfcaefc201c3751/.github/workflows/ci.yml#L13) to test against.
|
282
|
+
|
283
|
+
It's also possible to run tests against multiple Rails versions locally.
|
284
|
+
|
285
|
+
1. Run `export BUNDLE_GEMFILE="gemfiles/rails_X.gemfile"` where `X` is the version to test against.
|
286
|
+
This tells Bundler which Gemfile to use.
|
287
|
+
2. Run `bundle install` and then `bundle exec rake` as usual.
|
288
|
+
|
273
289
|
## Publishing
|
274
290
|
|
275
291
|
Version bumps will automatically update RubyGems.org.
|
@@ -6,10 +6,10 @@
|
|
6
6
|
</h1>
|
7
7
|
</div>
|
8
8
|
|
9
|
-
<p class="lead">Admin app UIs are powered by <a href="
|
9
|
+
<p class="lead">Admin app UIs are powered by <a href="https://getbootstrap.com/docs/3.4/">Bootstrap 3.4</a>, using <a href="https://github.com/twbs/bootstrap-sass/tree/v3.4.1">Bootstrap SASS</a> v3.4.1 (<a href="https://github.com/twbs/bootstrap-sass/blob/v3.4.1/assets/stylesheets/bootstrap/_mixins.scss">mixins</a>), but maintaining Bootstrap 2 button styles. This guide documents how we use Bootstrap, where the apps have diverged from default styles and any custom styles needed to fill in the gaps.</p>
|
10
10
|
|
11
11
|
<h2 id="grid">Grid</h2>
|
12
|
-
<p class="lead">Apps use the <a href="
|
12
|
+
<p class="lead">Apps use the <a href="https://getbootstrap.com/docs/3.4/css/#grid">default bootstrap</a> <strong>12 column scaleable responsive grid</strong>.</p>
|
13
13
|
<div class="row add-bottom-margin">
|
14
14
|
<div class="grid-example col-md-2">col-md-2</div>
|
15
15
|
<div class="grid-example col-md-4">col-md-4</div>
|
@@ -26,7 +26,7 @@
|
|
26
26
|
<div class="row">
|
27
27
|
<div class="col-md-6 lead">
|
28
28
|
<p>
|
29
|
-
Based on the <a href="
|
29
|
+
Based on the <a href="https://govuk-elements.herokuapp.com/form-elements/#form-toggle-content">GOV.UK elements pattern</a>, ticking a checkbox or selecting a radio element can toggle the display of further content or fields.
|
30
30
|
</p>
|
31
31
|
<pre class="add-top-margin"><div class="checkbox" data-module="toggle-checkbox">
|
32
32
|
<label>
|
@@ -73,7 +73,7 @@
|
|
73
73
|
<h3 id="forms-input-widths">Input widths</h3>
|
74
74
|
<div class="row">
|
75
75
|
<div class="col-md-6 lead">
|
76
|
-
<p>Bootstrap 3 inputs always <a href="
|
76
|
+
<p>Bootstrap 3 inputs always <a href="https://getbootstrap.com/docs/3.4/css/#forms">extend to the size of their container</a>. The recommendation from Bootstrap is to wrap form elements with grid classes. Sometimes this isn’t suitable, for instance if a page isn’t using a grid.</p>
|
77
77
|
<p>The gem includes classes to restrict the width of inputs based on column sizes: <code>input-md-x</code> (1 — 11)</p>
|
78
78
|
</div>
|
79
79
|
<div class="col-md-6">
|
@@ -192,13 +192,13 @@
|
|
192
192
|
<blockquote>
|
193
193
|
<dl class="remove-bottom-margin">
|
194
194
|
<dt class="add-label-margin"><code>:govuk_date</code></dt>
|
195
|
-
<dd><%= halloween.
|
196
|
-
<%= halloween.to_time.
|
195
|
+
<dd><%= halloween.to_formatted_s(:govuk_date) %><br />
|
196
|
+
<%= halloween.to_time.to_formatted_s(:govuk_date) %></dd>
|
197
197
|
<dt class="add-top-margin add-label-margin"><code>:govuk_date_short</code></dt>
|
198
|
-
<dd><%= halloween.
|
199
|
-
<%= halloween.to_time.
|
198
|
+
<dd><%= halloween.to_formatted_s(:govuk_date_short) %><br />
|
199
|
+
<%= halloween.to_time.to_formatted_s(:govuk_date_short) %></dd>
|
200
200
|
<dt class="add-top-margin add-label-margin"><code>:govuk_time</code></dt>
|
201
|
-
<dd><%= halloween.to_time.
|
201
|
+
<dd><%= halloween.to_time.to_formatted_s(:govuk_time) %></dd>
|
202
202
|
</dl>
|
203
203
|
</blockquote>
|
204
204
|
</section>
|
@@ -261,7 +261,7 @@
|
|
261
261
|
<h3 id="tables-filterable-tables">Filterable tables</h3>
|
262
262
|
<div class="row">
|
263
263
|
<div class="col-md-6 lead">
|
264
|
-
<p>Using the <a href="https://github.com/alphagov/govuk_admin_template/blob/
|
264
|
+
<p>Using the <a href="https://github.com/alphagov/govuk_admin_template/blob/main/app/assets/javascripts/govuk-admin-template/modules/filterable_table.js">filterable-table module</a> and the <a href="https://github.com/alphagov/govuk_admin_template/blob/main/app/views/govuk_admin_template/_table_filter.html.erb">table_filter partial</a> any table can be filtered. The module performs a simple match against the content of each row, if there’s no match the row is hidden.</p>
|
265
265
|
<p>If the class <code>js-open-on-submit</code> is added to a link within a row, then the first link visible with that class will be opened when the user hits <code>ENTER</code>.</p>
|
266
266
|
<pre class="add-top-margin"><table class="table table-bordered" data-module="filterable-table">
|
267
267
|
<thead>
|
@@ -403,7 +403,7 @@
|
|
403
403
|
<h2 id="nav-lists">Nav lists</h2>
|
404
404
|
<div class="row">
|
405
405
|
<p class="col-md-4 lead">
|
406
|
-
<a href="
|
406
|
+
<a href="https://stackoverflow.com/questions/18281636/what-replaces-nav-lists-in-bootstrap-3">Bootstrap 3 removed</a> the <code>nav-list</code> classes and <a href="https://getbootstrap.com/2.3.2/components.html#navs">design pattern</a>. For backwards compatibility these styles have been put back, but it’s advised to avoid this pattern.
|
407
407
|
</p>
|
408
408
|
<div class="col-md-4">
|
409
409
|
<div class="well sidebar-nav">
|
@@ -101,7 +101,7 @@
|
|
101
101
|
</main>
|
102
102
|
<footer class="page-footer">
|
103
103
|
<%= yield :footer_top %>
|
104
|
-
<a class="inherit" href="
|
104
|
+
<a class="inherit" href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">© Crown Copyright</a>
|
105
105
|
<% if content_for?(:footer_version) %>
|
106
106
|
<span class="pull-right">Version: <%= yield :footer_version %></span>
|
107
107
|
<% end %>
|
metadata
CHANGED
@@ -1,71 +1,71 @@
|
|
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.9.2
|
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: 2022-
|
11
|
+
date: 2022-04-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bootstrap-sass
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- -
|
17
|
+
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 3.4
|
19
|
+
version: '3.4'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- -
|
24
|
+
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 3.4
|
26
|
+
version: '3.4'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: jquery-rails
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 4.3
|
33
|
+
version: '4.3'
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 4.3
|
40
|
+
version: '4.3'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: plek
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
45
|
- - ">="
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: 2.1
|
47
|
+
version: '2.1'
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - ">="
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 2.1
|
54
|
+
version: '2.1'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: rails
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
59
|
- - ">="
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version:
|
61
|
+
version: '6'
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - ">="
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version:
|
68
|
+
version: '6'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: capybara
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
@@ -80,90 +80,48 @@ dependencies:
|
|
80
80
|
- - "~>"
|
81
81
|
- !ruby/object:Gem::Version
|
82
82
|
version: '3'
|
83
|
-
- !ruby/object:Gem::Dependency
|
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
|
99
|
-
requirement: !ruby/object:Gem::Requirement
|
100
|
-
requirements:
|
101
|
-
- - "~>"
|
102
|
-
- !ruby/object:Gem::Version
|
103
|
-
version: '3'
|
104
|
-
type: :development
|
105
|
-
prerelease: false
|
106
|
-
version_requirements: !ruby/object:Gem::Requirement
|
107
|
-
requirements:
|
108
|
-
- - "~>"
|
109
|
-
- !ruby/object:Gem::Version
|
110
|
-
version: '3'
|
111
|
-
- !ruby/object:Gem::Dependency
|
112
|
-
name: jasmine_selenium_runner
|
113
|
-
requirement: !ruby/object:Gem::Requirement
|
114
|
-
requirements:
|
115
|
-
- - "~>"
|
116
|
-
- !ruby/object:Gem::Version
|
117
|
-
version: '3'
|
118
|
-
type: :development
|
119
|
-
prerelease: false
|
120
|
-
version_requirements: !ruby/object:Gem::Requirement
|
121
|
-
requirements:
|
122
|
-
- - "~>"
|
123
|
-
- !ruby/object:Gem::Version
|
124
|
-
version: '3'
|
125
83
|
- !ruby/object:Gem::Dependency
|
126
84
|
name: rspec-rails
|
127
85
|
requirement: !ruby/object:Gem::Requirement
|
128
86
|
requirements:
|
129
87
|
- - "~>"
|
130
88
|
- !ruby/object:Gem::Version
|
131
|
-
version: '
|
89
|
+
version: '5'
|
132
90
|
type: :development
|
133
91
|
prerelease: false
|
134
92
|
version_requirements: !ruby/object:Gem::Requirement
|
135
93
|
requirements:
|
136
94
|
- - "~>"
|
137
95
|
- !ruby/object:Gem::Version
|
138
|
-
version: '
|
96
|
+
version: '5'
|
139
97
|
- !ruby/object:Gem::Dependency
|
140
98
|
name: rubocop-govuk
|
141
99
|
requirement: !ruby/object:Gem::Requirement
|
142
100
|
requirements:
|
143
|
-
- -
|
101
|
+
- - '='
|
144
102
|
- !ruby/object:Gem::Version
|
145
|
-
version:
|
103
|
+
version: 4.3.0
|
146
104
|
type: :development
|
147
105
|
prerelease: false
|
148
106
|
version_requirements: !ruby/object:Gem::Requirement
|
149
107
|
requirements:
|
150
|
-
- -
|
108
|
+
- - '='
|
151
109
|
- !ruby/object:Gem::Version
|
152
|
-
version:
|
110
|
+
version: 4.3.0
|
153
111
|
- !ruby/object:Gem::Dependency
|
154
|
-
name:
|
112
|
+
name: sassc-rails
|
155
113
|
requirement: !ruby/object:Gem::Requirement
|
156
114
|
requirements:
|
157
115
|
- - "~>"
|
158
116
|
- !ruby/object:Gem::Version
|
159
|
-
version: '
|
117
|
+
version: '2'
|
160
118
|
type: :development
|
161
119
|
prerelease: false
|
162
120
|
version_requirements: !ruby/object:Gem::Requirement
|
163
121
|
requirements:
|
164
122
|
- - "~>"
|
165
123
|
- !ruby/object:Gem::Version
|
166
|
-
version: '
|
124
|
+
version: '2'
|
167
125
|
description: Styles, scripts and templates for GOV.UK admin applications
|
168
126
|
email:
|
169
127
|
- govuk-dev@digital.cabinet-office.gov.uk
|
@@ -226,8 +184,6 @@ files:
|
|
226
184
|
- lib/govuk_admin_template/simple_form.rb
|
227
185
|
- lib/govuk_admin_template/version.rb
|
228
186
|
- lib/govuk_admin_template/view_helpers.rb
|
229
|
-
- lib/tasks/lint.rake
|
230
|
-
- lib/tasks/sass/check.rake
|
231
187
|
homepage: https://github.com/alphagov/govuk_admin_template
|
232
188
|
licenses: []
|
233
189
|
metadata: {}
|
@@ -246,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
246
202
|
- !ruby/object:Gem::Version
|
247
203
|
version: '0'
|
248
204
|
requirements: []
|
249
|
-
rubygems_version: 3.
|
205
|
+
rubygems_version: 3.3.11
|
250
206
|
signing_key:
|
251
207
|
specification_version: 4
|
252
208
|
summary: Styles, scripts and templates for GOV.UK admin applications
|
data/lib/tasks/lint.rake
DELETED
data/lib/tasks/sass/check.rake
DELETED
@@ -1,52 +0,0 @@
|
|
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
|