Merge branch '275-language-button-overflows-on-tablet-screen-size' into 'development'

Resolve "Language button overflows on tablet screen size"

Closes #275

See merge request !253

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Correctly sort claimed time slots in admin view [@cedricwilleken](https://gitlab.ewi.tudelft.nl/cedricwilleken)
+- Stop language button from overflowing on tablet screen size and landscape phone size [@cedricwilleken](https://gitlab.ewi.tudelft.nl/cedricwilleken)
 
 ## [1.2.0] - (2020-05-20)
 ### Added

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="/">
-				<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>
 
-			<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">

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()">