From c5e13d8cc36897f6d2a52df8439cad6878d3b1af Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 18 Dec 2023 18:39:36 +0000 Subject: [PATCH] Bug 35540: Separate StaffListsHome block from the table block This patch makes some minor changes to template markup and CSS so that "page-section" divs have consistent margins. To test, apply the patch and rebuild the staff interface CSS. - Go to Tools -> HTML customizations and create a new entry in StaffListsHome, StaffPatronsHome, and StaffPOSHome regions. - Confirm that those customizations are displayed well on each of those corresponding pages: The lists home page, the patrons home page, and the Point of Sale home page. - Confirm that other pages affected by the CSS change still display correctly. These pages have an added bottom margin on the main "container" of content. For example: - Patrons -> Patron search results - Catalog -> Catalog search results (especially results with multiple pages) - Circulation -> Circulation history - Reports -> Saved SQL reports --- .../intranet-tmpl/prog/css/src/staff-global.scss | 7 ++++++- koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt | 14 +++++++------- 2 files changed, 13 insertions(+), 8 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 99b2ad0d89..cf5c09e71e 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -33,6 +33,10 @@ button { } } +.row + .page-section { + margin-top: 1rem; +} + a { &:hover, &:active, @@ -1896,6 +1900,7 @@ li { #searchresults { background-color: #FFFFFF; + margin-bottom: 1rem; margin-top: 20px; min-width: 100%; padding: 20px; @@ -2666,7 +2671,7 @@ td.bundle { } .toptabs { - margin-top: 5px; + margin: 1rem 0; } fieldset > .toptabs { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt index e24f9ba1be..c9e39eefa5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt @@ -61,8 +61,8 @@ [% END %] -
-
+
+
@@ -162,15 +162,15 @@ Cancel
-
- + +
[% END %] [%- SET StaffPOSHome = AdditionalContents.get( location => "StaffPOSHome", lang => lang, library => logged_in_user.branchcode ) -%] [%- FOREACH block IN StaffPOSHome.content -%] -
- [%- block.content | $raw -%] -
+
+ [%- block.content | $raw -%] +
[%- END -%] -- 2.30.2