From 8e1d7a2ec50c70c6e0318d5624d36ae123b4c125 Mon Sep 17 00:00:00 2001
From: Joshua <mckerracher@gmail.com>
Date: Mon, 7 Dec 2020 09:54:53 -0700
Subject: [PATCH 1/2] Changed the navbar element spacing to make it look more
 even.

---
 ihatemoney/templates/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ihatemoney/templates/layout.html b/ihatemoney/templates/layout.html
index f79270e48..98d82677c 100644
--- a/ihatemoney/templates/layout.html
+++ b/ihatemoney/templates/layout.html
@@ -42,7 +42,7 @@
     <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>

From e76f9aa9cc9dbf56f002facd8aab203a70c3bc76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sun, 11 Apr 2021 17:02:17 +0200
Subject: [PATCH 2/2] Put history and settings in a submenu

---
 ihatemoney/templates/layout.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ihatemoney/templates/layout.html b/ihatemoney/templates/layout.html
index 98d82677c..cae707c20 100644
--- a/ihatemoney/templates/layout.html
+++ b/ihatemoney/templates/layout.html
@@ -48,8 +48,6 @@ <h1><a class="navbar-brand" href="{{ url_for("main.home") }}"><span>#!</span> mo
           <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 @@ <h6 class="dropdown-header">{{ _('Languages') }}</h6>
                 {{ _("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>