From 958a85148f07ae4fbe13e4090dec5126a3b396aa Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 12 Apr 2021 21:23:25 +0200
Subject: Navbar change (#739)

* Changed the navbar element spacing to make it look more even.

* Put history and settings in a submenu

Co-authored-by: Joshua <mckerracher@gmail.com>
---
 ihatemoney/templates/layout.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ihatemoney/templates/layout.html b/ihatemoney/templates/layout.html
index f79270e..cae707c 100644
--- a/ihatemoney/templates/layout.html
+++ b/ihatemoney/templates/layout.html
@@ -42,14 +42,12 @@
     <h1><a class="navbar-brand" href="{{ url_for("main.home") }}"><span>#!</span> money?</a></h1>
 
     <div class="collapse navbar-collapse" id="navbarToggler">
-      <ul class="navbar-nav ml-auto mr-auto">
+      <ul class="navbar-nav nav-fill w-100">
         {% if g.project %}
           {% block navbar %}
           <li class="nav-item{% if current_view == 'list_bills' %} active{% endif %}"><a class="nav-link" href="{{ url_for("main.list_bills") }}">{{ _("Bills") }}</a></li>
           <li class="nav-item{% if current_view == 'settle_bill' %} active{% endif %}"><a class="nav-link" href="{{ url_for("main.settle_bill") }}">{{ _("Settle") }}</a></li>
           <li class="nav-item{% if current_view == 'statistics' %} active{% endif %}"><a class="nav-link" href="{{ url_for("main.statistics") }}">{{ _("Statistics") }}</a></li>
-          <li class="nav-item{% if current_view == 'history' %} active{% endif %}"><a class="nav-link" href="{{ url_for("main.history") }}">{{ _("History") }}</a></li>
-          <li class="nav-item{% if current_view == 'edit_project' %} active{% endif %}"><a class="nav-link" href="{{ url_for("main.edit_project") }}">{{ _("Settings") }}</a></li>
           {% endblock %}
         {% endif %}
       </ul>
@@ -92,7 +90,10 @@
                 {{ _("Start a new project") }}
               </a>
             </li>
-
+            {% if g.project %}
+            <li><a class="dropdown-item" href="{{ url_for("main.history") }}">{{ _("History") }}</a></li>
+            <li><a class="dropdown-item" href="{{ url_for("main.edit_project") }}">{{ _("Settings") }}</a></li>
+            {% endif %}
 
             {% if session['projects'] and not ((session['projects'] | length) == 1 and g.project and session['projects'][0][0] == g.project.id) %}
             <li class="dropdown-divider"></li>
-- 
cgit v1.1