From 32068a8b153f242f723ad837601296f68cb07edb Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Wed, 14 Sep 2022 09:11:32 +0200 Subject: [PATCH] Bug 30952: Header search - move tabs to the right (and other tweaks) Make the search bar take the whole page width, with inputs at the center taking all the available space Add a separator between inputs when there are more than one Issue #24 Signed-off-by: Martin Renvoize Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi --- .../intranet-tmpl/prog/css/src/_header.scss | 40 ++++++++++++++----- .../prog/en/includes/acquisitions-search.inc | 10 ++++- .../prog/en/includes/authorities-search.inc | 16 ++++++++ .../prog/en/includes/budgets-admin-search.inc | 4 ++ .../prog/en/includes/cataloging-search.inc | 3 ++ .../prog/en/includes/catalogue-search-box.inc | 4 ++ .../prog/en/includes/checkin-search-box.inc | 4 ++ .../prog/en/includes/cities-admin-search.inc | 4 ++ .../en/includes/contracts-admin-search.inc | 4 ++ .../en/includes/currencies-admin-search.inc | 4 ++ .../prog/en/includes/desks-admin-search.inc | 4 ++ .../prog/en/includes/letters-search.inc | 4 ++ .../prog/en/includes/member-search-box.inc | 5 +++ .../prog/en/includes/patron-search-box.inc | 4 ++ .../prog/en/includes/patrons-admin-search.inc | 4 ++ .../prog/en/includes/prefs-admin-search.inc | 4 ++ .../prog/en/includes/renew-search-box.inc | 4 ++ .../prog/en/includes/serials-search.inc | 4 ++ .../en/includes/suggestions-add-search.inc | 4 ++ .../prog/en/includes/z3950-admin-search.inc | 4 ++ 20 files changed, 122 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss index 10057400d5..8c0968298e 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss @@ -51,6 +51,7 @@ border: 0; background-color: transparent; display: none; + flex-grow: 1; &:first-of-type { display: block; @@ -60,7 +61,6 @@ > ul { padding: 0 .8em 0 0; margin: 0; - order: -1; border-radius: 0 16px 16px 0; display: flex; justify-content: space-around; @@ -99,6 +99,24 @@ position: relative; } + .form-title { + padding: 0 16px 0 0; + background-color: #418940; + border-radius: 0 16px 16px 0; + display: flex; + align-items: center; + justify-content: flex-end; + z-index: 2; + white-space: nowrap; + flex-basis: 15%; + + label { + color: white; + font-weight: bold; + margin: 0; + } + } + .form-content { background-color: white; margin-left: -16px; @@ -107,24 +125,24 @@ white-space: nowrap; z-index: 1; display: flex; + flex-grow: 1; - input[type="text"] { - border: 0; - box-shadow: unset; - background-color: transparent; - } - + input[type="text"], select { - margin: 0; background-color: transparent; border: 0; + border-radius: 0; box-shadow: unset; - max-width: 15em; + margin: 0; + + &:not(:first-child) { + border-left: 1px solid #e0e0e0; + } } } .form-extra-content { - left: -16px; + left: 284px; right: 60px; position: absolute; top: 31px; @@ -133,7 +151,7 @@ padding: 1em; border-radius: 0 0 8px 8px; border: 1px solid #418940; - border-top: 0; + border-top: 1px solid #e0e0e0; box-shadow: 0 2px 2px 1px #00000030; z-index: 1; display: none; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc index dd1bac0280..1d28d7d394 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -3,6 +3,10 @@