From 67d6c050aa7414a5a0193d500bc61769ee4e798b Mon Sep 17 00:00:00 2001
From: krmax44 <hi@krmax44.de>
Date: Mon, 5 Feb 2024 19:39:10 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20fix=20nav=20ordering?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fragdenstaat_de/templates/header.html | 13 ++++++++-----
 frontend/javascript/navbar.ts         |  1 -
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/fragdenstaat_de/templates/header.html b/fragdenstaat_de/templates/header.html
index 0e240ec30..9fcf4fdf0 100644
--- a/fragdenstaat_de/templates/header.html
+++ b/fragdenstaat_de/templates/header.html
@@ -112,21 +112,24 @@
                         <li>
                             <a href="{{ lawsuits_url|default:'/klagen/' }}">{{ lawsuits_title }}</a>
                         </li>
+
                         {% page_url "about" as about_url %}
                         {% if about_url %}
                             {% page_attribute "menu_title" "about" as about_title %}
-                            <li class="nav-sm ms-md-auto">
+                            <li class="nav-sm ms-md-auto order-md-5">
                                 <a href="{{ about_url|default:"/ueber-uns/" }}">{{ about_title }}</a>
                             </li>
                         {% endif %}
+
                         {% page_url "newsletter" as newsletter_url %}
                         {% if newsletter_url %}
-                            <li class="nav-sm">
+                            <li class="nav-sm order-md-5">
                                 <a href="{{ newsletter_url }}">{% translate "Newsletter" %}</a>
                             </li>
                         {% endif %}
+
                         {% page_url "donate" as donate_url %}
-                        <li class="nav-sm">
+                        <li class="nav-sm order-md-5">
                             <a class="text-danger"
                                href="{{ donate_url|default:'/spenden/' }}?pk_campaign=site-header&pk_keyword={{ request.path | urlencode }}">
                                 <i class="fa fa-heart" aria-hidden="true"></i>
@@ -138,7 +141,7 @@
                         </li>
                         {% if not request.user.is_authenticated %}
                             {% url 'account-login' as login_url %}
-                            <li class="nav-sm">
+                            <li class="nav-sm order-md-5">
                                 <a href="{% url 'account-login' %}?next={{ request.path|urlencode }}">
                                     <i class="fa fa-sign-in d-none d-md-inline" aria-hidden="true"></i>
                                     {% blocktrans %}Sign in{% endblocktrans %}
@@ -147,7 +150,7 @@
                             <li class="nav-sm d-md-none">
                                 <a href="{% url 'account-signup' %}?next={{ request.path|urlencode }}">{% blocktrans %}Sign Up{% endblocktrans %}</a>
                             </li>
-                            <li class="nav-sm">
+                            <li class="nav-sm d-md-none">
                                 <hr>
                             </li>
                         {% endif %}
diff --git a/frontend/javascript/navbar.ts b/frontend/javascript/navbar.ts
index cb2cf60cb..881c04c9f 100644
--- a/frontend/javascript/navbar.ts
+++ b/frontend/javascript/navbar.ts
@@ -100,7 +100,6 @@ const searchUrls = [
 
 if (searchUrls.includes(window.location.pathname)) {
   navSearch?.remove()
-  document.querySelector('#menu-user-nav')?.classList.add('ms-md-auto')
 }
 
 const input = navSearch?.querySelector('input')