From 9e1e625c9a7afe2f146398209af0f047f6e82a6b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 27 Sep 2022 13:35:23 +0000 Subject: [PATCH] Bug 30952: (follow-up) Fix style of floating toolbars This patch makes some changes to floating toolbars, both hc-sticky toolbars and DataTables floating toolbars. The changes fix some bugs in the display (incorrect z-index, unwanted margins) and proposes a different style for .searchheader-style toolbars (e.g. patron search results). To test, apply the patch and rebuild the staff interface CSS. Test pages with various kinds and combinations of floating toolbars, e.g.: - Administration -> System preferences - Patrons -> Patron search results - Administration -> Libraries - Catalog search results --- koha-tmpl/intranet-tmpl/prog/css/preferences.css | 4 +++- koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss | 4 ++++ koha-tmpl/intranet-tmpl/prog/css/src/_toolbar.scss | 2 +- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 6 ++++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/preferences.css b/koha-tmpl/intranet-tmpl/prog/css/preferences.css index 00d2b5e465..7ce673297e 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/preferences.css +++ b/koha-tmpl/intranet-tmpl/prog/css/preferences.css @@ -97,8 +97,10 @@ .humanMsg strong { } #toolbar.floating { - box-shadow: 0 3px 2px 0 rgba(0, 0, 0, 0.5); border-radius: 0; + box-shadow: 0 0 2px 1px rgba(0,0,0,.4); + margin-top: 0; + z-index: 100; } .loading { diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss index d7cea5bb78..d3fadbe0f0 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss @@ -79,6 +79,10 @@ table { margin-top: .5em; margin-bottom: .5em; + &.fixedHeader-floating { + margin-top: 0; + } + &.no-footer { border: none; } diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_toolbar.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_toolbar.scss index 95d69bbbdc..cf1360ee48 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_toolbar.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_toolbar.scss @@ -17,8 +17,8 @@ &.floating { border-radius: 0; + box-shadow: 0 0 2px 1px rgba(0,0,0,.4); margin-top: 0; - box-shadow: 0 3px 2px 0 rgba(0, 0, 0, .5); z-index: 100; } 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 002acf27af..7ebcba4647 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -2065,8 +2065,7 @@ li { .searchheader { background-color: #f3f4f4; - border: 1px solid #696969; - border-radius: 5px 5px 5px 5px; + box-shadow: 0 0 2px 1px rgba(0,0,0,.2); font-size: 80%; margin-top: .5em; margin-bottom: .5em; @@ -2077,7 +2076,10 @@ li { &.floating { border-radius: 0; + box-shadow: 0 0 2px 1px rgba(0,0,0,.4); margin-top: 0; + margin-bottom: 0; + z-index: 100; } .btn-group { -- 2.30.2