From 92d29700ded30d8c61ad7834d1a81e9f548ff9ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?benjamin=20melan=C3=A7on?= <ben@agaric.coop>
Date: Sun, 23 Feb 2025 23:41:26 -0500
Subject: [PATCH 1/2] Stick search bar on right for consistency and to fix
 weirdness at middle sizes

(this weirdness introduced by other recent changes, but it's better on the right anyway)

Also do not wrap menu on desktop and widescreen.

Ref #114
---
 .../custom/geofresco/src/global/_components.scss       |  4 ++++
 .../geofresco/src/templates/layout/page.html.twig      | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/web/themes/custom/geofresco/src/global/_components.scss b/web/themes/custom/geofresco/src/global/_components.scss
index dcc1614..8beff9e 100644
--- a/web/themes/custom/geofresco/src/global/_components.scss
+++ b/web/themes/custom/geofresco/src/global/_components.scss
@@ -56,6 +56,10 @@
     width: 100%;
     justify-content: space-around;
   }
+  @include from($desktop) {
+    flex-wrap: nowrap;
+    margin-right: -1rem;
+  }
 }
 
 
diff --git a/web/themes/custom/geofresco/src/templates/layout/page.html.twig b/web/themes/custom/geofresco/src/templates/layout/page.html.twig
index 6cfb141..3c7e6fd 100644
--- a/web/themes/custom/geofresco/src/templates/layout/page.html.twig
+++ b/web/themes/custom/geofresco/src/templates/layout/page.html.twig
@@ -25,11 +25,6 @@
   {% endblock navbar_branding %}
   <nav class="navigation column">
     <div class="columns">
-      {% if page.header_search %}
-      <div class="search-bar column has-text-right">
-        {{ page.header_search }}
-      </div>
-      {% endif %}
       {% block navbar_social %}
       {% if page.navbar_social %}
       <div class="column is-narrow">
@@ -44,6 +39,11 @@
       </div>
       {% endif %}
       {% endblock primary_menu %}
+      {% if page.header_search %}
+      <div class="search-bar column is-narrow">
+        {{ page.header_search }}
+      </div>
+      {% endif %}
     </div>
   </nav>
 </div>

From af50ba58b9388a64e02f341392722a8e61ba2221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?benjamin=20melan=C3=A7on?= <ben@agaric.coop>
Date: Sun, 23 Feb 2025 23:41:31 -0500
Subject: [PATCH 2/2] Compile CSS

---
 web/themes/custom/geofresco/dist/css/global.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/themes/custom/geofresco/dist/css/global.css b/web/themes/custom/geofresco/dist/css/global.css
index b033f91..b6ea0ff 100644
--- a/web/themes/custom/geofresco/dist/css/global.css
+++ b/web/themes/custom/geofresco/dist/css/global.css
@@ -5315,6 +5315,10 @@ label.panel-block {
     #navbar-menu {
       width: 100%;
       justify-content: space-around; } }
+  @media screen and (min-width: 1024px) {
+    #navbar-menu {
+      flex-wrap: nowrap;
+      margin-right: -1rem; } }
 /* Featured images on article pages */
 .featured-image figure.image {
   width: 100vw;