From 5ea93d310d8a561e9812a87eb97fd1e32826aae5 Mon Sep 17 00:00:00 2001
From: Cedric Willekens <c.s.willekens@student.tudelft.nl>
Date: Wed, 27 May 2020 22:36:57 +0200
Subject: [PATCH] Make sure navbar is in one row for guests
Signed-off-by: Cedric Willekens <c.s.willekens@student.tudelft.nl>
---
src/main/resources/templates/guest-container.html | 9 +++++----
src/main/resources/templates/navigation.html | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/templates/guest-container.html b/src/main/resources/templates/guest-container.html
index ac3e63a1..acbc5c62 100644
--- a/src/main/resources/templates/guest-container.html
+++ b/src/main/resources/templates/guest-container.html
@@ -6,16 +6,17 @@
<section class="purple-background fill-page-vertically d-flex flex-column" layout:fragment="content">
<div class="navbar navbar-expand-lg navbar-light bg-transparent px-1 py-md-3 py-2">
<div class="container">
- <a class="navbar-brand" href="/">
+ <a class="navbar-brand mr-0" href="/">
<img src="/img/logo.svg" height="60" class="d-inline-block align-middle" alt="">
</a>
- <a class="nav-link text-center offset-4 btn btn-logout mr-1" href="/logout" th:text="#{login.logout}"></a>
+ <a class="nav-link text-center offset-lg-4 btn btn-logout" href="/logout" th:text="#{login.logout}"></a>
- <div th:replace="~{language-dropdown}"></div>
<th:block th:if="${back != null}">
- <a th:href="${back}" class="btn btn-secondary ml-1 text-center nav-link" th:text="#{generic.back}">back</a>
+ <a th:href="${back}" class="btn btn-secondary text-center nav-link" th:text="#{generic.back}">back</a>
</th:block>
+
+ <div th:replace="~{language-dropdown}"></div>
</div>
</div>
<div class="container flex-fill d-flex flex-column">
diff --git a/src/main/resources/templates/navigation.html b/src/main/resources/templates/navigation.html
index 4e030b23..066b5c06 100644
--- a/src/main/resources/templates/navigation.html
+++ b/src/main/resources/templates/navigation.html
@@ -5,8 +5,8 @@
<header>
<div class="navbar navbar-expand-lg navbar-light bg-transparent px-1 pt-md-3 pb-md-2 py-2">
<div class="container">
- <a class="navbar-brand" href="/">
- <img src="/img/logo.svg" height="60" class="d-inline-block align-middle" alt="">
+ <a class="navbar-brand mr-0" href="/">
+ <img src="/img/logo.svg" class="d-inline-block align-middle" alt="">
</a>
<th:block sec:authorize="isAuthenticated()">
--
GitLab