From e636720896f18b8bd7582415b6dd42776b5dae46 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 2 Nov 2022 11:37:09 +0000 Subject: [PATCH] Bug 31028: (follow-up) Consistently style help-block This patch updates the opac and staff modals to set the help-block inside a div instead of a paragraph element allowing for the wysiwyg edited content to display as prescribed. We move the scss inside the fieldset definition to ensure we are specific enough to catch only the intended elements. --- .../intranet-tmpl/prog/css/src/staff-global.scss | 14 ++++++++++++++ .../en/includes/modals/add_catalog_concern.inc | 4 +++- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 16 +++++++++------- .../en/includes/modals/catalog_concern.inc | 4 +++- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index b1e90968f7..e62600ca0a 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -875,6 +875,20 @@ fieldset { padding: .3em 0; } } + + div { + &.help-block { + display: block; + margin-top: 5px; + margin-bottom: 10px; + color: #737373; + + li { + list-style-type: unset; + list-style-position: inside; + } + } + } } details { diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc index 41028320be..beb3758b67 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc @@ -24,9 +24,11 @@ [%- IF CatalogConcernHelp && CatalogConcernHelp.content && CatalogConcernHelp.content.count > 0 -%] +
[%- FOREACH help IN CatalogConcernHelp.content -%] -

[%- help.content | $raw -%]

+ [%- help.content | $raw -%] [%- END -%] +
[%- END -%]