From 64441c76bd44b18c501cba85b42ca1f70484ea31 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 26 Jun 2024 11:53:21 +0000
Subject: [PATCH] Bug 36337: Hiding lists with OpacPublic breaks styling for
 language list

This patch adjusts the CSS of elements in the OPAC header so that menu
items are correctly aligned with various combinations of the OpacPublic
and OpacLangSelectorMode system preferences.

To test, apply the patch and rebuild the OPAC CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client)

- View the header menu in the OPAC with these combinations of settings:
  - OpacPublic = On; OpacLangSelectorMode = Top;
  - OpacPublic = On; OpacLangSelectorMode = Footer;
  - OpacPublic = Off; OpacLangSelectorMode = Top;
  - OpacPublic = Off; OpacLangSelectorMode = Footer;
- With each configuration, test that the elements in the header (Logo,
  Cart/List menu, Language selctor, and user menu items) align
  correctly. The Cart/List menu items should always align to the left,
  the Language selector and user menu should aways align to the right.

Sponsored-by: Athens County Public Libraries
Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../opac-tmpl/bootstrap/css/src/_common.scss  | 20 ++++++++++++++++++-
 .../opac-tmpl/bootstrap/css/src/opac.scss     |  5 ++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss
index 647012a0a0..4758df975e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss
@@ -843,7 +843,6 @@ button {
 #logo {
     background: transparent url( "../images/koha-green-logo.svg" ) no-repeat scroll 0%;
     border: 0;
-    float: left !important;
     margin: 0;
     padding: 0;
     width: 100px;
@@ -865,6 +864,25 @@ button {
     }
 }
 
+#header-region .navbar {
+    #logo {
+        flex-grow: 1;
+        flex-shrink: 0;
+    }
+
+    &:has( #cart-list-nav ) {
+        #logo {
+            flex-grow: 0;
+            flex-shrink: 1;
+        }
+
+        #cart-list-nav {
+            flex-grow: 1;
+            flex-shrink: 0;
+        }
+    }
+}
+
 #changelanguage {
     background-color: #FFF;
     border-top: 1px solid #EEE;
diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
index 6816f68fb5..c49c44175c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
@@ -317,9 +317,12 @@ th {
     margin: .2rem .2rem .2rem 0;
 }
 
+#header_langmenu {
+    flex-shrink: 1;
+}
+
 #members {
     flex-shrink: 1;
-    justify-content: flex-end;
 
     p {
         color: #727272;
-- 
2.39.5