Skip to content

Commit

Permalink
Update highlight CSS for strong tags (#3068)
Browse files Browse the repository at this point in the history
  • Loading branch information
rmccar committed Mar 6, 2024
1 parent 4f04064 commit 37384e1
Show file tree
Hide file tree
Showing 19 changed files with 221 additions and 219 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 6 additions & 9 deletions src/components/access-code/example-access-code-error.njk
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ layout: ~
{% from "components/details/_macro.njk" import onsDetails %}

{% set pageConfig = {
"title": "Study title"
"title": "Study title"
} %}

{% block main %}
{% call
onsPanel({
{% call onsPanel({
title: "There is a problem with this page",
type: "error"
})
Expand Down Expand Up @@ -67,18 +66,16 @@ layout: ~
{% set content %}
<p>If you need to answer separately from the people you live with, you can <a href="#0">request an individual access code</a>.</p>
{% call onsPanel({
"type": "warn"
})
%}
"type": "warn"
}) %}
Someone in your household must still complete a study using this household access code
{% endcall %}
{% endset %}

{% call onsDetails({
"id": "details-access-code-error",
"id": "details-access-code-error",
"title": "Need to answer separately from your household?"
})
%}
}) %}
{{ content | safe }}
{% endcall %}
{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"text": 'Topic'
}
},
"description": '<p>Figures on <strong class="ons-highlight">crime</strong> levels and trends for England and Wales based primarily on two sets of statistics: the <strong class="ons-highlight">Crime</strong> Survey for England and Wales (CSEW) and police recorded crime data.</p>
"description": '<p>Figures on <mark>crime</mark> levels and trends for England and Wales based primarily on two sets of statistics: the <mark>Crime</mark> Survey for England and Wales (CSEW) and police recorded crime data.</p>
<p>View all <a href="#0">datasets</a> or <a href="#0">publications</a> related to <a href="#0">Crime and justice</a></p>'
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"text": 'Topic'
}
},
"description": '<p>Figures on <strong class="ons-highlight">crime</strong> levels and trends for England and Wales based primarily on two sets of statistics: the <strong class="ons-highlight">Crime</strong> Survey for England and Wales (CSEW) and police recorded <strong class="ons-highlight">crime</strong> data.</p>
"description": '<p>Figures on <mark>crime</mark> levels and trends for England and Wales based primarily on two sets of statistics: the <mark>Crime</mark> Survey for England and Wales (CSEW) and police recorded <mark>crime</mark> data.</p>
<p>View all <a href="#0">datasets</a> or <a href="#0">publications</a> related to <a href="#0">Crime and justice</a></p>'
},
{
Expand All @@ -29,7 +29,7 @@
"short": '18 February 2021'
}
},
"description": '<p>Domestic abuse and sexual assault outcomes for disabled people in England and Wales aged 16 to 59 years, with analysis by age, sex, impairment type, impairment severity, country and region using the <strong class="ons-highlight">Crime</strong> Survey for England and Wales (CSEW) data.</p>'
"description": '<p>Domestic abuse and sexual assault outcomes for disabled people in England and Wales aged 16 to 59 years, with analysis by age, sex, impairment type, impairment severity, country and region using the <mark>Crime</mark> Survey for England and Wales (CSEW) data.</p>'
},
{
"url": '#0',
Expand All @@ -45,7 +45,7 @@
"short": '2 December 2019'
}
},
"description": '<p>An overview of published data on disability and <strong class="ons-highlight">crime</strong> in the UK and analysis of the experience of domestic abuse and sexual assault for disabled adults aged 16 to 59 years in England and Wales. Analysis by age, sex and impairment type.</p>'
"description": '<p>An overview of published data on disability and <mark>crime</mark> in the UK and analysis of the experience of domestic abuse and sexual assault for disabled adults aged 16 to 59 years in England and Wales. Analysis by age, sex and impairment type.</p>'
},
{
"url": '#0',
Expand Down
3 changes: 1 addition & 2 deletions src/components/fieldset/_fieldset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
margin: 0;
padding: 0 0 1.5rem;

strong,
.ons-highlight {
strong {
@extend .ons-highlight;
}
}
Expand Down
5 changes: 1 addition & 4 deletions src/components/question/_question.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@
&__title {
@extend .ons-u-mb-m;

em,
.ons-highlight {
@extend .ons-highlight;
}
mark,
.ons-instruction {
background-color: var(--ons-color-instruction);
color: var(--ons-color-text-inverse);
margin-right: 0.5rem;
padding: 0 0.5rem;
box-shadow: none;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ layout: ~

{% block main %}
{% call onsQuestion({
"title": "<mark class=\"ons-instruction\">Interviewer note:</mark>Who to interview",
"title": "<mark>Interviewer note:</mark>Who to interview",
"instruction": "<p>Only interview a person who was usually living at the property on <strong>Sunday 21 March 2021</strong>.</p><p>If none of those house members are available, you must save and sign out and return to the address to interview one of them at a later date.</p>",
"submitButton": {
"variants": "timer",
Expand Down
3 changes: 1 addition & 2 deletions src/components/relationships/example-relationships-error.njk
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ layout: ~

{% block main %}

{% call
onsPanel({
{% call onsPanel({
title: "There is a problem with your answer",
type: "error"
})
Expand Down
6 changes: 3 additions & 3 deletions src/foundations/highlighting/example-highlighting.njk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
"noRawTab": true
---
<h1>What was the value of the business’s total sales of <strong class="ons-highlight">food</strong>?</h1>
<h1>Of the <strong class="ons-highlight">423</strong> employees how many were part-time?</h1>
<h3>You said <strong class="ons-highlight">0</strong> visitors are staying overnight here on Sunday 21 March 2021</h3>
<h1>What was the value of the business’s total sales of <strong>food</strong>?</h1>
<h1>Of the <strong>423</strong> employees how many were part-time?</h1>
<h3>You said <strong>0</strong> visitors are staying overnight here on Sunday 21 March 2021</h3>
5 changes: 2 additions & 3 deletions src/patterns/hub-and-spoke/example-spoke-continue.njk
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,12 @@ layout: ~
} %}

{% block main %}
{% call onsPanel()
%}
{% call onsPanel() %}
<p><strong>This is the last viewed question in this section</strong><br>
You can also <a href="/patterns/hub-and-spoke/examples/spoke-start/">go back to the start of the section</a></p>
{% endcall %}
{% call onsQuestion({
"title": 'What is <strong class="ons-highlight">John Smith’s</strong> date of birth?',
"title": 'What is <strong>John Smith’s</strong> date of birth?',
"description": '<p>For example, 31 3 1980</p>',
"legendIsQuestionTitle": true,
"submitButton": {
Expand Down
Loading

0 comments on commit 37384e1

Please sign in to comment.