diff --git a/src/patterns/check-answers/default/index.njk b/src/patterns/check-answers/default/index.njk index 3de4d5fede..34b9778421 100644 --- a/src/patterns/check-answers/default/index.njk +++ b/src/patterns/check-answers/default/index.njk @@ -160,7 +160,7 @@ layout: layout-example-full-page.njk text: "Licence period" }, value: { - html: '

This is a longer paragraph of text provided by the user to provide additional information.

This is a second paragraph of text provided by the user.

' + text: "Valid for 6 months" }, actions: { items: [ @@ -184,7 +184,7 @@ layout: layout-example-full-page.njk {{ govukButton({ - text: "Accept and send application" + text: "Accept and send" }) }} diff --git a/src/patterns/check-answers/index.md.njk b/src/patterns/check-answers/index.md.njk index c758b8980f..0bf0e3c5f9 100644 --- a/src/patterns/check-answers/index.md.njk +++ b/src/patterns/check-answers/index.md.njk @@ -15,9 +15,9 @@ Let users check their answers before submitting information to a service. ## When to use this pattern -Show a single Check answers page immediately before the confirmation screen for small to medium-sized transactions. +Show a single check answers page immediately before the confirmation screen for small to medium-sized transactions. -When designing a very large transaction with multiple sections, it may help to include a Check answers pages at the end of each section. +When designing a very large transaction with multiple sections, it may help to include a check answers pages at the end of each section. This can be valuable for services where different users might be completing each section. You should test this approach with your users to find out if it’s helpful. @@ -30,7 +30,7 @@ Check answers pages help to: ### Make the page easy to understand -On your Check answers page you should: +On your check answers page you should: - make it clear there’s a task to perform on the page - make it clear that the transaction will not be complete until a user confirms their information is correct @@ -41,14 +41,14 @@ On your Check answers page you should: ### Let users go back and change their answers -You should provide a ‘Change’ link next to each section on your Check answers page so that users can add or change the information. +You should provide a ‘Change’ link next to each section on your check answers page so that users can add or change the information. The answers pages should look the same way they did when the user last used them, with all their answers pre-populated. -When they’ve finished, the ‘Continue’ button should return them to the Check answers page. They should not need to go through the rest of the transaction again. +When they’ve finished, the ‘Continue’ button should return them to the check answers page. They should not need to go through the rest of the transaction again. -If a user changes their response in a way that means you need to ask them more questions, do this before returning them to the Check answers page. +If a user changes their response in a way that means you need to ask them more questions, do this before returning them to the check answers page. ## Research on this pattern -Read a blog about [how the Carer’s Allowance Service used Check answers to improve its users’ experience](https://dwpdigital.blog.gov.uk/2016/07/08/a-live-service-is-not-the-end-of-the-story/). +Read a blog about [how the Carer’s Allowance Service used check answers to improve its users’ experience](https://dwpdigital.blog.gov.uk/2016/07/08/a-live-service-is-not-the-end-of-the-story/). diff --git a/src/styles/layout/combinations/index.njk b/src/styles/layout/combinations/index.njk index 728ac2479f..bb841da4cf 100644 --- a/src/styles/layout/combinations/index.njk +++ b/src/styles/layout/combinations/index.njk @@ -4,7 +4,7 @@ layout: layout-example.njk ignore_in_sitemap: true stylesheets: - ../grid-annotate.css -- grid-combinations-annotate.css +- ../grid-combinations-annotate.css ---
diff --git a/src/styles/layout/desktop/index.njk b/src/styles/layout/desktop/index.njk new file mode 100644 index 0000000000..1dc7b260e9 --- /dev/null +++ b/src/styles/layout/desktop/index.njk @@ -0,0 +1,17 @@ +--- +title: Desktop grid classes – Layout +layout: layout-example.njk +ignore_in_sitemap: true +stylesheets: +- ../grid-annotate.css +- ../grid-combinations-annotate.css +--- + +
+
+

govuk-grid-column-two-thirds-from-desktop

+
+
+

govuk-grid-column-one-third-from-desktop

+
+
diff --git a/src/styles/layout/combinations/grid-combinations-annotate.scss b/src/styles/layout/grid-combinations-annotate.scss similarity index 100% rename from src/styles/layout/combinations/grid-combinations-annotate.scss rename to src/styles/layout/grid-combinations-annotate.scss diff --git a/src/styles/layout/index.md.njk b/src/styles/layout/index.md.njk index 0cc5ded6e9..aa917fcb40 100644 --- a/src/styles/layout/index.md.njk +++ b/src/styles/layout/index.md.njk @@ -100,6 +100,16 @@ The available widths are: {{ example({group: "styles", item: "layout", example: "combinations", html: true, open: true, size: "xl"}) }} +### Desktop specific grid classes + +To specify a width at the desktop breakpoint you can use the desktop specific grid classes. For example `govuk-grid-column-two-thirds-from-desktop` will set your column width to be two-thirds width at the desktop breakpoint only. + +{{ example({group: "styles", item: "layout", example: "desktop", html: true, open: true, size: "m"}) }} + +The desktop specific classes also allow you to set the width of the tablet breakpoint by using them in combination with the standard grid classes. For example using `govuk-grid-column-one-half` and `govuk-grid-column-two-thirds-from-desktop` together will mean the column will be one-half at the tablet breakpoint and two-thirds width at desktop. + +{{ example({group: "styles", item: "layout", example: "tablet-desktop", html: true, open: true, size: "m"}) }} + ### Nested grids {{ example({group: "styles", item: "layout", example: "nested", html: true, open: true, size: "m"}) }} diff --git a/src/styles/layout/tablet-desktop/index.njk b/src/styles/layout/tablet-desktop/index.njk new file mode 100644 index 0000000000..b22f659451 --- /dev/null +++ b/src/styles/layout/tablet-desktop/index.njk @@ -0,0 +1,16 @@ +--- +title: Desktop and tablet grid classes – Layout +layout: layout-example.njk +ignore_in_sitemap: true +stylesheets: +- ../grid-annotate.css +--- + +
+
+

govuk-grid-column-one-half

govuk-grid-column-two-thirds-from-desktop

+
+
+

govuk-grid-column-one-half

govuk-grid-column-one-third-from-desktop

+
+