From d340c741846945f301d7f83bb2f1127005789922 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 | 9 +++++++++ .../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, 24 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 a0a11e6b3e..7152ca5e41 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -889,6 +889,15 @@ fieldset { padding: .3em 0; } } + + div { + &.help-block { + display: block; + margin-top: 5px; + margin-bottom: 10px; + color: #737373; + } + } } 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 e46886206f..ba1aac2980 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 @@ -30,9 +30,11 @@ [%- END -%] [%- IF CatalogConcernHelp && CatalogConcernHelp.content && CatalogConcernHelp.content.count > 0 -%] +
[%- FOREACH help IN CatalogConcernHelp.content -%] -

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

+ [%- help.content | $raw -%] [%- END -%] +
[%- END -%] diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss index e101328bf7..a19228ee02 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -147,13 +147,6 @@ textarea { width: 50%; } -.help-block { - display: block; - margin-top: 5px; - margin-bottom: 10px; - color: #737373; -} - legend { color: #727272; font-size: 110%; @@ -991,6 +984,15 @@ fieldset { } } + div { + &.help-block { + display: block; + margin-top: 5px; + margin-bottom: 10px; + color: #737373; + } + } + &.action { border: 0; clear: both; diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/catalog_concern.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/catalog_concern.inc index 52a9362c70..b4ae9df342 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/catalog_concern.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/catalog_concern.inc @@ -27,9 +27,11 @@ [%- END -%] [%- IF CatalogConcernHelp && CatalogConcernHelp.content && CatalogConcernHelp.content.count > 0 -%] +
[%- FOREACH help IN CatalogConcernHelp.content -%] -

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

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