From 8afbc637091295eb6e3784dc6f9b60b3631e3ffc Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 27 Oct 2022 15:28:11 +0000 Subject: [PATCH] Bug 32022: Style tweaks to fieldsets and page-section This patch makes CSS changes to try to bring some consistency to various elements which are similar in the general sense of "white box." Fieldsets, page-section, etc. To test apply the patch and rebuild the staff interface CSS. Test various pages with page-section, fieldsets, etc.: - Patron details - Patron edit - Patron accounting - Check Tools -> Patron lists -> New to confirm that there is not a gap between the submit button's container and the rest of the form. Signed-off-by: Martin Renvoize --- .../intranet-tmpl/prog/css/src/_forms.scss | 2 -- .../intranet-tmpl/prog/css/src/_mixins.scss | 2 ++ .../prog/css/src/staff-global.scss | 20 +++++++++---------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss index eac25382ca..c57ea1acec 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss @@ -1,7 +1,5 @@ fieldset { @include card; - margin-bottom: 1em; - padding: 12px; legend { border-bottom: 0 none; diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss index 54a362938f..b669a9ea1c 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss @@ -40,6 +40,8 @@ $nav-menu-bullet: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/s } @mixin card { + margin-bottom: 1rem; + padding: 1rem; &:not(.bg-danger):not(.bg-warning):not(.bg-info):not(.bg-success):not(.bg-primary) { background-color: white; } 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 a6d30023b6..acb74bba12 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -21,8 +21,6 @@ .page-section { @include card; - padding: .5em 1em; - & + .page-section { margin-top: 1em; } @@ -783,7 +781,7 @@ ol { fieldset { + fieldset { &.action { - padding-top: 20px; + margin-top: -1em; } } @@ -806,12 +804,17 @@ fieldset { &.action { background-color: transparent; border: 0; - clear: both; box-shadow: none; + clear: both; float: none; - margin: .9em 0 0; - padding: .4em; + padding: 1rem; width: auto; + + a { + &.cancel { + padding-left: 1em; + } + } } @@ -1263,8 +1266,6 @@ dd { } .patroninfo-section { - padding: .5em; - margin: .5em 0; @include card; } @@ -2756,9 +2757,6 @@ td.bundle { .statictabs { @include card; - margin-top: 20px; - padding: 20px; - h3{ padding-bottom: .7em; margin: 0; -- 2.20.1