@ons/design-system 73.13.1 → 74.0.0-cookies.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 (81) hide show
  1. package/README.md +12 -2
  2. package/components/access-code/example-access-code-error.njk +2 -2
  3. package/components/access-code/example-access-code.njk +2 -2
  4. package/components/address-input/_macro.njk +6 -6
  5. package/components/address-input/_macro.spec.js +0 -3
  6. package/components/address-output/_macro.njk +1 -1
  7. package/components/announcement-banner/_announcement-banner.scss +5 -0
  8. package/components/autosuggest/_autosuggest.scss +8 -0
  9. package/components/autosuggest/autosuggest.ui.js +8 -5
  10. package/components/back-to-top/_back-to-top.scss +7 -0
  11. package/components/back-to-top/_macro.njk +1 -1
  12. package/components/back-to-top/example-full-page-back-to-top.njk +1 -1
  13. package/components/breadcrumbs/_breadcrumbs.scss +4 -7
  14. package/components/breadcrumbs/_macro.njk +29 -25
  15. package/components/breadcrumbs/_macro.spec.js +39 -0
  16. package/components/breadcrumbs/example-breadcrumbs-wide.njk +52 -0
  17. package/components/char-check-limit/_macro.njk +16 -14
  18. package/components/cookies-banner/_macro.njk +1 -1
  19. package/components/cookies-banner/_macro.spec.js +15 -3
  20. package/components/details/_details.scss +9 -0
  21. package/components/details/example-details-with-warning.njk +1 -1
  22. package/components/details-panel/_macro.njk +1 -1
  23. package/components/featured-article/_macro.njk +4 -4
  24. package/components/featured-article/macro.spec.js +2 -2
  25. package/components/feedback/_macro.njk +4 -1
  26. package/components/feedback/_macro.spec.js +1 -1
  27. package/components/figure/_figure.scss +1 -0
  28. package/components/figure/_macro.njk +3 -3
  29. package/components/footer/_macro.njk +5 -2
  30. package/components/header/_macro.njk +7 -3
  31. package/components/header/_macro.spec.js +27 -0
  32. package/components/hero/_hero.scss +4 -0
  33. package/components/hero/_macro.njk +3 -2
  34. package/components/hero/_macro.spec.js +36 -0
  35. package/components/hero/example-hero-dark-wide.njk +17 -0
  36. package/components/hero/example-hero-dark-with-external-breadcrumbs.njk +17 -21
  37. package/components/hero/example-hero-default-full-width.njk +16 -0
  38. package/components/hero/example-hero-default-with-external-breadcrumbs.njk +165 -169
  39. package/components/hero/example-hero-grey-with-external-breadcrumbs.njk +207 -211
  40. package/components/hero/example-hero-navy-blue-with-external-breadcrumbs.njk +163 -167
  41. package/components/hero/example-hero-pale-blue-with-external-breadcrumbs.njk +165 -169
  42. package/components/input/_input.scss +4 -0
  43. package/components/input/_macro.njk +4 -1
  44. package/components/label/_label.scss +3 -0
  45. package/components/list/_list.scss +5 -0
  46. package/components/message-list/_message-list.scss +2 -0
  47. package/components/panel/_macro.njk +1 -1
  48. package/components/panel/_panel.scss +8 -0
  49. package/components/panel/example-panel-bare.njk +1 -1
  50. package/components/phase-banner/_phase-banner.scss +1 -0
  51. package/components/question/example-question-ccs.njk +1 -1
  52. package/components/question/example-question-fieldset.njk +1 -1
  53. package/components/question/example-question-interviewer-note.njk +1 -1
  54. package/components/question/example-question-no-fieldset.njk +1 -1
  55. package/components/quote/_macro.njk +1 -1
  56. package/components/relationships/example-relationships-error.njk +1 -1
  57. package/components/relationships/example-relationships-you.njk +1 -1
  58. package/components/relationships/example-relationships.njk +1 -1
  59. package/components/skip-to-content/_macro.njk +1 -1
  60. package/components/skip-to-content/_skip.scss +8 -0
  61. package/components/summary/_macro.njk +3 -2
  62. package/components/summary/_summary.scss +6 -1
  63. package/components/table-of-contents/example-table-of-contents-sticky-full-page-ordered.njk +105 -107
  64. package/components/table-of-contents/example-table-of-contents-sticky-full-page.njk +104 -106
  65. package/components/table-of-contents/example-table-of-contents-sticky.njk +1 -1
  66. package/components/table-of-contents/table-of-contents.spec.js +4 -5
  67. package/css/main.css +1 -1
  68. package/js/cookies-functions.js +46 -40
  69. package/js/cookies-functions.spec.js +103 -46
  70. package/layout/_template.njk +60 -47
  71. package/package.json +1 -1
  72. package/scripts/main.es5.js +1 -1
  73. package/scripts/main.js +1 -1
  74. package/scss/base/_typography.scss +9 -0
  75. package/scss/helpers/_mixins.scss +8 -0
  76. package/scss/objects/_page.scss +1 -1
  77. package/scss/objects/_spacing.scss +0 -4
  78. package/scss/utilities/_utilities.scss +10 -0
  79. package/scss/vars/_forms.scss +2 -1
  80. package/scss/vars/_index.scss +1 -0
  81. package/scss/vars/_utilities.scss +2 -0
package/README.md CHANGED
@@ -145,11 +145,21 @@ Checkout the branch locally and run:
145
145
 
146
146
  `VR_SHARD_INDEX=0 VR_SHARD_COUNT=4 yarn test-visual` - This runs only one shard of the visual tests locally. Useful when one shard fails in CI.
147
147
 
148
+ ### Handling VR test failures
149
+
150
+ If the VR tests fail locally, you'll see an error starting with `Error: docker run --rm -i --add-host=host.docker.internal:host-gateway...`
151
+
152
+ `npx http-server backstop_data -p 8008 -c-1 -o /html_report/` - View the report in your browser.
153
+
154
+ ### Approving VR test reference image changes
155
+
148
156
  `yarn test-visual:approve` - This will approve the failures/diff caught by the tests.
149
157
 
150
- `git lfs push --all origin` - First commit the files in the normal way then run the command. This will push the new reference images to Git LFS.
158
+ Commit and approve the file changes in the normal way.
159
+
160
+ `git lfs push --all origin` - This will push the new reference images to Git LFS.
151
161
 
152
- You can then commit and push the updated references and your changes to your branch. The test images that would have been created when you ran `yarn test-visual` are gitignored and the new references images will be pushed to Git LFS.
162
+ You can then push the updated references and your changes to your branch. The test images that would have been created when you ran `yarn test-visual` are gitignored and the new references images will be pushed to Git LFS.
153
163
 
154
164
  If your local tests are failing but you have approved them, run `yarn test-visual:reference`. This will update the reference images locally on your machine.
155
165
 
@@ -14,7 +14,7 @@ layout: ~
14
14
  }
15
15
  %}
16
16
 
17
- {% block main %}
17
+ {% block mainContent %}
18
18
  {%
19
19
  call onsPanel({
20
20
  "title": "There is a problem with this page",
@@ -76,7 +76,7 @@ layout: ~
76
76
  "variant": "warn"
77
77
  })
78
78
  %}
79
- Someone in your household must still complete a study using this household access code
79
+ <p>Someone in your household must still complete a study using this household access code</p>
80
80
  {% endcall %}
81
81
  {% endset %}
82
82
 
@@ -16,7 +16,7 @@ layout: ~
16
16
  }
17
17
  %}
18
18
 
19
- {% block main %}
19
+ {% block mainContent %}
20
20
  <h1 class="ons-u-mt-2xl">Start study</h1>
21
21
 
22
22
  {{
@@ -53,7 +53,7 @@ layout: ~
53
53
  "variant": "warn"
54
54
  })
55
55
  %}
56
- Someone in your household must still complete a study using this household access code
56
+ <p>Someone in your household must still complete a study using this household access code</p>
57
57
  {% endcall %}
58
58
  {% endset %}
59
59
 
@@ -19,7 +19,6 @@
19
19
  "text": params.organisation.label
20
20
  },
21
21
  "classes": "ons-js-address-organisation",
22
- "width": "20@m",
23
22
  "name": params.id + "-organisation",
24
23
  "error": params.organisation.error
25
24
  })
@@ -34,7 +33,6 @@
34
33
  "text": params.line1.label
35
34
  },
36
35
  "classes": "ons-js-address-line1",
37
- "width": "20@m",
38
36
  "name": params.id + "-line1",
39
37
  "error": params.line1.error
40
38
  })
@@ -49,7 +47,6 @@
49
47
  "text": params.line2.label
50
48
  },
51
49
  "classes": "ons-js-address-line2",
52
- "width": "20@m",
53
50
  "name": params.id + "-line2",
54
51
  "error": params.line2.error
55
52
  })
@@ -165,9 +162,12 @@
165
162
  })
166
163
  }}
167
164
  {% if params.manualLinkText %}
168
- <a href="{{ params.manualLinkUrl }}" class="ons-js-address-manual-btn ons-u-mt-s ons-u-dib"
169
- >{{ params.manualLinkText }}</a
170
- >
165
+ {# p tag ensures reading width is applied #}
166
+ <p class="ons-u-mb-no">
167
+ <a href="{{ params.manualLinkUrl }}" class="ons-js-address-manual-btn ons-u-mt-s ons-u-dib"
168
+ >{{ params.manualLinkText }}</a
169
+ >
170
+ </p>
171
171
  {% endif %}
172
172
  </div>
173
173
  {% endif %}
@@ -176,7 +176,6 @@ describe('FOR: Macro: Address-input', () => {
176
176
  text: 'Organisation name',
177
177
  },
178
178
  value: 'Example Organisation',
179
- width: '20@m',
180
179
  error: { text: 'Server error: organisation name' },
181
180
  });
182
181
  });
@@ -191,7 +190,6 @@ describe('FOR: Macro: Address-input', () => {
191
190
  text: 'Address line 1',
192
191
  },
193
192
  value: 'Flat 12345',
194
- width: '20@m',
195
193
  error: { text: 'Server error: address line 1' },
196
194
  });
197
195
  });
@@ -207,7 +205,6 @@ describe('FOR: Macro: Address-input', () => {
207
205
  text: 'Address line 2',
208
206
  },
209
207
  value: '12345 The Road',
210
- width: '20@m',
211
208
  error: { text: 'Server error: address line 2' },
212
209
  });
213
210
  });
@@ -1,5 +1,5 @@
1
1
  {% macro onsAddressOutput(params) %}
2
- <div class="ons-address-output{{ ' ' + params.classes if params.classes else '' }}">
2
+ <div class="ons-address-output ons-u-reading-width{{ ' ' + params.classes if params.classes else '' }}">
3
3
  <p class="ons-address-output__lines">
4
4
  {% if params.unit %}
5
5
  <span class="ons-address-output__unit">{{ params.unit }}</span><br />
@@ -13,6 +13,11 @@
13
13
  background-color: var(--ons-color-gov-red);
14
14
  }
15
15
 
16
+ &__title,
17
+ &__description {
18
+ @include no-reading-width;
19
+ }
20
+
16
21
  &__link {
17
22
  color: var(--ons-color-text-inverse);
18
23
 
@@ -26,6 +26,8 @@
26
26
  }
27
27
 
28
28
  &__results-title {
29
+ @include reading-width;
30
+
29
31
  background: var(--ons-color-grey-15);
30
32
  border-bottom: 1px solid var(--ons-color-input-border);
31
33
  padding: 0.25rem 0.5rem;
@@ -41,6 +43,12 @@
41
43
  }
42
44
  }
43
45
 
46
+ &__option-text {
47
+ @include reading-width;
48
+
49
+ display: block;
50
+ }
51
+
44
52
  &__option {
45
53
  cursor: pointer;
46
54
  margin: 0;
@@ -384,7 +384,7 @@ export default class AutosuggestUI {
384
384
  innerHTML +
385
385
  `<span class="ons-autosuggest__category ons-u-lighter ons-u-fs-s ons-u-db">${resultItem.category}</span>`;
386
386
  }
387
- listElement.innerHTML = innerHTML;
387
+ listElement.innerHTML = `<span class="ons-autosuggest__option-text">${innerHTML}</span>`;
388
388
  listElement.addEventListener('click', () => {
389
389
  this.selectResult(index);
390
390
  });
@@ -401,7 +401,7 @@ export default class AutosuggestUI {
401
401
  const listElement = document.createElement('li');
402
402
  listElement.className = `${classAutosuggestOption} ${classAutosuggestOptionMoreResults}`;
403
403
  listElement.setAttribute('aria-hidden', 'true');
404
- listElement.innerHTML = DOMPurify.sanitize(this.moreResults);
404
+ listElement.innerHTML = `<span class="ons-autosuggest__option-text">${DOMPurify.sanitize(this.moreResults)}</span>`;
405
405
  this.listbox.appendChild(listElement);
406
406
  }
407
407
 
@@ -440,11 +440,14 @@ export default class AutosuggestUI {
440
440
  message = this.typeMore;
441
441
  this.setAriaStatus(message);
442
442
  this.listbox.innerHTML = DOMPurify.sanitize(
443
- `<li class="${classAutosuggestOption} ${classAutosuggestOptionNoResults}">${message}</li>`,
443
+ `<li class="${classAutosuggestOption} ${classAutosuggestOptionNoResults}"><span class="ons-autosuggest__option-text">${message}</span></li>`,
444
444
  );
445
445
  } else if (status > 400 || status === '') {
446
446
  const sanitizedHref = DOMPurify.sanitize(window.location.href);
447
- message = this.errorAPI + (this.errorAPILinkText ? ' <a href="' + sanitizedHref + '">' + this.errorAPILinkText + '</a>.' : '');
447
+ message =
448
+ '<p>' +
449
+ this.errorAPI +
450
+ (this.errorAPILinkText ? ' <a href="' + sanitizedHref + '">' + this.errorAPILinkText + '</a>.</p>' : '');
448
451
  let ariaMessage = this.errorAPI + (this.errorAPILinkText ? ' ' + this.errorAPILinkText : '');
449
452
 
450
453
  this.input.setAttribute('disabled', true);
@@ -459,7 +462,7 @@ export default class AutosuggestUI {
459
462
  } else {
460
463
  message = this.noResults;
461
464
  this.listbox.innerHTML = DOMPurify.sanitize(
462
- `<li class="${classAutosuggestOption} ${classAutosuggestOptionNoResults}">${message}</li>`,
465
+ `<li class="${classAutosuggestOption} ${classAutosuggestOptionNoResults}"><span class="ons-autosuggest__option-text">${message}</span></li>`,
463
466
  );
464
467
  }
465
468
  }
@@ -3,6 +3,13 @@
3
3
  margin-left: 0.25rem;
4
4
  }
5
5
 
6
+ // This element also gets a margin-left value set in the JS to match the content left spacing
7
+ &__content {
8
+ @include reading-width;
9
+
10
+ display: inline-block;
11
+ }
12
+
6
13
  &__enabled {
7
14
  background: none;
8
15
  width: fit-content;
@@ -3,7 +3,7 @@
3
3
  {% macro onsBackToTop(params) %}
4
4
  <div class="ons-back-to-top ons-js-back-to-top ons-back-to-top__enabled">
5
5
  <a href="#{{ params.anchor | default('top') }}" class="ons-back-to-top__link">
6
- <span>
6
+ <span class="ons-back-to-top__content">
7
7
  {{-
8
8
  onsIcon({
9
9
  "iconType": 'arrow-up',
@@ -30,7 +30,7 @@ layout: ~
30
30
  }
31
31
  %}
32
32
 
33
- {% block main %}
33
+ {% block mainContent %}
34
34
  <h1 class="ons-u-fs-2xl">
35
35
  <span class="ons-u-fs-m ons-u-db ons-u-mb-2xs ons-u-lighter">Press releases</span>
36
36
  <span class="ons-u-vh">: </span>
@@ -3,7 +3,7 @@ $breadcrumb-chevron-height: 0.65rem;
3
3
  .ons-breadcrumbs-wrapper {
4
4
  position: relative;
5
5
  z-index: 10;
6
- margin-bottom: -2rem;
6
+ margin-bottom: -1rem;
7
7
  &--grey {
8
8
  background-color: var(--ons-color-banner-bg);
9
9
  }
@@ -14,9 +14,9 @@ $breadcrumb-chevron-height: 0.65rem;
14
14
 
15
15
  &--navy-blue {
16
16
  background-color: var(--ons-color-navy-blue-light);
17
- margin-bottom: -1.75rem;
17
+ margin-bottom: -0.75rem;
18
18
  @include mq(l) {
19
- margin-bottom: -3.25rem;
19
+ margin-bottom: -2.25rem;
20
20
  }
21
21
  }
22
22
 
@@ -48,15 +48,12 @@ $breadcrumb-chevron-height: 0.65rem;
48
48
  &--pale-blue {
49
49
  background-color: var(--ons-color-pale-blue);
50
50
  }
51
- .ons-breadcrumbs {
52
- padding: 1rem;
53
- }
54
51
  }
55
52
 
56
53
  .ons-breadcrumbs {
57
54
  align-items: center;
58
55
  display: flex;
59
- padding: 1rem 0;
56
+ padding: 1rem 0 0;
60
57
 
61
58
  &__items {
62
59
  margin: 0;
@@ -1,33 +1,37 @@
1
1
  {% from "components/icon/_macro.njk" import onsIcon %}
2
2
  {% macro onsBreadcrumbs(params) %}
3
3
  {% set breadcrumbs %}
4
- <nav
5
- class="ons-breadcrumbs{{ ' ons-container' if params.variant }}{{ ' ' + params.classes if params.classes else '' }}"
6
- aria-label="{{ params.ariaLabel | default('Breadcrumbs') }}"
7
- {% if params.id %}id="{{ params.id }}"{% endif %}
4
+ <div
5
+ class="ons-container{{ ' ons-container--full-width' if params.fullWidth else "" }}{{ ' ons-container--wide' if params.wide else "" }}"
8
6
  >
9
- <ol class="ons-breadcrumbs__items ons-u-fs-s">
10
- {%- for item in params.itemsList -%}
11
- <li
12
- class="ons-breadcrumbs__item{{ ' ' + item.itemClasses if item.itemClasses else '' }}"
13
- id="breadcrumb-{{ loop.index }}"
14
- >
15
- <a
16
- class="ons-breadcrumbs__link{{ ' ' + item.linkClasses if item.linkClasses else '' }}"
17
- href="{% if not isDesignSystemExample %}{{ item.url }}{% else %}#0{% endif %}"
18
- {% if item.id %}{{ ' ' }}id='{{ item.id }}'{% endif %}
19
- {% if item.attributes %}{% for attribute, value in (item.attributes.items() if item.attributes is mapping and item.attributes.items else item.attributes) %}{{ ' ' }}{{ attribute }}="{{ value }}"{% endfor %}{% endif %}
20
- >{{ item.text }}</a
7
+ <nav
8
+ class="ons-breadcrumbs{{ ' ' + params.classes if params.classes else '' }}"
9
+ aria-label="{{ params.ariaLabel | default('Breadcrumbs') }}"
10
+ {% if params.id %}id="{{ params.id }}"{% endif %}
11
+ >
12
+ <ol class="ons-breadcrumbs__items ons-u-fs-s">
13
+ {%- for item in params.itemsList -%}
14
+ <li
15
+ class="ons-breadcrumbs__item{{ ' ' + item.itemClasses if item.itemClasses else '' }}"
16
+ id="breadcrumb-{{ loop.index }}"
21
17
  >
22
- {{-
23
- onsIcon({
24
- "iconType": "chevron"
25
- })
26
- -}}
27
- </li>
28
- {%- endfor -%}
29
- </ol>
30
- </nav>
18
+ <a
19
+ class="ons-breadcrumbs__link{{ ' ' + item.linkClasses if item.linkClasses else '' }}"
20
+ href="{% if not isDesignSystemExample %}{{ item.url }}{% else %}#0{% endif %}"
21
+ {% if item.id %}{{ ' ' }}id='{{ item.id }}'{% endif %}
22
+ {% if item.attributes %}{% for attribute, value in (item.attributes.items() if item.attributes is mapping and item.attributes.items else item.attributes) %}{{ ' ' }}{{ attribute }}="{{ value }}"{% endfor %}{% endif %}
23
+ >{{ item.text }}</a
24
+ >
25
+ {{-
26
+ onsIcon({
27
+ "iconType": "chevron"
28
+ })
29
+ -}}
30
+ </li>
31
+ {%- endfor -%}
32
+ </ol>
33
+ </nav>
34
+ </div>
31
35
  {% endset %}
32
36
  {% if params.variant %}
33
37
  <div class="ons-breadcrumbs-wrapper ons-breadcrumbs-wrapper--{{ params.variant }}">{{ breadcrumbs | safe }}</div>
@@ -133,6 +133,45 @@ describe('FOR: Macro: Breadcrumbs', () => {
133
133
  });
134
134
  });
135
135
 
136
+ describe('GIVEN: Params: fullWidth', () => {
137
+ describe('WHEN: fullWidth is not provided', () => {
138
+ const $ = cheerio.load(renderComponent('breadcrumbs', EXAMPLE_BREADCRUMBS_REQUIRED_PARAMS));
139
+ test('THEN: renders container without full-width class', () => {
140
+ expect($('.ons-container').hasClass('ons-container--full-width')).toBe(false);
141
+ });
142
+ });
143
+ describe('WHEN: fullWidth is set to true', () => {
144
+ const $ = cheerio.load(
145
+ renderComponent('breadcrumbs', {
146
+ ...EXAMPLE_BREADCRUMBS_REQUIRED_PARAMS,
147
+ fullWidth: true,
148
+ }),
149
+ );
150
+ test('THEN: renders container with full-width class', () => {
151
+ expect($('.ons-container').hasClass('ons-container--full-width')).toBe(true);
152
+ });
153
+ });
154
+ });
155
+ describe('GIVEN: Params: wide', () => {
156
+ describe('WHEN: wide is not provided', () => {
157
+ const $ = cheerio.load(renderComponent('breadcrumbs', EXAMPLE_BREADCRUMBS_REQUIRED_PARAMS));
158
+ test('THEN: renders container without wide class', () => {
159
+ expect($('.ons-container').hasClass('ons-container--wide')).toBe(false);
160
+ });
161
+ });
162
+ describe('WHEN: wide is set to true', () => {
163
+ const $ = cheerio.load(
164
+ renderComponent('breadcrumbs', {
165
+ ...EXAMPLE_BREADCRUMBS_REQUIRED_PARAMS,
166
+ wide: true,
167
+ }),
168
+ );
169
+ test('THEN: renders container with wide class', () => {
170
+ expect($('.ons-container').hasClass('ons-container--wide')).toBe(true);
171
+ });
172
+ });
173
+ });
174
+
136
175
  describe('GIVEN: Params: variant', () => {
137
176
  describe('WHEN: variant is provided', () => {
138
177
  const $ = cheerio.load(
@@ -0,0 +1,52 @@
1
+ ---
2
+ title: 'Example: Breadcrumbs override wide'
3
+ layout: ~
4
+ ---
5
+
6
+ {% from "components/hero/_macro.njk" import onsHero %}
7
+ {% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
8
+ {% extends "layout/_template.njk" %}
9
+ {%
10
+ set pageConfig = {
11
+ "header": {
12
+ "title": 'Service title',
13
+ "mastheadLogoUrl": '#0',
14
+ "titleUrl": '#0',
15
+ "serviceLinks": {
16
+ "id": "service-links-internal",
17
+ "ariaLabel": 'Services menu',
18
+ "ariaListLabel": 'Menu',
19
+ "toggleServicesButton": {
20
+ "text": 'Account',
21
+ "ariaLabel": 'Toggle services menu'
22
+ },
23
+ "itemsList": [
24
+ {
25
+ "text": "Jacky Turner",
26
+ "iconType": 'person'
27
+ },
28
+ {
29
+ "text": "Sign out",
30
+ "url": "#0"
31
+ }
32
+ ]
33
+ }
34
+ },
35
+ "wide": true
36
+ }
37
+ %}
38
+
39
+ {% block breadcrumbs %}
40
+ {{
41
+ onsBreadcrumbs({
42
+ "wide": true,
43
+ "ariaLabel": 'Breadcrumbs',
44
+ "itemsList": [
45
+ {
46
+ "url": '/',
47
+ "text": 'Home'
48
+ }
49
+ ]
50
+ })
51
+ }}
52
+ {% endblock %}
@@ -1,16 +1,18 @@
1
1
  {% macro onsCharLimit(params) %}
2
- {% if params.variant == "check" %}
3
- {% set content = caller() %}
4
- <span class="ons-js-char-check-input">{{ content | safe }}</span>
5
- {% endif %}
6
- <span
7
- id="{{ params.id }}"
8
- class="ons-input__limit ons-u-fs-s--b ons-u-d-no ons-u-mt-2xs"
9
- data-count-type="{{ params.variant if params.variant == 'word' else 'char' }}"
10
- data-message-singular="{% if params.variant == 'word' %}{{ params.wordCountSingular }}{% else %}{{ params.charCountSingular }}{% endif %}"
11
- data-message-plural="{% if params.variant == 'word' %}{{ params.wordCountPlural }}{% else %}{{ params.charCountPlural }}{% endif %}"
12
- data-message-over-limit-singular="{% if params.variant == 'word' %}{{ params.wordCountOverLimitSingular | default("You have exceeded the word limit by {x} word") }}{% else %}{{ params.charCountOverLimitSingular | default("You have exceeded the character limit by {x} character") }}{% endif %}"
13
- data-message-over-limit-plural="{% if params.variant == 'word' %}{{ params.wordCountOverLimitPlural | default("You have exceeded the word limit by {x} words") }}{% else %}{{ params.charCountOverLimitPlural | default("You have exceeded the character limit by {x} characters") }}{% endif %}"
14
- >
15
- </span>
2
+ <div class="ons-u-reading-width">
3
+ {% if params.variant == "check" %}
4
+ {% set content = caller() %}
5
+ <span class="ons-js-char-check-input">{{ content | safe }}</span>
6
+ {% endif %}
7
+ <span
8
+ id="{{ params.id }}"
9
+ class="ons-input__limit ons-u-fs-s--b ons-u-d-no ons-u-mt-2xs"
10
+ data-count-type="{{ params.variant if params.variant == 'word' else 'char' }}"
11
+ data-message-singular="{% if params.variant == 'word' %}{{ params.wordCountSingular }}{% else %}{{ params.charCountSingular }}{% endif %}"
12
+ data-message-plural="{% if params.variant == 'word' %}{{ params.wordCountPlural }}{% else %}{{ params.charCountPlural }}{% endif %}"
13
+ data-message-over-limit-singular="{% if params.variant == 'word' %}{{ params.wordCountOverLimitSingular | default("You have exceeded the word limit by {x} word") }}{% else %}{{ params.charCountOverLimitSingular | default("You have exceeded the character limit by {x} character") }}{% endif %}"
14
+ data-message-over-limit-plural="{% if params.variant == 'word' %}{{ params.wordCountOverLimitPlural | default("You have exceeded the word limit by {x} words") }}{% else %}{{ params.charCountOverLimitPlural | default("You have exceeded the character limit by {x} characters") }}{% endif %}"
15
+ >
16
+ </span>
17
+ </div>
16
18
  {% endmacro %}
@@ -44,7 +44,7 @@
44
44
  <section
45
45
  class="ons-cookies-banner"
46
46
  aria-label="{{ params.ariaLabel | default(ariaLabel) }}"
47
- {% if params.cookieDomainPolicy %}data-ons-cookie-domain-policy="{{ params.cookieDomainPolicy }}"{% endif %}
47
+ {% if params.cookieDomain is defined %}data-ons-cookie-domain="{{ params.cookieDomain if params.cookieDomain else '' }}"{% endif %}
48
48
  >
49
49
  <div
50
50
  class="ons-container{{ ' ons-container--full-width' if params.fullWidth }}{{ ' ons-container--wide' if params.wide }} ons-cookies-banner__primary"
@@ -39,10 +39,22 @@ describe('macro: cookies-banner', () => {
39
39
  expect($('.ons-cookies-banner').attr('aria-label')).toBe('Cookies banner override');
40
40
  });
41
41
 
42
- it('sets cookie domain policy data attribute when `cookieDomainPolicy` is provided', () => {
43
- const $ = cheerio.load(renderComponent('cookies-banner', { ...EXAMPLE_COOKIES_BANNER_PARAMS, cookieDomainPolicy: 'day1' }));
42
+ it('sets cookie domain data attribute when `cookieDomain` is provided', () => {
43
+ const $ = cheerio.load(renderComponent('cookies-banner', { ...EXAMPLE_COOKIES_BANNER_PARAMS, cookieDomain: 'census.gov.uk' }));
44
44
 
45
- expect($('.ons-cookies-banner').attr('data-ons-cookie-domain-policy')).toBe('day1');
45
+ expect($('.ons-cookies-banner').attr('data-ons-cookie-domain')).toBe('census.gov.uk');
46
+ });
47
+
48
+ it('renders an empty domain attribute when `cookieDomain` is false', () => {
49
+ const $ = cheerio.load(renderComponent('cookies-banner', { cookieDomain: false }));
50
+
51
+ expect($('.ons-cookies-banner').attr('data-ons-cookie-domain')).toBe('');
52
+ });
53
+
54
+ it('omits the domain attribute when `cookieDomain` is not provided', () => {
55
+ const $ = cheerio.load(renderComponent('cookies-banner'));
56
+
57
+ expect($('.ons-cookies-banner').attr('data-ons-cookie-domain')).toBeUndefined();
46
58
  });
47
59
 
48
60
  describe('initial banner', () => {
@@ -77,6 +77,15 @@ $details-caret-width: 1.75rem;
77
77
  display: block;
78
78
  margin: 1rem 0 0 0.5rem;
79
79
  padding: 0 0 0 1.5rem;
80
+
81
+ // Restrict the width of textual content within the details content (paragraphs are already globally restricted)
82
+
83
+ ul,
84
+ ol,
85
+ label,
86
+ legend {
87
+ @include reading-width;
88
+ }
80
89
  }
81
90
  }
82
91
 
@@ -16,6 +16,6 @@
16
16
  "variant": "warn"
17
17
  })
18
18
  %}
19
- Someone in your household must still complete a survey using a household access code
19
+ <p>Someone in your household must still complete a survey using a household access code</p>
20
20
  {% endcall %}
21
21
  {% endcall %}
@@ -21,7 +21,7 @@
21
21
  })
22
22
  }}
23
23
  </span>
24
- <span class="ons-details-panel__banner-detail-title">
24
+ <span class="ons-details-panel__banner-detail-title ons-u-reading-width">
25
25
  <span class="ons-details-panel__banner-detail-title--open"> {{ openText }} </span>
26
26
  <span class="ons-details-panel__banner-detail-title--close"> {{ closeText }} </span>
27
27
  </span>
@@ -31,12 +31,12 @@
31
31
 
32
32
  {# The media (a nested figure containing a chart or image) is provided via the caller
33
33
  block, so the article does not need to know how the content is rendered. #}
34
- <div class="ons-featured__media">
35
- {{ caller() if caller }}
36
- </div>
34
+ <div class="ons-featured__media">{{ caller() if caller }}</div>
37
35
 
38
36
  {% if params.description %}
39
- <div class="ons-featured__description">{{ params.description | safe }}</div>
37
+ <div class="ons-featured__description">
38
+ <div class="ons-u-reading-width">{{ params.description | safe }}</div>
39
+ </div>
40
40
  {% endif %}
41
41
  </div>
42
42
  {% endmacro %}
@@ -123,8 +123,8 @@ describe('Macro: Featured Article', () => {
123
123
  EXAMPLE_CHART_CALLER_CONTENT,
124
124
  ),
125
125
  );
126
- const title = $('.ons-featured__description').html().trim();
127
- expect(title).toBe('Some description');
126
+ const description = $('.ons-featured__description .ons-u-reading-width').html().trim();
127
+ expect(description).toBe('Some description');
128
128
  });
129
129
  });
130
130
  });
@@ -7,6 +7,9 @@
7
7
  {{ params.heading }}
8
8
  {{ closingHeadingTag | safe }}
9
9
  <p class="ons-feedback__content">{{- params.content | safe -}}</p>
10
- <a href="{{ params.linkUrl }}" class="ons-feedback__link">{{- params.linkText -}}</a>
10
+ {# p tag ensures reading width is applied #}
11
+ <p class="ons-u-mb-no">
12
+ <a href="{{ params.linkUrl }}" class="ons-feedback__link">{{- params.linkText -}}</a>
13
+ </p>
11
14
  </div>
12
15
  {% endmacro %}
@@ -110,7 +110,7 @@ describe('FOR: Macro: Feedback', () => {
110
110
  describe('WHEN: content is provided', () => {
111
111
  const $ = cheerio.load(renderComponent('feedback', EXAMPLE_FEEDBACK));
112
112
  test('THEN: renders paragraph with the provided content', () => {
113
- expect($('p').text().trim()).toBe('Feedback content...');
113
+ expect($('p').first().text().trim()).toBe('Feedback content...');
114
114
  });
115
115
  });
116
116
  });
@@ -6,6 +6,7 @@
6
6
  font-size: 1.125rem;
7
7
  font-weight: $font-weight-bold;
8
8
  line-height: 1.3;
9
+ display: block;
9
10
  }
10
11
 
11
12
  &__title {