diff --git a/src/open_inwoner/components/templates/components/Contact/ContactForm.html b/src/open_inwoner/components/templates/components/Contact/ContactForm.html
index 55dfbccc61..a062bd83ec 100644
--- a/src/open_inwoner/components/templates/components/Contact/ContactForm.html
+++ b/src/open_inwoner/components/templates/components/Contact/ContactForm.html
@@ -26,9 +26,9 @@
{% if form_object.captcha %}
diff --git a/src/open_inwoner/components/templates/components/Notification/Notification.html b/src/open_inwoner/components/templates/components/Notification/Notification.html
index 0955a3508f..6bd42ce1e8 100644
--- a/src/open_inwoner/components/templates/components/Notification/Notification.html
+++ b/src/open_inwoner/components/templates/components/Notification/Notification.html
@@ -14,8 +14,8 @@
{% else %}
role="status"
{% endif %} tabindex="-1">
- {% if title %}
{% endif %}
{% if action %}{% button href=action text=action_text %}{% endif %}
{% if contents %}
{{ contents }}
diff --git a/src/open_inwoner/components/templates/components/Product/finder.html b/src/open_inwoner/components/templates/components/Product/finder.html
index e109662bd2..56e9e71af7 100644
--- a/src/open_inwoner/components/templates/components/Product/finder.html
+++ b/src/open_inwoner/components/templates/components/Product/finder.html
@@ -1,12 +1,12 @@
{% load i18n grid_tags form_tags button_tags %}
{% render_column span=6 compact=True extra_classes="product-finder" %}
-
{% if not conditions_done %}
-
{{ condition.question }}
+
{{ condition.question }}
{% if condition.rule %}
{{ condition.rule }}
{% endif %}
diff --git a/src/open_inwoner/components/templatetags/card_tags.py b/src/open_inwoner/components/templatetags/card_tags.py
index 01b42deeac..ed68b58c30 100644
--- a/src/open_inwoner/components/templatetags/card_tags.py
+++ b/src/open_inwoner/components/templatetags/card_tags.py
@@ -12,7 +12,7 @@ def render_card(parser, token):
Usage:
{% render_card %}
-
{% trans 'Welkom' %}
+
{% trans 'Welkom' %}
{% endrender_card %}
Variables:
diff --git a/src/open_inwoner/components/templatetags/string_tags.py b/src/open_inwoner/components/templatetags/string_tags.py
index 5662f1c87f..8d1d2a6237 100644
--- a/src/open_inwoner/components/templatetags/string_tags.py
+++ b/src/open_inwoner/components/templatetags/string_tags.py
@@ -25,7 +25,7 @@ def optional_paragraph(optional_text: str) -> str:
if not optional_text:
return ""
return format_html(
- '
{optional_text}
'.format(
+ '
{optional_text}
'.format(
optional_text=linebreaksbr(optional_text)
)
)
diff --git a/src/open_inwoner/components/tests/test_messages.py b/src/open_inwoner/components/tests/test_messages.py
index 0de05bcc2f..0034fbf706 100644
--- a/src/open_inwoner/components/tests/test_messages.py
+++ b/src/open_inwoner/components/tests/test_messages.py
@@ -145,5 +145,5 @@ def test_status(self):
- Header renders the correct status.
"""
self.assertTextContent(
- ".messages__header .utrecht-paragraph", "Dolor sit amet.", self.config
+ ".messages__header .nl-paragraph", "Dolor sit amet.", self.config
)
diff --git a/src/open_inwoner/js/components/accessibility/enlarge_font.js b/src/open_inwoner/js/components/accessibility/enlarge_font.js
index 69946df63f..28f2a04024 100644
--- a/src/open_inwoner/js/components/accessibility/enlarge_font.js
+++ b/src/open_inwoner/js/components/accessibility/enlarge_font.js
@@ -12,7 +12,7 @@ export class EnlargeFont {
// Target specific sizes that need to be enlarged
this.styles = {
bodyFontSizeDefault: '--utrecht-document-font-size',
- paragraphFontSizeDefault: '--utrecht-paragraph-font-size',
+ paragraphFontSizeDefault: '--nl-paragraph-font-size',
paragraphFontSizeSmall: '--utrecht-paragraph-small-font-size',
headingThreeFontSize: '--utrecht-heading-3-font-size',
headingFourFontSize: '--utrecht-heading-4-font-size',
diff --git a/src/open_inwoner/js/components/form/FileInput.js b/src/open_inwoner/js/components/form/FileInput.js
index fb332fdd44..1c70e582c1 100644
--- a/src/open_inwoner/js/components/form/FileInput.js
+++ b/src/open_inwoner/js/components/form/FileInput.js
@@ -322,13 +322,13 @@ export class FileInput extends Component {
${
typeError && sizeError
? `
-
+
warning_amber
Dit type bestand (${ext}) is ongeldig en te groot. Geldige bestandstypen zijn: ${uploadFileTypes}
`
: typeError || sizeError
? `
-
+
warning_amber
${
typeError
diff --git a/src/open_inwoner/js/components/map/index.js b/src/open_inwoner/js/components/map/index.js
index 2a5d774dec..483b41b40c 100644
--- a/src/open_inwoner/js/components/map/index.js
+++ b/src/open_inwoner/js/components/map/index.js
@@ -124,8 +124,8 @@ class Map {
-
${displayAddress1}
-
${displayAddress2}
+
${displayAddress1}
+
${displayAddress2}
${displayPhonenumber}
diff --git a/src/open_inwoner/js/components/siteimprove/tracking.js b/src/open_inwoner/js/components/siteimprove/tracking.js
index abf4c5361d..c5fa6bc682 100644
--- a/src/open_inwoner/js/components/siteimprove/tracking.js
+++ b/src/open_inwoner/js/components/siteimprove/tracking.js
@@ -236,7 +236,7 @@ const specificClickSelectors = {
'Click',
'Open Aanvraag via tegel',
],
- '#cases-content > .card__grid a.card ul > li > p.utrecht-paragraph': [
+ '#cases-content > .card__grid a.card ul > li > p.nl-paragraph': [
'event',
'Mijn zaken',
'Click',
@@ -254,7 +254,7 @@ const specificClickSelectors = {
'Click',
'Open Aanvraag via tegel',
],
- '#cases-content > .card__grid a.card ul > li .utrecht-paragraph': [
+ '#cases-content > .card__grid a.card ul > li .nl-paragraph': [
'event',
'Mijn zaken',
'Click',
@@ -282,7 +282,7 @@ const specificClickSelectors = {
],
// Detail Case view
'.file__delete': ['event', 'Aanvraag detail', 'Click', 'Verwijder bestand'],
- '#statuses_component .status-list__notification-content > p.utrecht-paragraph.status-list__upload.status-list__upload--enabled > a':
+ '#statuses_component .status-list__notification-content > p.nl-paragraph.status-list__upload.status-list__upload--enabled > a':
['event', 'Aanvraag detail', 'Scroll click', 'Scroll omlaag'],
'#cases-detail-content .column.column--start-4.column--span-6 > section.case-detail__documents > .file-list > ul > li > aside > div > div > *':
['event', 'Aanvraag detail', 'Click', 'Download document'],
@@ -384,13 +384,13 @@ const specificClickSelectors = {
'Click',
'Filter op persoon',
],
- '#profile-section-mentors .list .list-item .utrecht-paragraph': [
+ '#profile-section-mentors .list .list-item .nl-paragraph': [
'event',
'Mijn Profiel Overzicht',
'Click',
'Ga naar Begeleiders via tegel',
],
- '#profile-section-contacts .list .list-item .utrecht-paragraph': [
+ '#profile-section-contacts .list .list-item .nl-paragraph': [
'event',
'Mijn Profiel Overzicht',
'Click',
@@ -477,11 +477,10 @@ const partialClickSelectors = {
category: 'Mijn berichten',
label: 'Click naar bericht',
},
- '.view--inbox-index #content .grid__sidebar ul li > a > p.utrecht-paragraph':
- {
- category: 'Mijn berichten',
- label: 'Click naar bericht',
- },
+ '.view--inbox-index #content .grid__sidebar ul li > a > p.nl-paragraph': {
+ category: 'Mijn berichten',
+ label: 'Click naar bericht',
+ },
// Hide personal data from inputs
'input[type="text"]': { label: 'Click in invoerveld' },
'input[type="email"]': { label: 'Click in e-mail invoerveld' },
diff --git a/src/open_inwoner/openklant/tests/test_cms_plugins.py b/src/open_inwoner/openklant/tests/test_cms_plugins.py
index 4aa0a4e58c..3d6645f47d 100644
--- a/src/open_inwoner/openklant/tests/test_cms_plugins.py
+++ b/src/open_inwoner/openklant/tests/test_cms_plugins.py
@@ -58,10 +58,10 @@ def test_contact_form_plugin_authenticated_user(self):
)
self.assertIn(
- f'
{description_authenticated_user}
', html
+ f'
{description_authenticated_user}
', html
)
self.assertNotIn(
- f'
{description_anonymous_user}
', html
+ f'
{description_anonymous_user}
', html
)
def test_contact_form_plugin_anonymous_user(self):
@@ -93,8 +93,6 @@ def test_contact_form_plugin_anonymous_user(self):
)
self.assertNotIn(
- f'
{description_authenticated_user}
', html
- )
- self.assertIn(
- f'
{description_anonymous_user}
', html
+ f'
{description_authenticated_user}
', html
)
+ self.assertIn(f'
{description_anonymous_user}
', html)
diff --git a/src/open_inwoner/react/components/HomePluginCard/HomePluginCard.scss b/src/open_inwoner/react/components/HomePluginCard/HomePluginCard.scss
index ee8794c65b..f419b1a536 100644
--- a/src/open_inwoner/react/components/HomePluginCard/HomePluginCard.scss
+++ b/src/open_inwoner/react/components/HomePluginCard/HomePluginCard.scss
@@ -61,7 +61,7 @@
}
}
- .utrecht-heading-2 {
+ .nl-heading--level-2 {
font-size: 20px;
margin-block: 0;
}
diff --git a/src/open_inwoner/react/components/HomePluginCard/HomePluginCard.tsx b/src/open_inwoner/react/components/HomePluginCard/HomePluginCard.tsx
index b451e4319d..b6dac0ba25 100644
--- a/src/open_inwoner/react/components/HomePluginCard/HomePluginCard.tsx
+++ b/src/open_inwoner/react/components/HomePluginCard/HomePluginCard.tsx
@@ -24,7 +24,7 @@ const HomePluginCard: AC
= ({
diff --git a/src/open_inwoner/react/components/HomePluginSection/HomePluginSection.scss b/src/open_inwoner/react/components/HomePluginSection/HomePluginSection.scss
index 8e249392a1..f31508fe0a 100644
--- a/src/open_inwoner/react/components/HomePluginSection/HomePluginSection.scss
+++ b/src/open_inwoner/react/components/HomePluginSection/HomePluginSection.scss
@@ -35,7 +35,7 @@
overflow-wrap: var(--oip-plugin-header-overflow-wrap-mobile);
}
- .utrecht-heading-2 {
+ .nl-heading--level-2 {
color: var(--oip-plugin-header-heading-color);
font-family: var(--oip-plugin-header-heading-font-family);
margin-block-start: var(--oip-plugin-header-heading-margin-block-start);
diff --git a/src/open_inwoner/react/components/HomePluginSection/HomePluginSection.tsx b/src/open_inwoner/react/components/HomePluginSection/HomePluginSection.tsx
index 0f0ca9653b..6261ebbc61 100644
--- a/src/open_inwoner/react/components/HomePluginSection/HomePluginSection.tsx
+++ b/src/open_inwoner/react/components/HomePluginSection/HomePluginSection.tsx
@@ -24,7 +24,9 @@ const HomePluginSection: AC = ({