defra_ruby_template 3.13.0 → 3.15.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.
Files changed (64) hide show
  1. checksums.yaml +4 -4
  2. data/.github/dependabot.yml +14 -0
  3. data/.github/workflows/ci.yml +27 -0
  4. data/.rubocop.yml +3 -0
  5. data/.ruby-version +1 -0
  6. data/Gemfile +2 -0
  7. data/Gemfile.lock +24 -1
  8. data/README.md +5 -1
  9. data/Rakefile +22 -22
  10. data/app/views/layouts/defra_ruby_template.html.erb +17 -2
  11. data/defra_ruby_template.gemspec +14 -3
  12. data/lib/defra_ruby_template/version.rb +3 -1
  13. data/lib/defra_ruby_template.rb +4 -2
  14. data/node_modules/.package-lock.json +16 -0
  15. data/node_modules/govuk-frontend/govuk/assets/images/favicon.ico +0 -0
  16. data/node_modules/govuk-frontend/govuk/assets/images/govuk-apple-touch-icon-152x152.png +0 -0
  17. data/node_modules/govuk-frontend/govuk/assets/images/govuk-apple-touch-icon-167x167.png +0 -0
  18. data/node_modules/govuk-frontend/govuk/assets/images/govuk-apple-touch-icon-180x180.png +0 -0
  19. data/node_modules/govuk-frontend/govuk/assets/images/govuk-apple-touch-icon.png +0 -0
  20. data/node_modules/govuk-frontend/govuk/assets/images/govuk-logotype-tudor-crown.png +0 -0
  21. data/node_modules/govuk-frontend/govuk/assets/images/govuk-mask-icon.svg +1 -7
  22. data/node_modules/govuk-frontend/govuk/assets/images/govuk-opengraph-image.png +0 -0
  23. data/node_modules/govuk-frontend/govuk/components/accordion/macro-options.json +2 -2
  24. data/node_modules/govuk-frontend/govuk/components/back-link/macro-options.json +3 -3
  25. data/node_modules/govuk-frontend/govuk/components/button/_index.scss +3 -4
  26. data/node_modules/govuk-frontend/govuk/components/button/fixtures.json +9 -0
  27. data/node_modules/govuk-frontend/govuk/components/character-count/macro-options.json +6 -6
  28. data/node_modules/govuk-frontend/govuk/components/checkboxes/_index.scss +14 -0
  29. data/node_modules/govuk-frontend/govuk/components/checkboxes/macro-options.json +8 -8
  30. data/node_modules/govuk-frontend/govuk/components/cookie-banner/macro-options.json +1 -1
  31. data/node_modules/govuk-frontend/govuk/components/date-input/macro-options.json +5 -5
  32. data/node_modules/govuk-frontend/govuk/components/details/_index.scss +2 -1
  33. data/node_modules/govuk-frontend/govuk/components/details/macro-options.json +2 -2
  34. data/node_modules/govuk-frontend/govuk/components/error-message/macro-options.json +3 -3
  35. data/node_modules/govuk-frontend/govuk/components/fieldset/macro-options.json +1 -1
  36. data/node_modules/govuk-frontend/govuk/components/file-upload/_index.scss +1 -0
  37. data/node_modules/govuk-frontend/govuk/components/file-upload/macro-options.json +4 -4
  38. data/node_modules/govuk-frontend/govuk/components/footer/_index.scss +3 -0
  39. data/node_modules/govuk-frontend/govuk/components/footer/macro-options.json +2 -2
  40. data/node_modules/govuk-frontend/govuk/components/header/_index.scss +16 -0
  41. data/node_modules/govuk-frontend/govuk/components/header/fixtures.json +26 -18
  42. data/node_modules/govuk-frontend/govuk/components/header/macro-options.json +12 -6
  43. data/node_modules/govuk-frontend/govuk/components/header/template.njk +56 -31
  44. data/node_modules/govuk-frontend/govuk/components/hint/macro-options.json +1 -1
  45. data/node_modules/govuk-frontend/govuk/components/input/macro-options.json +7 -7
  46. data/node_modules/govuk-frontend/govuk/components/inset-text/macro-options.json +1 -1
  47. data/node_modules/govuk-frontend/govuk/components/label/macro-options.json +1 -1
  48. data/node_modules/govuk-frontend/govuk/components/panel/_index.scss +13 -1
  49. data/node_modules/govuk-frontend/govuk/components/panel/macro-options.json +1 -1
  50. data/node_modules/govuk-frontend/govuk/components/radios/_index.scss +14 -0
  51. data/node_modules/govuk-frontend/govuk/components/radios/macro-options.json +8 -8
  52. data/node_modules/govuk-frontend/govuk/components/select/macro-options.json +3 -3
  53. data/node_modules/govuk-frontend/govuk/components/summary-list/fixtures.json +2 -2
  54. data/node_modules/govuk-frontend/govuk/components/summary-list/macro-options.json +7 -7
  55. data/node_modules/govuk-frontend/govuk/components/tabs/macro-options.json +4 -4
  56. data/node_modules/govuk-frontend/govuk/components/textarea/macro-options.json +5 -5
  57. data/node_modules/govuk-frontend/govuk/helpers/_colour.scss +2 -2
  58. data/node_modules/govuk-frontend/govuk/helpers/_spacing.scss +22 -4
  59. data/node_modules/govuk-frontend/govuk/overrides/_all.scss +1 -0
  60. data/node_modules/govuk-frontend/govuk/overrides/_text-align.scss +20 -0
  61. data/node_modules/govuk-frontend/package.json +14 -41
  62. data/package-lock.json +17 -6
  63. data/package.json +1 -1
  64. metadata +28 -7
@@ -3,7 +3,7 @@
3
3
  "name": "id",
4
4
  "type": "string",
5
5
  "required": true,
6
- "description": "The id of the textarea."
6
+ "description": "The ID of the textarea."
7
7
  },
8
8
  {
9
9
  "name": "name",
@@ -15,7 +15,7 @@
15
15
  "name": "spellcheck",
16
16
  "type": "boolean",
17
17
  "required": false,
18
- "description": "Optional field to enable or disable the spellcheck attribute on the textarea."
18
+ "description": "Optional field to enable or disable the `spellcheck` attribute on the textarea."
19
19
  },
20
20
  {
21
21
  "name": "rows",
@@ -60,13 +60,13 @@
60
60
  "name": "formGroup",
61
61
  "type": "object",
62
62
  "required": false,
63
- "description": "Options for the form-group wrapper",
63
+ "description": "Options for the form-group wrapper.",
64
64
  "params": [
65
65
  {
66
66
  "name": "classes",
67
67
  "type": "string",
68
68
  "required": false,
69
- "description": "Classes to add to the form group (for example to show error state for the whole group)"
69
+ "description": "Classes to add to the form group (for example to show error state for the whole group)."
70
70
  }
71
71
  ]
72
72
  },
@@ -80,7 +80,7 @@
80
80
  "name": "autocomplete",
81
81
  "type": "string",
82
82
  "required": false,
83
- "description": "Attribute to [identify input purpose](https://www.w3.org/WAI/WCAG21/Understanding/identify-input-purpose.html), for instance \"postal-code\" or \"username\". See [autofill](https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#autofill) for full list of attributes that can be used."
83
+ "description": "Attribute to [identify input purpose](https://www.w3.org/WAI/WCAG21/Understanding/identify-input-purpose.html), for example `postal-code` or `username`. See [autofill](https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#autofill) for full list of attributes that can be used."
84
84
  },
85
85
  {
86
86
  "name": "attributes",
@@ -75,7 +75,7 @@
75
75
  /// Make a colour darker by mixing it with black
76
76
  ///
77
77
  /// @param {Colour} $colour - colour to shade
78
- /// @param {Number} $percentage - percentage of `$colour` in returned color
78
+ /// @param {Number} $percentage - percentage of `$colour` in returned colour
79
79
  /// @return {Colour}
80
80
  /// @access public
81
81
 
@@ -86,7 +86,7 @@
86
86
  /// Make a colour lighter by mixing it with white
87
87
  ///
88
88
  /// @param {Colour} $colour - colour to tint
89
- /// @param {Number} $percentage - percentage of `$colour` in returned color
89
+ /// @param {Number} $percentage - percentage of `$colour` in returned colour
90
90
  /// @return {Colour}
91
91
  /// @access public
92
92
 
@@ -8,15 +8,26 @@
8
8
  ///
9
9
  /// Returns measurement corresponding to the spacing point requested.
10
10
  ///
11
- /// @param {Number} $spacing-point - Point on the spacing scale (set in `settings/_spacing.sccs`)
11
+ /// @param {Number} $spacing-point - Point on the spacing scale
12
+ /// (set in `settings/_spacing.scss`)
12
13
  ///
13
- /// @returns {String} Spacing Measurement eg. 10px
14
+ /// @returns {String} Spacing measurement eg. 10px
14
15
  ///
15
16
  /// @example scss
16
17
  /// .element {
17
18
  /// padding: govuk-spacing(5);
18
- /// top: govuk-spacing(2) !important; // if `!important` is required
19
19
  /// }
20
+ ///
21
+ /// @example scss Using negative spacing
22
+ /// .element {
23
+ /// margin-top: govuk-spacing(-1);
24
+ /// }
25
+ ///
26
+ /// @example scss Marking spacing declarations as important
27
+ /// .element {
28
+ /// margin-top: govuk-spacing(1) !important;
29
+ /// }
30
+ ///
20
31
  /// @access public
21
32
 
22
33
  @function govuk-spacing($spacing-point) {
@@ -27,11 +38,18 @@
27
38
  + "#{$actual-input-type}.";
28
39
  }
29
40
 
41
+ $is-negative: false;
42
+ @if ($spacing-point < 0) {
43
+ $is-negative: true;
44
+ $spacing-point: abs($spacing-point);
45
+ }
46
+
30
47
  @if not map-has-key($govuk-spacing-points, $spacing-point) {
31
48
  @error "Unknown spacing variable `#{$spacing-point}`. Make sure you are using a point from the spacing scale in `_settings/spacing.scss`.";
32
49
  }
33
50
 
34
- @return map-get($govuk-spacing-points, $spacing-point);
51
+ $value: map-get($govuk-spacing-points, $spacing-point);
52
+ @return if($is-negative, $value * -1, $value);
35
53
  }
36
54
 
37
55
  /// Responsive spacing
@@ -1,4 +1,5 @@
1
1
  @import "display";
2
2
  @import "spacing";
3
+ @import "text-align";
3
4
  @import "typography";
4
5
  @import "width";
@@ -0,0 +1,20 @@
1
+ @if not mixin-exists("govuk-exports") {
2
+ @warn "Importing items from the overrides layer without first importing `base` is deprecated, and will no longer work as of GOV.UK Frontend v4.0.";
3
+ }
4
+
5
+ @import "../base";
6
+
7
+ // stylelint-disable declaration-no-important
8
+ @include govuk-exports("govuk/overrides/text-align") {
9
+ .govuk-\!-text-align-left {
10
+ text-align: left !important;
11
+ }
12
+
13
+ .govuk-\!-text-align-centre {
14
+ text-align: center !important;
15
+ }
16
+
17
+ .govuk-\!-text-align-right {
18
+ text-align: right !important;
19
+ }
20
+ }
@@ -1,42 +1,23 @@
1
1
  {
2
- "_from": "govuk-frontend@^3.13.0",
3
- "_id": "govuk-frontend@3.13.0",
4
- "_inBundle": false,
5
- "_integrity": "sha512-JiPCeasuHZ+9m1VyqhsfE81PhWIW4Sweoe6Jvn6oMjQNr75ZpupiytN3DGwA+WKOoESHZibIG+heAzlkdZ/MhA==",
6
- "_location": "/govuk-frontend",
7
- "_phantomChildren": {},
8
- "_requested": {
9
- "type": "range",
10
- "registry": true,
11
- "raw": "govuk-frontend@^3.13.0",
12
- "name": "govuk-frontend",
13
- "escapedName": "govuk-frontend",
14
- "rawSpec": "^3.13.0",
15
- "saveSpec": null,
16
- "fetchSpec": "^3.13.0"
2
+ "name": "govuk-frontend",
3
+ "description": "GOV.UK Frontend contains the code you need to start building a user interface for government platforms and services.",
4
+ "version": "3.15.0",
5
+ "main": "govuk/all.js",
6
+ "sass": "govuk/all.scss",
7
+ "engines": {
8
+ "node": ">= 4.2.0"
17
9
  },
18
- "_requiredBy": [
19
- "#USER",
20
- "/"
21
- ],
22
- "_resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.13.0.tgz",
23
- "_shasum": "c52f3a3d54edccf58439db038dd75bbee5df0efa",
24
- "_spec": "govuk-frontend@^3.13.0",
25
- "_where": "/Users/toby/Code/defra/frae-vagrant/defra-ruby-template",
26
10
  "author": {
27
- "name": "GOV.UK Design System Team",
28
- "email": "design-system-developers@digital.cabinet-office.gov.uk",
29
- "url": "Government Digital Service"
11
+ "name": "GOV.UK Design System Team (Government Digital Service)",
12
+ "email": "design-system-developers@digital.cabinet-office.gov.uk"
13
+ },
14
+ "repository": {
15
+ "type": "git",
16
+ "url": "https://github.com/alphagov/govuk-frontend.git"
30
17
  },
31
18
  "bugs": {
32
19
  "url": "https://github.com/alphagov/govuk-frontend/issues"
33
20
  },
34
- "bundleDependencies": false,
35
- "deprecated": false,
36
- "description": "GOV.UK Frontend contains the code you need to start building a user interface for government platforms and services.",
37
- "engines": {
38
- "node": ">= 4.2.0"
39
- },
40
21
  "homepage": "https://frontend.design-system.service.gov.uk/",
41
22
  "keywords": [
42
23
  "govuk",
@@ -44,13 +25,5 @@
44
25
  "design system",
45
26
  "template"
46
27
  ],
47
- "license": "MIT",
48
- "main": "govuk/all.js",
49
- "name": "govuk-frontend",
50
- "repository": {
51
- "type": "git",
52
- "url": "git+https://github.com/alphagov/govuk-frontend.git"
53
- },
54
- "sass": "govuk/all.scss",
55
- "version": "3.13.0"
28
+ "license": "MIT"
56
29
  }
data/package-lock.json CHANGED
@@ -1,13 +1,24 @@
1
1
  {
2
2
  "name": "defra-ruby-template",
3
3
  "version": "1.0.0",
4
- "lockfileVersion": 1,
4
+ "lockfileVersion": 3,
5
5
  "requires": true,
6
- "dependencies": {
7
- "govuk-frontend": {
8
- "version": "3.13.0",
9
- "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.13.0.tgz",
10
- "integrity": "sha512-JiPCeasuHZ+9m1VyqhsfE81PhWIW4Sweoe6Jvn6oMjQNr75ZpupiytN3DGwA+WKOoESHZibIG+heAzlkdZ/MhA=="
6
+ "packages": {
7
+ "": {
8
+ "name": "defra-ruby-template",
9
+ "version": "1.0.0",
10
+ "license": "ISC",
11
+ "dependencies": {
12
+ "govuk-frontend": "^3.15.0"
13
+ }
14
+ },
15
+ "node_modules/govuk-frontend": {
16
+ "version": "3.15.0",
17
+ "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.15.0.tgz",
18
+ "integrity": "sha512-kInDei8hrkMcrW7yC2EwhbSNBOBBPTdLxIDAye2G7KNrD9cyvNAfd0KchrfP/nWBOzu67ANoz2rtoRDLWiBN2w==",
19
+ "engines": {
20
+ "node": ">= 4.2.0"
21
+ }
11
22
  }
12
23
  }
13
24
  }
data/package.json CHANGED
@@ -24,6 +24,6 @@
24
24
  },
25
25
  "homepage": "https://github.com/DEFRA/defra-ruby-template#readme",
26
26
  "dependencies": {
27
- "govuk-frontend": "^3.13.0"
27
+ "govuk-frontend": "^3.15.0"
28
28
  }
29
29
  }
metadata CHANGED
@@ -1,15 +1,29 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: defra_ruby_template
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.13.0
4
+ version: 3.15.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Toby Privett
8
- autorequire:
8
+ autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-07-27 00:00:00.000000000 Z
12
- dependencies: []
11
+ date: 2024-02-19 00:00:00.000000000 Z
12
+ dependencies:
13
+ - !ruby/object:Gem::Dependency
14
+ name: defra_ruby_style
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - ">="
18
+ - !ruby/object:Gem::Version
19
+ version: '0'
20
+ type: :development
21
+ prerelease: false
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - ">="
25
+ - !ruby/object:Gem::Version
26
+ version: '0'
13
27
  description: Adds the GOVUK frontend to a Rails application that uses the Asset Pipeline.
14
28
  email:
15
29
  - toby@snaplab.co.uk
@@ -17,7 +31,11 @@ executables: []
17
31
  extensions: []
18
32
  extra_rdoc_files: []
19
33
  files:
34
+ - ".github/dependabot.yml"
35
+ - ".github/workflows/ci.yml"
20
36
  - ".gitignore"
37
+ - ".rubocop.yml"
38
+ - ".ruby-version"
21
39
  - Gemfile
22
40
  - Gemfile.lock
23
41
  - README.md
@@ -28,6 +46,7 @@ files:
28
46
  - defra_ruby_template.gemspec
29
47
  - lib/defra_ruby_template.rb
30
48
  - lib/defra_ruby_template/version.rb
49
+ - node_modules/.package-lock.json
31
50
  - node_modules/govuk-frontend/README.md
32
51
  - node_modules/govuk-frontend/govuk-prototype-kit.config.json
33
52
  - node_modules/govuk-frontend/govuk/_base.scss
@@ -46,6 +65,7 @@ files:
46
65
  - node_modules/govuk-frontend/govuk/assets/images/govuk-crest-2x.png
47
66
  - node_modules/govuk-frontend/govuk/assets/images/govuk-crest.png
48
67
  - node_modules/govuk-frontend/govuk/assets/images/govuk-logotype-crown.png
68
+ - node_modules/govuk-frontend/govuk/assets/images/govuk-logotype-tudor-crown.png
49
69
  - node_modules/govuk-frontend/govuk/assets/images/govuk-mask-icon.svg
50
70
  - node_modules/govuk-frontend/govuk/assets/images/govuk-opengraph-image.png
51
71
  - node_modules/govuk-frontend/govuk/common.js
@@ -307,6 +327,7 @@ files:
307
327
  - node_modules/govuk-frontend/govuk/overrides/_all.scss
308
328
  - node_modules/govuk-frontend/govuk/overrides/_display.scss
309
329
  - node_modules/govuk-frontend/govuk/overrides/_spacing.scss
330
+ - node_modules/govuk-frontend/govuk/overrides/_text-align.scss
310
331
  - node_modules/govuk-frontend/govuk/overrides/_typography.scss
311
332
  - node_modules/govuk-frontend/govuk/overrides/_width.scss
312
333
  - node_modules/govuk-frontend/govuk/settings/_all.scss
@@ -498,7 +519,7 @@ homepage: https://github.com/DEFRA/defra-ruby-template
498
519
  licenses:
499
520
  - The Open Government Licence (OGL) Version 3
500
521
  metadata: {}
501
- post_install_message:
522
+ post_install_message:
502
523
  rdoc_options: []
503
524
  require_paths:
504
525
  - lib
@@ -513,8 +534,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
513
534
  - !ruby/object:Gem::Version
514
535
  version: '0'
515
536
  requirements: []
516
- rubygems_version: 3.1.4
517
- signing_key:
537
+ rubygems_version: 3.1.2
538
+ signing_key:
518
539
  specification_version: 4
519
540
  summary: DEFRA Ruby Template
520
541
  test_files: []