defra_ruby_template 3.13.0 → 3.15.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/dependabot.yml +14 -0
- data/.github/workflows/ci.yml +27 -0
- data/.rubocop.yml +3 -0
- data/.ruby-version +1 -0
- data/Gemfile +2 -0
- data/Gemfile.lock +24 -1
- data/README.md +5 -1
- data/Rakefile +22 -22
- data/app/views/layouts/defra_ruby_template.html.erb +17 -2
- data/defra_ruby_template.gemspec +14 -3
- data/lib/defra_ruby_template/version.rb +3 -1
- data/lib/defra_ruby_template.rb +4 -2
- data/node_modules/.package-lock.json +16 -0
- data/node_modules/govuk-frontend/govuk/assets/images/favicon.ico +0 -0
- data/node_modules/govuk-frontend/govuk/assets/images/govuk-apple-touch-icon-152x152.png +0 -0
- data/node_modules/govuk-frontend/govuk/assets/images/govuk-apple-touch-icon-167x167.png +0 -0
- data/node_modules/govuk-frontend/govuk/assets/images/govuk-apple-touch-icon-180x180.png +0 -0
- data/node_modules/govuk-frontend/govuk/assets/images/govuk-apple-touch-icon.png +0 -0
- data/node_modules/govuk-frontend/govuk/assets/images/govuk-logotype-tudor-crown.png +0 -0
- data/node_modules/govuk-frontend/govuk/assets/images/govuk-mask-icon.svg +1 -7
- data/node_modules/govuk-frontend/govuk/assets/images/govuk-opengraph-image.png +0 -0
- data/node_modules/govuk-frontend/govuk/components/accordion/macro-options.json +2 -2
- data/node_modules/govuk-frontend/govuk/components/back-link/macro-options.json +3 -3
- data/node_modules/govuk-frontend/govuk/components/button/_index.scss +3 -4
- data/node_modules/govuk-frontend/govuk/components/button/fixtures.json +9 -0
- data/node_modules/govuk-frontend/govuk/components/character-count/macro-options.json +6 -6
- data/node_modules/govuk-frontend/govuk/components/checkboxes/_index.scss +14 -0
- data/node_modules/govuk-frontend/govuk/components/checkboxes/macro-options.json +8 -8
- data/node_modules/govuk-frontend/govuk/components/cookie-banner/macro-options.json +1 -1
- data/node_modules/govuk-frontend/govuk/components/date-input/macro-options.json +5 -5
- data/node_modules/govuk-frontend/govuk/components/details/_index.scss +2 -1
- data/node_modules/govuk-frontend/govuk/components/details/macro-options.json +2 -2
- data/node_modules/govuk-frontend/govuk/components/error-message/macro-options.json +3 -3
- data/node_modules/govuk-frontend/govuk/components/fieldset/macro-options.json +1 -1
- data/node_modules/govuk-frontend/govuk/components/file-upload/_index.scss +1 -0
- data/node_modules/govuk-frontend/govuk/components/file-upload/macro-options.json +4 -4
- data/node_modules/govuk-frontend/govuk/components/footer/_index.scss +3 -0
- data/node_modules/govuk-frontend/govuk/components/footer/macro-options.json +2 -2
- data/node_modules/govuk-frontend/govuk/components/header/_index.scss +16 -0
- data/node_modules/govuk-frontend/govuk/components/header/fixtures.json +26 -18
- data/node_modules/govuk-frontend/govuk/components/header/macro-options.json +12 -6
- data/node_modules/govuk-frontend/govuk/components/header/template.njk +56 -31
- data/node_modules/govuk-frontend/govuk/components/hint/macro-options.json +1 -1
- data/node_modules/govuk-frontend/govuk/components/input/macro-options.json +7 -7
- data/node_modules/govuk-frontend/govuk/components/inset-text/macro-options.json +1 -1
- data/node_modules/govuk-frontend/govuk/components/label/macro-options.json +1 -1
- data/node_modules/govuk-frontend/govuk/components/panel/_index.scss +13 -1
- data/node_modules/govuk-frontend/govuk/components/panel/macro-options.json +1 -1
- data/node_modules/govuk-frontend/govuk/components/radios/_index.scss +14 -0
- data/node_modules/govuk-frontend/govuk/components/radios/macro-options.json +8 -8
- data/node_modules/govuk-frontend/govuk/components/select/macro-options.json +3 -3
- data/node_modules/govuk-frontend/govuk/components/summary-list/fixtures.json +2 -2
- data/node_modules/govuk-frontend/govuk/components/summary-list/macro-options.json +7 -7
- data/node_modules/govuk-frontend/govuk/components/tabs/macro-options.json +4 -4
- data/node_modules/govuk-frontend/govuk/components/textarea/macro-options.json +5 -5
- data/node_modules/govuk-frontend/govuk/helpers/_colour.scss +2 -2
- data/node_modules/govuk-frontend/govuk/helpers/_spacing.scss +22 -4
- data/node_modules/govuk-frontend/govuk/overrides/_all.scss +1 -0
- data/node_modules/govuk-frontend/govuk/overrides/_text-align.scss +20 -0
- data/node_modules/govuk-frontend/package.json +14 -41
- data/package-lock.json +17 -6
- data/package.json +1 -1
- data/vendor/assets/images/favicon.ico +0 -0
- data/vendor/assets/images/govuk-apple-touch-icon-152x152.png +0 -0
- data/vendor/assets/images/govuk-apple-touch-icon-167x167.png +0 -0
- data/vendor/assets/images/govuk-apple-touch-icon-180x180.png +0 -0
- data/vendor/assets/images/govuk-apple-touch-icon.png +0 -0
- data/vendor/assets/images/govuk-logotype-tudor-crown.png +0 -0
- data/vendor/assets/images/govuk-mask-icon.svg +1 -7
- data/vendor/assets/images/govuk-opengraph-image.png +0 -0
- metadata +29 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 79e165ab038cc66610fd6ad2bf1519be5dc10ca162b5b64b41081d939c41f23b
|
4
|
+
data.tar.gz: f9a60e6ec4a540d683c229c0422b4832b57d993a1f11093715eba049ffae6d01
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 68873f5a0c0f543b6a27f68aed3f6afe687325770fb421237aa560123c3a598f8dabd5f9aa59369286312fd33f43425505277a6233523af630d8f8e3d6c62767
|
7
|
+
data.tar.gz: e7b94f1d8f23dbb063ab4c71f50ffbdfde270507382dd8d6be326c91cb13f279f3bf77435957a4cbc8e9f7682aa10b10b952798ce0947bacb85381f0d2107249
|
@@ -0,0 +1,14 @@
|
|
1
|
+
version: 2
|
2
|
+
updates:
|
3
|
+
- package-ecosystem: bundler
|
4
|
+
directory: "/"
|
5
|
+
schedule:
|
6
|
+
interval: daily
|
7
|
+
open-pull-requests-limit: 10
|
8
|
+
versioning-strategy: lockfile-only
|
9
|
+
- package-ecosystem: npm
|
10
|
+
directory: "/"
|
11
|
+
schedule:
|
12
|
+
interval: daily
|
13
|
+
open-pull-requests-limit: 10
|
14
|
+
versioning-strategy: lockfile-only
|
@@ -0,0 +1,27 @@
|
|
1
|
+
name: CI
|
2
|
+
|
3
|
+
on: push
|
4
|
+
|
5
|
+
jobs:
|
6
|
+
build:
|
7
|
+
# You must use a Linux environment when using service containers or container jobs
|
8
|
+
runs-on: ubuntu-latest
|
9
|
+
|
10
|
+
steps:
|
11
|
+
# Downloads a copy of the code in your repository before running CI tests
|
12
|
+
- name: Checkout repository
|
13
|
+
uses: actions/checkout@v2
|
14
|
+
with:
|
15
|
+
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of sonarcloud analysis
|
16
|
+
|
17
|
+
# We don't have to specify the ruby version, or grab it from .ruby-verion. This action supports reading the
|
18
|
+
# version from .ruby-verion itself
|
19
|
+
- name: Install Ruby
|
20
|
+
uses: ruby/setup-ruby@v1
|
21
|
+
with:
|
22
|
+
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
|
23
|
+
|
24
|
+
# Run linting first. No point running the tests if there is a linting issue
|
25
|
+
- name: Run lint check
|
26
|
+
run: |
|
27
|
+
bundle exec rubocop --format progress --format json --out rubocop-result.json
|
data/.rubocop.yml
ADDED
data/.ruby-version
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
ruby-2.7.1
|
data/Gemfile
CHANGED
data/Gemfile.lock
CHANGED
@@ -1,18 +1,41 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
defra_ruby_template (3.
|
4
|
+
defra_ruby_template (3.15.1)
|
5
5
|
|
6
6
|
GEM
|
7
7
|
remote: https://rubygems.org/
|
8
8
|
specs:
|
9
|
+
ast (2.4.2)
|
10
|
+
defra_ruby_style (0.2.2)
|
11
|
+
rubocop (~> 0.82)
|
12
|
+
parallel (1.20.1)
|
13
|
+
parser (3.0.2.0)
|
14
|
+
ast (~> 2.4.1)
|
15
|
+
rainbow (3.0.0)
|
9
16
|
rake (12.3.3)
|
17
|
+
regexp_parser (2.1.1)
|
18
|
+
rexml (3.2.5)
|
19
|
+
rubocop (0.93.1)
|
20
|
+
parallel (~> 1.10)
|
21
|
+
parser (>= 2.7.1.5)
|
22
|
+
rainbow (>= 2.2.2, < 4.0)
|
23
|
+
regexp_parser (>= 1.8)
|
24
|
+
rexml
|
25
|
+
rubocop-ast (>= 0.6.0)
|
26
|
+
ruby-progressbar (~> 1.7)
|
27
|
+
unicode-display_width (>= 1.4.0, < 2.0)
|
28
|
+
rubocop-ast (1.4.1)
|
29
|
+
parser (>= 2.7.1.5)
|
30
|
+
ruby-progressbar (1.11.0)
|
31
|
+
unicode-display_width (1.7.0)
|
10
32
|
|
11
33
|
PLATFORMS
|
12
34
|
ruby
|
13
35
|
x86_64-linux
|
14
36
|
|
15
37
|
DEPENDENCIES
|
38
|
+
defra_ruby_style
|
16
39
|
defra_ruby_template!
|
17
40
|
rake (~> 12.0)
|
18
41
|
|
data/README.md
CHANGED
@@ -1,5 +1,10 @@
|
|
1
1
|
# Defra Ruby Template
|
2
2
|
|
3
|
+
![Build Status](https://github.com/DEFRA/defra-ruby-template/workflows/CI/badge.svg?branch=main)
|
4
|
+
[![security](https://hakiri.io/github/DEFRA/defra-ruby-template/main.svg)](https://hakiri.io/github/DEFRA/defra-ruby-template/main)
|
5
|
+
[![Gem Version](https://badge.fury.io/rb/defra_ruby_template.svg)](https://badge.fury.io/rb/defra_ruby_address)
|
6
|
+
[![Licence](https://img.shields.io/badge/Licence-OGLv3-blue.svg)](http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3)
|
7
|
+
|
3
8
|
## About
|
4
9
|
|
5
10
|
Adds a GOV.UK-ready layout template and the [govuk_frontend assets](https://github.com/alphagov/govuk-frontend) to a Rails application.
|
@@ -68,4 +73,3 @@ Then update the [`DefraRubyTemplate::Version`](https://github.com/DEFRA/defra-ru
|
|
68
73
|
## Contributing
|
69
74
|
|
70
75
|
Bug reports and pull requests are welcome on GitHub at https://github.com/DEFRA/defra-ruby-template.
|
71
|
-
|
data/Rakefile
CHANGED
@@ -1,49 +1,49 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require
|
4
|
-
require
|
3
|
+
require "bundler/gem_tasks"
|
4
|
+
require "defra_ruby_template/version"
|
5
5
|
|
6
6
|
task default: :assets
|
7
7
|
|
8
|
-
task
|
9
|
-
Rake::Task[
|
10
|
-
Rake::Task[
|
11
|
-
Rake::Task[
|
12
|
-
Rake::Task[
|
8
|
+
task "assets" do
|
9
|
+
Rake::Task["stylesheets"].execute
|
10
|
+
Rake::Task["fonts"].execute
|
11
|
+
Rake::Task["images"].execute
|
12
|
+
Rake::Task["javascripts"].execute
|
13
13
|
end
|
14
14
|
|
15
|
-
task
|
16
|
-
Rake::FileList[
|
17
|
-
target = source.sub(
|
15
|
+
task "stylesheets" do
|
16
|
+
Rake::FileList["node_modules/govuk-frontend/govuk/**/*.scss"].each do |source|
|
17
|
+
target = source.sub("node_modules/govuk-frontend/govuk", "vendor/assets/stylesheets")
|
18
18
|
mkdir_p(File.dirname(target))
|
19
19
|
copy_file source, target
|
20
20
|
end
|
21
21
|
end
|
22
22
|
|
23
|
-
task
|
23
|
+
task "fonts" do
|
24
24
|
Rake::FileList[
|
25
|
-
|
25
|
+
"node_modules/govuk-frontend/govuk/assets/fonts/*.{eot,woff,woff2,ico,svg}"
|
26
26
|
].each do |source|
|
27
|
-
target = source.sub(
|
27
|
+
target = source.sub("node_modules/govuk-frontend/govuk", "vendor")
|
28
28
|
mkdir_p(File.dirname(target))
|
29
29
|
copy_file source, target
|
30
30
|
end
|
31
|
-
|
31
|
+
end
|
32
32
|
|
33
|
-
task
|
34
|
-
|
35
|
-
|
33
|
+
task "images" do
|
34
|
+
Rake::FileList[
|
35
|
+
"node_modules/govuk-frontend/govuk/assets/images/*.{png,gif,jpg,ico,svg}"
|
36
36
|
].each do |source|
|
37
|
-
target = source.sub(
|
37
|
+
target = source.sub("node_modules/govuk-frontend/govuk", "vendor")
|
38
38
|
mkdir_p(File.dirname(target))
|
39
39
|
copy_file source, target
|
40
40
|
end
|
41
41
|
end
|
42
42
|
|
43
|
-
task
|
44
|
-
|
45
|
-
target = source.sub(
|
46
|
-
target = target.sub(
|
43
|
+
task "javascripts" do
|
44
|
+
Rake::FileList["node_modules/govuk-frontend/govuk/all.js"].each do |source|
|
45
|
+
target = source.sub("node_modules/govuk-frontend/govuk", "vendor/assets/javascripts")
|
46
|
+
target = target.sub("all.js", "defra_ruby_template.js")
|
47
47
|
mkdir_p(File.dirname(target))
|
48
48
|
copy_file source, target
|
49
49
|
end
|
@@ -32,9 +32,24 @@
|
|
32
32
|
<div class="govuk-header__logo">
|
33
33
|
<a href="https://www.gov.uk" class="govuk-header__link govuk-header__link--homepage" title="Go to the GOV.UK homepage">
|
34
34
|
<span class="govuk-header__logotype">
|
35
|
-
|
36
|
-
|
35
|
+
<!--[if gt IE 8]><!-->
|
36
|
+
<svg
|
37
|
+
aria-hidden="true"
|
38
|
+
focusable="false"
|
39
|
+
class="govuk-header__logotype-crown"
|
40
|
+
xmlns="http://www.w3.org/2000/svg"
|
41
|
+
viewBox="0 0 32 30"
|
42
|
+
height="30"
|
43
|
+
width="32"
|
44
|
+
>
|
45
|
+
<path
|
46
|
+
fill="currentColor" fill-rule="evenodd"
|
47
|
+
d="M22.6 10.4c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m-5.9 6.7c-.9.4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m10.8-3.7c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s0 2-1 2.4m3.3 4.8c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4M17 4.7l2.3 1.2V2.5l-2.3.7-.2-.2.9-3h-3.4l.9 3-.2.2c-.1.1-2.3-.7-2.3-.7v3.4L15 4.7c.1.1.1.2.2.2l-1.3 4c-.1.2-.1.4-.1.6 0 1.1.8 2 1.9 2.2h.7c1-.2 1.9-1.1 1.9-2.1 0-.2 0-.4-.1-.6l-1.3-4c-.1-.2 0-.2.1-.3m-7.6 5.7c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m-5 3c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s.1 2 1 2.4m-3.2 4.8c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m14.8 11c4.4 0 8.6.3 12.3.8 1.1-4.5 2.4-7 3.7-8.8l-2.5-.9c.2 1.3.3 1.9 0 2.7-.4-.4-.8-1.1-1.1-2.3l-1.2 4c.7-.5 1.3-.8 2-.9-1.1 2.5-2.6 3.1-3.5 3-1.1-.2-1.7-1.2-1.5-2.1.3-1.2 1.5-1.5 2.1-.1 1.1-2.3-.8-3-2-2.3 1.9-1.9 2.1-3.5.6-5.6-2.1 1.6-2.1 3.2-1.2 5.5-1.2-1.4-3.2-.6-2.5 1.6.9-1.4 2.1-.5 1.9.8-.2 1.1-1.7 2.1-3.5 1.9-2.7-.2-2.9-2.1-2.9-3.6.7-.1 1.9.5 2.9 1.9l.4-4.3c-1.1 1.1-2.1 1.4-3.2 1.4.4-1.2 2.1-3 2.1-3h-5.4s1.7 1.9 2.1 3c-1.1 0-2.1-.2-3.2-1.4l.4 4.3c1-1.4 2.2-2 2.9-1.9-.1 1.5-.2 3.4-2.9 3.6-1.9.2-3.4-.8-3.5-1.9-.2-1.3 1-2.2 1.9-.8.7-2.3-1.2-3-2.5-1.6.9-2.2.9-3.9-1.2-5.5-1.5 2-1.3 3.7.6 5.6-1.2-.7-3.1 0-2 2.3.6-1.4 1.8-1.1 2.1.1.2.9-.3 1.9-1.5 2.1-.9.2-2.4-.5-3.5-3 .6 0 1.2.3 2 .9l-1.2-4c-.3 1.1-.7 1.9-1.1 2.3-.3-.8-.2-1.4 0-2.7l-2.9.9C1.3 23 2.6 25.5 3.7 30c3.7-.5 7.9-.8 12.3-.8"></path>
|
37
48
|
</svg>
|
49
|
+
<!--<![endif]-->
|
50
|
+
<!--[if IE 8]>
|
51
|
+
<img src="/assets/images/govuk-logotype-tudor-crown.png" class="govuk-header__logotype-crown-fallback-image" width="32" height="30" alt="">
|
52
|
+
<![endif]-->
|
38
53
|
<span class="govuk-header__logotype-text">
|
39
54
|
GOV.UK
|
40
55
|
</span>
|
data/defra_ruby_template.gemspec
CHANGED
@@ -1,4 +1,10 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# rubocop:disable Gemspec/RequiredRubyVersion
|
4
|
+
# rubocop:disable Layout/ExtraSpacing
|
5
|
+
# rubocop:disable Layout/SpaceAroundOperators
|
6
|
+
|
7
|
+
require_relative "lib/defra_ruby_template/version"
|
2
8
|
|
3
9
|
Gem::Specification.new do |spec|
|
4
10
|
spec.name = "defra_ruby_template"
|
@@ -12,13 +18,18 @@ Gem::Specification.new do |spec|
|
|
12
18
|
spec.license = "The Open Government Licence (OGL) Version 3"
|
13
19
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
|
14
20
|
|
15
|
-
|
16
21
|
# Specify which files should be added to the gem when it is released.
|
17
22
|
# The `git ls-files -z` loads the files in the RubyGem that have been added into git.
|
18
|
-
spec.files = Dir.chdir(File.expand_path(
|
23
|
+
spec.files = Dir.chdir(File.expand_path(__dir__)) do
|
19
24
|
`git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
|
20
25
|
end
|
21
26
|
spec.bindir = "exe"
|
22
27
|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
23
28
|
spec.require_paths = ["lib"]
|
29
|
+
|
30
|
+
spec.add_development_dependency "defra_ruby_style"
|
24
31
|
end
|
32
|
+
|
33
|
+
# rubocop:enable Gemspec/RequiredRubyVersion
|
34
|
+
# rubocop:enable Layout/ExtraSpacing
|
35
|
+
# rubocop:enable Layout/SpaceAroundOperators
|
data/lib/defra_ruby_template.rb
CHANGED
@@ -1,9 +1,11 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "defra_ruby_template/version"
|
2
4
|
|
3
5
|
module DefraRubyTemplate
|
4
6
|
module Rails
|
5
7
|
class Engine < ::Rails::Engine
|
6
|
-
initializer
|
8
|
+
initializer "defra_ruby_template.assets.precompile" do |app|
|
7
9
|
app.config.assets.precompile <<
|
8
10
|
[
|
9
11
|
"favicon.ico",
|
@@ -15,7 +17,7 @@ module DefraRubyTemplate
|
|
15
17
|
"govuk-crest.png",
|
16
18
|
"govuk-logotype-crown.png",
|
17
19
|
"govuk-mask-icon.svg",
|
18
|
-
"govuk-opengraph-image.png"
|
20
|
+
"govuk-opengraph-image.png"
|
19
21
|
]
|
20
22
|
end
|
21
23
|
end
|
@@ -0,0 +1,16 @@
|
|
1
|
+
{
|
2
|
+
"name": "defra-ruby-template",
|
3
|
+
"version": "1.0.0",
|
4
|
+
"lockfileVersion": 3,
|
5
|
+
"requires": true,
|
6
|
+
"packages": {
|
7
|
+
"node_modules/govuk-frontend": {
|
8
|
+
"version": "3.15.0",
|
9
|
+
"resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.15.0.tgz",
|
10
|
+
"integrity": "sha512-kInDei8hrkMcrW7yC2EwhbSNBOBBPTdLxIDAye2G7KNrD9cyvNAfd0KchrfP/nWBOzu67ANoz2rtoRDLWiBN2w==",
|
11
|
+
"engines": {
|
12
|
+
"node": ">= 4.2.0"
|
13
|
+
}
|
14
|
+
}
|
15
|
+
}
|
16
|
+
}
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
@@ -1,7 +1 @@
|
|
1
|
-
<svg xmlns="http://www.w3.org/2000/svg"
|
2
|
-
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
3
|
-
<g fill="#000000">
|
4
|
-
<path d="M25 30.2C28.5 31.7 32.7 30 34.1 26.5 35.6 22.9 33.9 18.7 30.2 17.3 26.6 15.9 22.6 17.6 21.1 21.2 19.7 24.7 21.4 28.7 25 30.2L25 30.2ZM9 39.5C12.6 41 16.8 39.3 18.2 35.8 19.7 32.2 18 28 14.3 26.7 10.7 25.2 6.7 26.9 5.2 30.5 3.8 34 5.5 38 9 39.5L9 39.5ZM4.4 57.2C7.9 58.7 12.1 57 13.5 53.4 15 49.8 13.3 45.7 9.6 44.3 6.1 42.8 2 44.6 0.5 48.1 -0.9 51.6 0.8 55.7 4.4 57.2L4.4 57.2ZM42.7 35.8C46.2 37.3 50.4 35.6 51.8 32 53.3 28.4 51.6 24.3 47.9 22.9 44.3 21.4 40.3 23.2 38.8 26.7 37.5 30.3 39.2 34.4 42.7 35.8L42.7 35.8ZM107.1 30.2C103.5 31.7 99.3 30 98 26.5 96.5 22.9 98.2 18.7 101.8 17.3 105.4 15.9 109.5 17.6 111 21.2 112.3 24.7 110.6 28.7 107.1 30.2L107.1 30.2ZM123 39.5C119.4 41 115.3 39.3 113.9 35.8 112.4 32.2 114.1 28 117.6 26.7 121.2 25.2 125.3 26.9 126.8 30.5 128.3 34 126.5 38 123 39.5L123 39.5ZM127.7 57.2C124.1 58.7 119.9 57 118.5 53.4 117 49.8 118.7 45.7 122.4 44.3 126 42.8 130.1 44.6 131.6 48.1 132.9 51.6 131.2 55.7 127.7 57.2L127.7 57.2ZM89.3 35.8C85.7 37.3 81.5 35.6 80.1 32 78.7 28.4 80.3 24.3 84 22.9 87.6 21.4 91.7 23.2 93.2 26.7 94.6 30.3 92.9 34.4 89.3 35.8L89.3 35.8ZM69.7 17.7L69.7 17.7 78.6 22.4 78.6 9.3 69.7 12.1 69.7 12.1C69.5 11.8 69.2 11.5 68.8 11.2L68.8 11.2 72.4 0 66 0 59.6 0 63.1 11.2 63.1 11.2C62.8 11.5 62.5 11.7 62.2 12.1L62.2 12.1 53.4 9.3 53.4 22.4 62.2 17.7 62.2 17.7C62.5 18 62.8 18.4 63.1 18.6L58.1 34C58.1 34 58.1 34 58.1 34.1L58.1 34.1 58.1 34.1C57.9 34.9 57.7 35.7 57.7 36.5 57.7 40.6 60.8 44 64.7 44.6L64.9 44.6C65.2 44.6 65.6 44.7 65.9 44.7 66.3 44.7 66.6 44.7 66.9 44.6L67.1 44.6C71.1 44 74.2 40.5 74.2 36.5 74.2 35.7 74.1 34.8 73.8 34.1L73.8 34.1 73.8 34.1C73.8 34.1 73.8 34.1 73.8 34L68.7 18.6C69.1 18.4 69.4 18 69.7 17.7L69.7 17.7ZM66 92.8C82.9 92.8 98.8 93.9 113.1 96 117.1 79.1 122 69.3 127.1 62.5L117.5 59.1C118.5 64 118.6 66.3 117.5 69.3 116 67.9 114.5 65 113.3 60.6L108.6 76C111.4 74 113.6 72.8 116.1 72.7 111.7 82.1 106.1 84.6 102.5 83.9 98.2 83.1 96.2 79.3 96.9 76 97.9 71.3 102.6 70.1 104.9 75.5 109.2 66.8 101.9 64.1 97.3 66.7 104.4 59.5 105.2 53.2 99.4 45.6 91.4 51.7 91.3 57.9 94.9 66.4 90.2 61 82.8 63.9 85.4 72.6 88.8 67.4 93.3 70.6 92.6 75.7 92 80 86.2 83.5 79.1 82.9 68.8 82 68.2 74.9 67.9 69.1 70.4 68.6 75 70.9 78.9 76.4L80.2 60C76.1 64.4 72.2 65.3 67.9 65.4 69.3 61 75.9 53.8 75.9 53.8L66.4 53.8 66.4 53.8 66.4 53.8 55.5 53.8C55.5 53.8 61.9 61 63.4 65.4 59.2 65.3 55.4 64.4 51.1 60L52.5 76.4C56.4 70.9 61 68.7 63.4 69.1 63.1 74.9 62.5 81.9 52.3 82.9 45.1 83.5 39.4 80 38.8 75.7 38.1 70.7 42.6 67.4 45.9 72.6 48.6 63.9 41.3 61 36.5 66.4 40.2 57.9 40.1 51.7 31.9 45.6 26.1 53.2 26.9 59.5 34.1 66.7 29.4 64.1 22.2 66.8 26.4 75.5 28.7 70 33.5 71.3 34.5 76 35.2 79.3 33.2 83.1 28.8 83.9 25.3 84.6 19.8 82.1 15.3 72.7 17.8 72.8 20 74 22.8 76L18.1 60.6C16.9 65 15.4 67.8 13.8 69.3 12.7 66.3 12.9 64 13.8 59.1L4.3 62.5C9.3 69.4 14.2 79.2 18.3 96 33.1 93.9 49.1 92.8 66 92.8L66 92.8Z"/>
|
5
|
-
</g>
|
6
|
-
</g>
|
7
|
-
</svg>
|
1
|
+
<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m0 0v512h512v-512zm415.76 238.55c11.12-4.56 24.05.88 28.67 12.11 4.63 11.17-.72 24.05-11.85 28.61-11.34 4.68-24.21-.67-28.83-11.88-4.65-11.18.67-24.18 12.01-28.84zm-39.05-58.11c11.12-4.56 24.05.89 28.68 12.12 4.62 11.17-.73 24.04-11.85 28.6-11.34 4.68-24.21-.67-28.83-11.88-4.65-11.18.67-24.18 12-28.84zm-58.98-35.19c11.12-4.57 24.05.88 28.67 12.11 4.62 11.17-.72 24.04-11.85 28.6-11.34 4.68-24.21-.67-28.84-11.88-4.64-11.18.67-24.18 12.01-28.83zm-101.34-55.92 27.83 8.81.09-.08c.77-1.03 1.68-1.94 2.7-2.73l.08-.08-11.2-35.25h20.12s20.12 0 20.12 0l-11.2 35.25.08.08c1.02.79 1.93 1.7 2.7 2.73l.08.08 27.84-8.81v41.08l-27.87-14.63-.06.06c-.83 1.08-1.8 2.04-2.88 2.86l16 48.28c.02.06.05.12.06.18l.02.05c.74 2.42 1.14 4.98 1.14 7.63 0 13.06-9.65 23.85-22.19 25.7-.18.03-.37.06-.55.08-1.07.14-2.16.23-3.26.23-1.11 0-2.19-.09-3.26-.23-.19-.02-.38-.06-.56-.08-12.55-1.85-22.19-12.63-22.19-25.7 0-2.65.4-5.21 1.15-7.62s.01-.06.01-.06c.02-.06.04-.12.06-.18l16.01-48.28c-1.09-.81-2.06-1.77-2.88-2.86l-.06-.06-27.87 14.63v-41.08zm48.11 174.62c-11.34 4.68-24.21-.67-28.84-11.88-4.64-11.18.67-24.18 12.01-28.83 11.12-4.57 24.05.88 28.67 12.11 4.62 11.17-.72 24.04-11.85 28.6zm-99.28-106.59c4.62-11.23 17.55-16.68 28.67-12.11 11.34 4.65 16.65 17.65 12.01 28.83-4.62 11.21-17.49 16.56-28.84 11.88-11.12-4.56-16.47-17.44-11.85-28.6zm-58.99 35.2c4.63-11.22 17.55-16.68 28.68-12.12 11.34 4.65 16.65 17.65 12 28.84-4.62 11.21-17.49 16.56-28.83 11.88-11.12-4.56-16.48-17.44-11.85-28.6zm-39.04 58.11c4.62-11.23 17.55-16.68 28.67-12.11 11.34 4.65 16.66 17.65 12.01 28.84-4.62 11.21-17.49 16.56-28.83 11.88-11.13-4.55-16.47-17.43-11.85-28.61zm335.98 169.34c-44.5-6.37-94.44-9.94-147.21-9.94s-102.66 3.57-147.14 9.93c-12.63-53.1-28-83.53-43.87-105.19l29.89-10.64c-2.97 15.18-3.45 22.24-.12 32 4.93-4.82 9.6-13.68 13.25-27.23l14.49 48.23c-8.82-6.07-15.61-9.99-23.39-10.17 13.79 29.7 31.01 37.34 42.17 35.28 13.62-2.5 19.89-14.65 17.78-24.95-3.13-14.6-18.12-18.41-25.12-1.42-13.39-27.31 9.32-35.81 23.93-27.73-22.44-22.39-25.01-42.29-6.89-66.38 25.24 19.3 25.54 38.41 14.18 65.3 14.74-16.87 37.68-7.81 29.4 19.45-10.64-16.46-24.71-6.1-22.5 9.53 1.87 13.62 19.85 24.62 42.25 22.68 32.1-2.91 34.01-25.06 34.81-43.39-7.89-1.46-22.1 5.86-34.22 22.87l-4.46-51.16c13.18 13.74 25.16 16.35 38.46 16.77-4.43-13.82-24.78-36.46-24.78-36.46h63.85s-20.35 22.64-24.78 36.46c13.3-.42 25.28-3.03 38.46-16.77l-4.46 51.16c-12.11-17.01-26.32-24.33-34.21-22.87.8 18.34 2.71 40.48 34.81 43.39 22.39 1.95 40.38-9.05 42.25-22.68 2.21-15.63-11.86-25.99-22.49-9.53-8.29-27.26 14.65-36.32 29.39-19.45-11.36-26.89-11.07-46 14.18-65.3 18.12 24.08 15.55 43.99-6.9 66.38 14.62-8.08 37.32.43 23.94 27.73-7-16.99-21.98-13.18-25.12 1.42-2.11 10.3 4.15 22.46 17.77 24.95 11.16 2.06 28.38-5.58 42.17-35.28-7.77.18-14.57 4.11-23.38 10.17l14.48-48.23c3.65 13.55 8.32 22.41 13.25 27.23 3.33-9.76 2.85-16.82-.12-32l29.89 10.64c-15.88 21.66-31.25 52.09-43.88 105.2z" fill="#0b0c0c"/></svg>
|
Binary file
|
@@ -3,13 +3,13 @@
|
|
3
3
|
"name": "id",
|
4
4
|
"type": "string",
|
5
5
|
"required": true,
|
6
|
-
"description": "Must be
|
6
|
+
"description": "Must be unique across the domain of your service (as the expanded state of individual instances of the component persists across page loads using [`sessionStorage`](https://developer.mozilla.org/en-US/docs/Web/API/Window/sessionStorage)). Used as an `id` in the HTML for the accordion as a whole, and also as a prefix for the `id`s of the section contents and the buttons that open them, so that those `id`s can be the target of `aria-labelledby` and `aria-control` attributes."
|
7
7
|
},
|
8
8
|
{
|
9
9
|
"name": "headingLevel",
|
10
10
|
"type": "integer",
|
11
11
|
"required": false,
|
12
|
-
"description": "Heading level, from 1 to 6
|
12
|
+
"description": "Heading level, from `1` to `6`. Default is `2`."
|
13
13
|
},
|
14
14
|
{
|
15
15
|
"name": "classes",
|
@@ -3,19 +3,19 @@
|
|
3
3
|
"name": "text",
|
4
4
|
"type": "string",
|
5
5
|
"required": false,
|
6
|
-
"description": "Text to use within the back link component. If `html` is provided, the `text` argument will be ignored. Defaults to
|
6
|
+
"description": "Text to use within the back link component. If `html` is provided, the `text` argument will be ignored. Defaults to 'Back'."
|
7
7
|
},
|
8
8
|
{
|
9
9
|
"name": "html",
|
10
10
|
"type": "string",
|
11
11
|
"required": false,
|
12
|
-
"description": "HTML to use within the back link component. If `html` is provided, the `text` argument will be ignored. Defaults to
|
12
|
+
"description": "HTML to use within the back link component. If `html` is provided, the `text` argument will be ignored. Defaults to 'Back'."
|
13
13
|
},
|
14
14
|
{
|
15
15
|
"name": "href",
|
16
16
|
"type": "string",
|
17
17
|
"required": true,
|
18
|
-
"description": "The value of the link href attribute."
|
18
|
+
"description": "The value of the link's `href` attribute."
|
19
19
|
},
|
20
20
|
{
|
21
21
|
"name": "classes",
|
@@ -158,10 +158,6 @@
|
|
158
158
|
cursor: default;
|
159
159
|
}
|
160
160
|
|
161
|
-
&:focus {
|
162
|
-
outline: none;
|
163
|
-
}
|
164
|
-
|
165
161
|
&:active {
|
166
162
|
top: 0;
|
167
163
|
box-shadow: 0 $button-shadow-size 0 $govuk-button-shadow-colour; // s0
|
@@ -270,6 +266,9 @@
|
|
270
266
|
-webkit-align-self: center;
|
271
267
|
-ms-flex-item-align: center;
|
272
268
|
align-self: center;
|
269
|
+
// Work around SVGs not inheriting color from parent in forced color mode
|
270
|
+
// (https://github.com/w3c/csswg-drafts/issues/6310)
|
271
|
+
forced-color-adjust: auto;
|
273
272
|
}
|
274
273
|
|
275
274
|
@if $govuk-use-legacy-font {
|
@@ -37,6 +37,15 @@
|
|
37
37
|
"html": "<a href=\"/\" role=\"button\" draggable=\"false\" class=\"govuk-button govuk-button--disabled\" data-module=\"govuk-button\">\n Disabled link button\n</a>",
|
38
38
|
"hidden": false
|
39
39
|
},
|
40
|
+
{
|
41
|
+
"name": "start",
|
42
|
+
"options": {
|
43
|
+
"text": "Start now button",
|
44
|
+
"isStartButton": true
|
45
|
+
},
|
46
|
+
"html": "<button class=\"govuk-button govuk-button--start\" data-module=\"govuk-button\">\n Start now button\n <svg class=\"govuk-button__start-icon\" xmlns=\"http://www.w3.org/2000/svg\" width=\"17.5\" height=\"19\" viewBox=\"0 0 33 40\" aria-hidden=\"true\" focusable=\"false\">\n <path fill=\"currentColor\" d=\"M0 0h13l20 20-20 20H0l20-20z\"/>\n </svg></button>",
|
47
|
+
"hidden": false
|
48
|
+
},
|
40
49
|
{
|
41
50
|
"name": "start link",
|
42
51
|
"options": {
|
@@ -3,7 +3,7 @@
|
|
3
3
|
"name": "id",
|
4
4
|
"type": "string",
|
5
5
|
"required": true,
|
6
|
-
"description": "The
|
6
|
+
"description": "The ID of the textarea."
|
7
7
|
},
|
8
8
|
{
|
9
9
|
"name": "name",
|
@@ -66,13 +66,13 @@
|
|
66
66
|
"name": "formGroup",
|
67
67
|
"type": "object",
|
68
68
|
"required": false,
|
69
|
-
"description": "Options for the form-group wrapper",
|
69
|
+
"description": "Options for the form-group wrapper.",
|
70
70
|
"params": [
|
71
71
|
{
|
72
72
|
"name": "classes",
|
73
73
|
"type": "string",
|
74
74
|
"required": false,
|
75
|
-
"description": "Classes to add to the form group (for example to show error state for the whole group)"
|
75
|
+
"description": "Classes to add to the form group (for example to show error state for the whole group)."
|
76
76
|
}
|
77
77
|
]
|
78
78
|
},
|
@@ -92,19 +92,19 @@
|
|
92
92
|
"name": "spellcheck",
|
93
93
|
"type": "boolean",
|
94
94
|
"required": false,
|
95
|
-
"description": "Optional field to enable or disable the spellcheck attribute on the character count."
|
95
|
+
"description": "Optional field to enable or disable the `spellcheck` attribute on the character count."
|
96
96
|
},
|
97
97
|
{
|
98
98
|
"name": "countMessage",
|
99
99
|
"type": "object",
|
100
100
|
"required": false,
|
101
|
-
"description": "Options for the count message",
|
101
|
+
"description": "Options for the count message.",
|
102
102
|
"params": [
|
103
103
|
{
|
104
104
|
"name": "classes",
|
105
105
|
"type": "string",
|
106
106
|
"required": false,
|
107
|
-
"description": "Classes to add to the count message"
|
107
|
+
"description": "Classes to add to the count message."
|
108
108
|
}
|
109
109
|
]
|
110
110
|
}
|
@@ -127,6 +127,20 @@
|
|
127
127
|
// Focused state
|
128
128
|
.govuk-checkboxes__input:focus + .govuk-checkboxes__label:before {
|
129
129
|
border-width: 4px;
|
130
|
+
|
131
|
+
// When colours are overridden, the yellow box-shadow becomes invisible
|
132
|
+
// which means the focus state is less obvious. By adding a transparent
|
133
|
+
// outline, which becomes solid (text-coloured) in that context, we ensure
|
134
|
+
// the focus remains clearly visible.
|
135
|
+
outline: $govuk-focus-width solid transparent;
|
136
|
+
outline-offset: 1px;
|
137
|
+
|
138
|
+
// When in an explicit forced-color mode, we can use the Highlight system
|
139
|
+
// color for the outline to better match focus states of native controls
|
140
|
+
@media screen and (forced-colors: active), (-ms-high-contrast: active) {
|
141
|
+
outline-color: Highlight;
|
142
|
+
}
|
143
|
+
|
130
144
|
box-shadow: 0 0 0 $govuk-focus-width $govuk-focus-colour;
|
131
145
|
}
|
132
146
|
|
@@ -30,13 +30,13 @@
|
|
30
30
|
"name": "formGroup",
|
31
31
|
"type": "object",
|
32
32
|
"required": false,
|
33
|
-
"description": "Options for the form-group wrapper",
|
33
|
+
"description": "Options for the form-group wrapper.",
|
34
34
|
"params": [
|
35
35
|
{
|
36
36
|
"name": "classes",
|
37
37
|
"type": "string",
|
38
38
|
"required": false,
|
39
|
-
"description": "Classes to add to the form group (for example to show error state for the whole group)"
|
39
|
+
"description": "Classes to add to the form group (for example to show error state for the whole group)."
|
40
40
|
}
|
41
41
|
]
|
42
42
|
},
|
@@ -74,7 +74,7 @@
|
|
74
74
|
"name": "id",
|
75
75
|
"type": "string",
|
76
76
|
"required": false,
|
77
|
-
"description": "Specific
|
77
|
+
"description": "Specific ID attribute for the checkbox item. If omitted, then component global `idPrefix` option will be applied."
|
78
78
|
},
|
79
79
|
{
|
80
80
|
"name": "name",
|
@@ -106,19 +106,19 @@
|
|
106
106
|
"name": "divider",
|
107
107
|
"type": "string",
|
108
108
|
"required": false,
|
109
|
-
"description": "Divider text to separate checkbox items, for example the text
|
109
|
+
"description": "Divider text to separate checkbox items, for example the text 'or'."
|
110
110
|
},
|
111
111
|
{
|
112
112
|
"name": "checked",
|
113
113
|
"type": "boolean",
|
114
114
|
"required": false,
|
115
|
-
"description": "If true
|
115
|
+
"description": "If `true`, checkbox will be checked."
|
116
116
|
},
|
117
117
|
{
|
118
118
|
"name": "conditional",
|
119
119
|
"type": "boolean",
|
120
120
|
"required": false,
|
121
|
-
"description": "If true
|
121
|
+
"description": "If `true`, content provided will be revealed when the item is checked."
|
122
122
|
},
|
123
123
|
{
|
124
124
|
"name": "conditional.html",
|
@@ -130,13 +130,13 @@
|
|
130
130
|
"name": "behaviour",
|
131
131
|
"type": "string",
|
132
132
|
"required": false,
|
133
|
-
"description": "If set to `exclusive`, implements a
|
133
|
+
"description": "If set to `exclusive`, implements a 'None of these' type behaviour via JavaScript when checkboxes are clicked."
|
134
134
|
},
|
135
135
|
{
|
136
136
|
"name": "disabled",
|
137
137
|
"type": "boolean",
|
138
138
|
"required": false,
|
139
|
-
"description": "If true
|
139
|
+
"description": "If `true`, checkbox will be disabled."
|
140
140
|
},
|
141
141
|
{
|
142
142
|
"name": "attributes",
|
@@ -3,7 +3,7 @@
|
|
3
3
|
"name": "ariaLabel",
|
4
4
|
"type": "string",
|
5
5
|
"required": false,
|
6
|
-
"description": "The text for the `aria-label` which labels the cookie banner region. This region applies to all messages that the cookie banner includes. For example, the cookie message and the confirmation message. Defaults to
|
6
|
+
"description": "The text for the `aria-label` which labels the cookie banner region. This region applies to all messages that the cookie banner includes. For example, the cookie message and the confirmation message. Defaults to 'Cookie banner'."
|
7
7
|
},
|
8
8
|
{
|
9
9
|
"name": "hidden",
|
@@ -3,7 +3,7 @@
|
|
3
3
|
"name": "id",
|
4
4
|
"type": "string",
|
5
5
|
"required": true,
|
6
|
-
"description": "This is used for the main component and to compose
|
6
|
+
"description": "This is used for the main component and to compose the ID attribute for each item."
|
7
7
|
},
|
8
8
|
{
|
9
9
|
"name": "namePrefix",
|
@@ -21,7 +21,7 @@
|
|
21
21
|
"name": "id",
|
22
22
|
"type": "string",
|
23
23
|
"required": false,
|
24
|
-
"description": "Item-specific
|
24
|
+
"description": "Item-specific ID. If provided, it will be used instead of the generated ID."
|
25
25
|
},
|
26
26
|
{
|
27
27
|
"name": "name",
|
@@ -45,7 +45,7 @@
|
|
45
45
|
"name": "autocomplete",
|
46
46
|
"type": "string",
|
47
47
|
"required": false,
|
48
|
-
"description": "Attribute to [identify input purpose](https://www.w3.org/WAI/WCAG21/Understanding/identify-input-purpose.html), for instance
|
48
|
+
"description": "Attribute to [identify input purpose](https://www.w3.org/WAI/WCAG21/Understanding/identify-input-purpose.html), for instance `bday-day`. See [autofill](https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#autofill) for full list of attributes that can be used."
|
49
49
|
},
|
50
50
|
{
|
51
51
|
"name": "pattern",
|
@@ -85,13 +85,13 @@
|
|
85
85
|
"name": "formGroup",
|
86
86
|
"type": "object",
|
87
87
|
"required": false,
|
88
|
-
"description": "Options for the form-group wrapper",
|
88
|
+
"description": "Options for the form-group wrapper.",
|
89
89
|
"params": [
|
90
90
|
{
|
91
91
|
"name": "classes",
|
92
92
|
"type": "string",
|
93
93
|
"required": false,
|
94
|
-
"description": "Classes to add to the form group (for example to show error state for the whole group)"
|
94
|
+
"description": "Classes to add to the form group (for example to show error state for the whole group)."
|
95
95
|
}
|
96
96
|
]
|
97
97
|
},
|