Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update design system to v67 #951

Merged
merged 2 commits into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .design-system-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
66.0.2
67.0.0
4 changes: 2 additions & 2 deletions _infra/helm/frontstage/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ type: application

# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 2.4.92
version: 2.4.93

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 2.4.92
appVersion: 2.4.93
6 changes: 3 additions & 3 deletions frontstage/templates/cookies.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% from "components/radios/_macro.njk" import onsRadios %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/panel/_macro.njk" import onsPanel %}
{% from "components/collapsible/_macro.njk" import onsCollapsible %}
{% from "components/details/_macro.njk" import onsDetails %}
{% from "components/table/_macro.njk" import onsTable %}
{% from "components/list/_macro.njk" import onsList %}

Expand Down Expand Up @@ -58,7 +58,7 @@ <h3>Cookies that measure website use</h3>
]
})
}}
{% call onsCollapsible({
{% call onsDetails({
"id": "cookies-measure-website-use-details",
"classes": "ons-u-mb-s",
"title": "Learn more about these Google Analytics cookies",
Expand Down Expand Up @@ -214,7 +214,7 @@ <h3 class="ons-u-mt-l">Strictly necessary cookies</h3>
})
}}
<p>They always need to be on.</p>
{% call onsCollapsible({
{% call onsDetails({
"id": "cookies-essential-details",
"classes": "ons-u-mb-l",
"title": "Learn more about these essential cookies",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

{% extends "layouts/_block_content.html" %}
{% from "components/collapsible/_macro.njk" import onsCollapsible %}
{% from "components/details/_macro.njk" import onsDetails %}

{% set page_title = "Check your email - Forgot password" %}

Expand All @@ -9,7 +9,7 @@
<h1 class="ons-u-fs-xl">Password reset request sent</h1>
<p>If {{ email }} is registered to an account, you'll receive an email with instructions to reset your password</p>

{% call onsCollapsible({
{% call onsDetails({
"id": "guidance-help-with-email",
"title": "Help with email",
"button": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

{% extends "layouts/_block_content.html" %}
{% from "components/collapsible/_macro.njk" import onsCollapsible %}
{% from "components/details/_macro.njk" import onsDetails %}

{% set page_title = "Check your email - Forgot password" %}

Expand Down Expand Up @@ -44,7 +44,7 @@ <h1 class="ons-u-fs-xl">Check your email</h1>

<p>Please follow the link in the email we've sent to <b>{{ email }}</b> to reset your password and sign in to your account.</p>

{% call onsCollapsible({
{% call onsDetails({
"id": "guidance-help-with-email",
"title": "Help with email",
"button": {
Expand Down
4 changes: 2 additions & 2 deletions frontstage/templates/register/almost-done.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

{% extends "layouts/_block_content.html" %}
{% from "components/collapsible/_macro.njk" import onsCollapsible %}
{% from "components/details/_macro.njk" import onsDetails %}

{% set page_title = "Check your email" %}

Expand All @@ -9,7 +9,7 @@ <h1 class="ons-u-fs-xl">Almost done...</h1>
<p id="email_confirmation_sent">We've sent an email to {{ email }}</p>
<p>Please follow the link in the email to confirm your email address and finish setting up your account.</p>

{% call onsCollapsible({
{% call onsDetails({
"id": "guidance-help-with-email",
"title": "Help with email",
"button": {
Expand Down
4 changes: 2 additions & 2 deletions frontstage/templates/sign-in/sign-in.account-locked.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

{% extends "layouts/_block_content.html" %}
{% from "components/collapsible/_macro.njk" import onsCollapsible %}
{% from "components/details/_macro.njk" import onsDetails %}

{% set page_title = "Trouble signing in?" %}

Expand All @@ -10,7 +10,7 @@ <h1 class="ons-u-fs-xl">Check your email</h1>
<p>You've tried to sign in a few times with the wrong details.</p>
<p>If {{ form.data['username'] }} is registered to an account, we'll send an email explaining how to sign in.</p>

{% call onsCollapsible({
{% call onsDetails({
"id": "guidance-help-with-email",
"title": "Help with email",
"button": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

{% extends "layouts/_block_content.html" %}
{% from "components/collapsible/_macro.njk" import onsCollapsible %}
{% from "components/details/_macro.njk" import onsDetails %}

{% set page_title = "Check your email" %}

Expand All @@ -9,7 +9,7 @@
<h1 class="ons-u-fs-xl">Check your email</h1>
<p id="email_confirmation_sent">Please follow the link in the email we've sent you to verify your email address and sign in to your account.</p>

{% call onsCollapsible({
{% call onsDetails({
"id": "guidance-help-with-email",
"title": "Help with email",
"button": {
Expand Down
4 changes: 2 additions & 2 deletions frontstage/templates/surveys/surveys-access.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends 'layouts/_base.html' %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/collapsible/_macro.njk" import onsCollapsible %}
{% from "components/details/_macro.njk" import onsDetails %}
{% from "components/list/_macro.njk" import onsList %}

{% set page_title = survey_info.longName ~ ' ' ~ collection_exercise_info.userDescription %}
Expand Down Expand Up @@ -51,7 +51,7 @@ <h2 class="ons-u-mt-m">Upload your spreadsheet</h2>
<p>Please upload by <strong>{{ collection_exercise_info.scheduledReturnDateTimeFormatted }}</strong></p>
{% endif %}

{% call onsCollapsible({
{% call onsDetails({
"id": "collapsible",
"classes": "ons-u-mb-m",
"title": "Guidance for uploading",
Expand Down
Loading