Skip to content

Commit

Permalink
Merge branch 'master' into card-updates-dac
Browse files Browse the repository at this point in the history
  • Loading branch information
@trevorsaint
trevorsaint authored Jan 26, 2021
2 parents 12b7a0e + ef32207 commit 5804b3a
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 25 deletions.
2 changes: 1 addition & 1 deletion src/components/label/_macro-options.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
| Name | Type | Required | Description |
| ----------- | ------ | -------- | ---------------------------------------------------------------------------------------------------------- |
| text | string | true | The text content of the label |
| for | string | false | The id of the input this label is for |
| for | string | true | The id of the input this label is for |
| description | string | false | A secondary piece of information to help describe the input |
| id | string | false | The id for the label |
| classes | string | false | classes to add to the label |
Expand Down
1 change: 1 addition & 0 deletions src/components/panel/_macro-options.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
| id | string | false | Custom id to add to the panel |
| attributes | object | false | HTML attributes to apply to the panel (e.g. data attributes) |
| icon | string | false | Set this to the name of the icon you want to be included before the contents of the panel |
| iconText | string | false | Overrides the accessible text for `warn` and `warn-branded` panel icons |
| iconSize | string | false | Set this to the size of the icon you want can be set to "m", "l" "xl" to match heading size. Defaults to the size of regualar text |
| iconsPath | string | false | Set this to the path to the icon you want to be included before the contents of the panel |
| dsExample | boolean | false | Defaulted to `true` in Design System examples but wont be set when used outside of the Design System. This will stop the page focusing on the panel on load - _only for use in DS examples_ |
6 changes: 6 additions & 0 deletions src/components/panel/_macro.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@

{% if params is defined and params and params.type == "warn" or params.type == "warn-branded" %}
<span class="panel__icon" aria-hidden="true">!</span>
<strong>
<span class="u-vh">{{ params.iconText | default("Warning: ") }}</span>
{% endif %}

{% if params is defined and params and params.title is defined and params.title %}
Expand All @@ -55,6 +57,10 @@
{{ caller() if caller }}
</div>

{% if params is defined and params and params.type == "warn" or params.type == "warn-branded" %}
</strong>
{% endif %}

</div>

{% if params is defined and params and params.type == "warn-branded" %}
Expand Down
4 changes: 2 additions & 2 deletions src/components/panel/examples/bare/index.njk
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% from "components/panel/_macro.njk" import onsPanel %}

{% call onsPanel({
type: "bare",
icon: "lock"
type: 'bare',
icon: 'lock'
})
%}
Here is some text with an icon.
Expand Down
2 changes: 1 addition & 1 deletion src/components/panel/examples/branded/index.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
---
{% from "components/panel/_macro.njk" import onsPanel %}
{% call onsPanel({
"type": "branded"
"type": 'branded'
})
%}
This guidance is for the paper questionnaire.<br>View the <a href="#0">question guidance for completing the census online</a>.
Expand Down
20 changes: 10 additions & 10 deletions src/components/panel/examples/error-header/index.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
{% from "components/lists/_macro.njk" import onsList %}

{% call onsPanel({
"title": "There are 2 problems with your answer",
"titleTag": "h1",
"type": "error",
"title": 'There are 2 problems with your answer',
"titleTag": 'h1',
"type": 'error',
"dsExample": isPatternLib
}) %}
{{
onsList({
"element": "ol",
"element": 'ol',
"itemsList": [
{
"text": "Enter a number",
"url": "#container-test-number",
"classes": "js-inpagelink"
"text": 'Enter a number',
"url": '#container-test-number',
"classes": 'js-inpagelink'
},
{
"text": "Enter a number less than or equal to 100",
"url": "#container-test-percent",
"classes": "js-inpagelink"
"text": 'Enter a number less than or equal to 100',
"url": '#container-test-percent',
"classes": 'js-inpagelink'
}
]
})
Expand Down
10 changes: 5 additions & 5 deletions src/components/panel/examples/error/index.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

{{
onsInput({
"id": "number",
"type": "number",
"classes": "input--w-5",
"id": 'number',
"type": 'number',
"classes": 'input--w-5',
"attributes": {
"min": 0,
"required": true
},
"label": {
"text": "Number of employees paid monthly"
"text": 'Number of employees paid monthly'
},
"error": {
"text": "Enter a number",
"text": 'Enter a number',
"dsExample": isPatternLib
}
})
Expand Down
2 changes: 1 addition & 1 deletion src/components/panel/examples/information/index.njk
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% from "components/panel/_macro.njk" import onsPanel %}
{{
onsPanel({
"body": "<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p><ul><li>VAT</li><li>Internet sales</li></ul>"
"body": '<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p><ul><li>VAT</li><li>Internet sales</li></ul>'
})
}}
8 changes: 4 additions & 4 deletions src/components/panel/examples/success/index.njk
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% from "components/panel/_macro.njk" import onsPanel %}
{{
onsPanel({
"type": "success",
"id": "success-id",
"icon": "check",
"body": "Information has been successfully submitted."
"type": 'success',
"id": 'success-id',
"icon": 'check',
"body": 'Information has been successfully submitted.'
})
}}
2 changes: 1 addition & 1 deletion src/components/panel/examples/warn/index.njk
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% from "components/panel/_macro.njk" import onsPanel %}

{% call onsPanel({
"type": "warn"
"type": 'warn'
})
%}
All of the information about this person will be deleted
Expand Down

0 comments on commit 5804b3a

Please sign in to comment.