Merge remote-tracking branch 'rico/new-design' into new-design

[ipfire.org.git] / src / templates / base.html

diff --git a/src/templates/base.html b/src/templates/base.html
index 3174959e403c7bb26bc1c75fedce2ed5208ea12a..e4cb85768d71f42b985491fdf378dcbc5863bf99 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -157,27 +157,16 @@
                                                                {% end %}
                                                        </div>
                                                {% elif hostname.startswith("fireinfo.") %}
-                                                       <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"
-                                                                       aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
-                                                               <span class="fas fa-bars"></span>
-                                                       </button>
-
-                                                       <div class="collapse navbar-collapse" id="navbar">
-                                                               <ul class="navbar-nav ml-auto">
-                                                                       {% if current_user and current_user.is_staff() %}
-                                                                               <li class="nav-item">
-                                                                                       <a class="nav-link {% if request.path.startswith("/admin") %}is-active{% end %}" href="/admin">
-                                                                                               {{ _("Admin") }}
-                                                                                       </a>
-                                                                               </li>
-                                                                       {% end %}
+                                                       <div class="navbar-end">
+                                                               {% if current_user and current_user.is_staff() %}
+                                                                       <a class="navbar-item is-tab {% if request.path.startswith("/admin") %}is-active{% end %}" href="/admin">
+                                                                               {{ _("Admin") }}
+                                                                       </a>
+                                                               {% end %}
 
-                                                                       <li class="nav-item">
-                                                                               <a class="nav-link {% if request.path.startswith("/vendors") %}is-active{% end %}" href="/vendors">
-                                                                                       {{ _("Vendors") }}
-                                                                               </a>
-                                                                       </li>
-                                                               </ul>
+                                                               <a class="navbar-item is-tab {% if request.path.startswith("/vendors") %}is-active{% end %}" href="/vendors">
+                                                                       {{ _("Vendors") }}
+                                                               </a>
                                                        </div>
                                                {% elif hostname.startswith("nopaste.") %}
                                                        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"