Skip to content

Commit

Permalink
Merge pull request #1201 from alphagov/heading-sizes
Browse files Browse the repository at this point in the history
Change default heading size and update guidance
  • Loading branch information
Chris Thomas authored Apr 9, 2020
2 parents 6587398 + 3ab5c38 commit 415df5a
Show file tree
Hide file tree
Showing 56 changed files with 64 additions and 66 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ layout: layout-example.njk
maxlength: 200,
label: {
text: "Describe the nature of your event",
classes: "govuk-label--xl",
classes: "govuk-label--l",
isPageHeading: true
}
}) }}
2 changes: 1 addition & 1 deletion src/components/checkboxes/conditional-reveal/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ layout: layout-example.njk
legend: {
text: "How would you like to be contacted?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/checkboxes/default/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ layout: layout-example.njk
legend: {
text: "Which types of waste do you transport?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/checkboxes/error/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ layout: layout-example.njk
legend: {
text: "What is your nationality?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/checkboxes/hint/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ layout: layout-example.njk
legend: {
text: "What is your nationality?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/date-input/date-of-birth/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ layout: layout-example.njk
legend: {
text: "What is your date of birth?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/date-input/default/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ layout: layout-example.njk
legend: {
text: "When was your passport issued?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/date-input/error/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ layout: layout-example.njk
legend: {
text: "When was your passport issued?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/error-message/default/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ layout: layout-example.njk
legend: {
text: "When was your passport issued?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/error-message/legend/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ layout: layout-example.njk
legend: {
text: "What is your nationality?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/error-summary/full-page-example/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ layout: layout-example-full-page.njk
legend: {
isPageHeading: true,
text: 'When was your passport issued?',
classes: 'govuk-fieldset__legend--xl'
classes: 'govuk-fieldset__legend--l'
}
},
id: 'passport-issued',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ layout: layout-example.njk
legend: {
text: "What is your nationality?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ layout: layout-example.njk
legend: {
isPageHeading: true,
text: 'When was your passport issued?',
classes: 'govuk-fieldset__legend--xl'
classes: 'govuk-fieldset__legend--l'
}
},
id: 'passport-issued',
Expand Down
2 changes: 1 addition & 1 deletion src/components/error-summary/linking/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ layout: layout-example.njk
]
}) }}

<h1 class="govuk-heading-xl">Your details</h1>
<h1 class="govuk-heading-l">Your details</h1>

{{ govukInput({
label: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/fieldset/address-group/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ stylesheets:
{% call govukFieldset({
legend: {
text: "What is your address?",
classes: "govuk-fieldset__legend--xl",
classes: "govuk-fieldset__legend--l",
isPageHeading: true
}
}) %}
Expand Down
2 changes: 1 addition & 1 deletion src/components/fieldset/default/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ layout: layout-example.njk
{{ govukFieldset({
legend: {
text: "Legend as page heading",
classes: "govuk-fieldset__legend--xl",
classes: "govuk-fieldset__legend--l",
isPageHeading: true
}
}) }}
2 changes: 1 addition & 1 deletion src/components/radios/conditional-reveal/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ layout: layout-example.njk
legend: {
text: "How would you prefer to be contacted?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/radios/default/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ layout: layout-example.njk
legend: {
text: "Have you changed your name?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/radios/divider/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ layout: layout-example.njk
legend: {
text: "Where do you live?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
items: [
Expand Down
2 changes: 1 addition & 1 deletion src/components/radios/error/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ layout: layout-example.njk
legend: {
text: "Have you changed your name?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/radios/hint/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ layout: layout-example.njk
legend: {
text: "How do you want to sign in?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/radios/stacked/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ layout: layout-example.njk
legend: {
text: "Where do you live?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
items: [
Expand Down
2 changes: 1 addition & 1 deletion src/errors/404.njk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ignore_in_sitemap: true

<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">Page not found</h1>
<h1 class="govuk-heading-l">Page not found</h1>

<p class="govuk-body">If you typed the web address, check it is correct.</p>
<p class="govuk-body">If you pasted the web address, check you copied the entire address.</p>
Expand Down
2 changes: 1 addition & 1 deletion src/errors/generic.njk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ignore_in_sitemap: true

<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">Sorry, there is a problem with the service</h1>
<h1 class="govuk-heading-l">Sorry, there is a problem with the service</h1>
<p class="govuk-body-l">Try again later.</p>

<p class="govuk-body">
Expand Down
6 changes: 3 additions & 3 deletions src/get-started/labels-legends-headings/label-h1/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ layout: layout-example.njk

{{ govukInput({
label: {
text: "govuk-label--xl",
classes: "govuk-label--xl",
text: "govuk-label--l",
classes: "govuk-label--l",
isPageHeading: true
},
hint: {
text: "This example shows an <h1> around a <label> with the class of govuk-label--xl"
text: "This example shows an <h1> around a <label> with the class of govuk-label--l"
},
id: "example",
name: "example"
Expand Down
6 changes: 3 additions & 3 deletions src/get-started/labels-legends-headings/legend-h1/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ layout: layout-example.njk
name: "checkbox",
fieldset: {
legend: {
text: "govuk-fieldset__legend--xl",
text: "govuk-fieldset__legend--l",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
text: "This example shows an <h1> inside a <legend> with the class of govuk-fieldset__legend--xl."
text: "This example shows an <h1> inside a <legend> with the class of govuk-fieldset__legend--l."
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/addresses/multiple/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ stylesheets:
{% call govukFieldset({
legend: {
text: "What is your address?",
classes: "govuk-fieldset__legend--xl",
classes: "govuk-fieldset__legend--l",
isPageHeading: true
}
}) %}
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/bank-details/branch/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ layout: layout-example.njk
fieldset: {
legend: {
isPageHeading: true,
classes: "govuk-fieldset__legend--xl",
classes: "govuk-fieldset__legend--l",
text: "How do you want to be paid?"
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/bank-details/default/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ layout: layout-example.njk
{% from "govuk/components/button/macro.njk" import govukButton %}
{% from "govuk/components/input/macro.njk" import govukInput %}

<h1 class="govuk-heading-xl">Bank or building society account details</h1>
<h1 class="govuk-heading-l">Bank or building society account details</h1>

{{ govukInput({
label: {
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/check-answers/default/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ layout: layout-example-full-page.njk
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds-from-desktop">

<h1 class="govuk-heading-xl">Check your answers before sending your application</h1>
<h1 class="govuk-heading-l">Check your answers before sending your application</h1>

<h2 class="govuk-heading-m">Personal details</h2>

Expand Down
2 changes: 1 addition & 1 deletion src/patterns/dates/default/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ layout: layout-example.njk
legend: {
text: "When was your passport issued?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/dates/error/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ layout: layout-example.njk
legend: {
text: "When was your passport issued?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/dates/memorable-date/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ layout: layout-example.njk
legend: {
text: "What is your date of birth?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/ethnic-group/default/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ layout: layout-example.njk
legend: {
text: "What is your ethnic group?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
items: [
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/ethnic-group/error/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ layout: layout-example.njk
legend: {
text: "What is your ethnic group?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
errorMessage: {
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/page-not-found-pages/default/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ layout: layout-example-full-page.njk
{% block content %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">Page not found</h1>
<h1 class="govuk-heading-l">Page not found</h1>
<p class="govuk-body">
If you typed the web address, check it is correct.
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ layout: layout-example-full-page.njk
{% block content %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">Sorry, there is a problem with the service</h1>
<h1 class="govuk-heading-l">Sorry, there is a problem with the service</h1>
<p class="govuk-body">Try again later.</p>
<p class="govuk-body">We saved your answers. They will be available for 30 days.</p>
<p class="govuk-body">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ layout: layout-example-full-page.njk
{% block content %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">Sorry, there is a problem with the service</h1>
<h1 class="govuk-heading-l">Sorry, there is a problem with the service</h1>
<p class="govuk-body">Try again later.</p>
<p class="govuk-body">
You can <a class="govuk-link" href="#">change other VAT details</a>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ layout: layout-example-full-page.njk
{% block content %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">Sorry, there is a problem with the service</h1>
<h1 class="govuk-heading-l">Sorry, there is a problem with the service</h1>
<p class="govuk-body">Try again later.</p>
<p class="govuk-body">
We have not saved your answers. When the service is available, you will have to start again.
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/question-pages/date-of-birth/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ layout: layout-example-full-page.njk
legend: {
text: "What is your date of birth?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
hint: {
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/question-pages/default/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ layout: layout-example-full-page.njk
legend: {
text: "Where do you live?",
isPageHeading: true,
classes: "govuk-fieldset__legend--xl"
classes: "govuk-fieldset__legend--l"
}
},
items: [
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/question-pages/passport/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ layout: layout-example-full-page.njk
{% block content %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">Passport details</h1>
<h1 class="govuk-heading-l">Passport details</h1>

<form action="/form-handler" method="post" novalidate>

Expand Down
Loading

0 comments on commit 415df5a

Please sign in to comment.