From 937445fed4a723a9757a6a79f139d3081445ad6b Mon Sep 17 00:00:00 2001
From: Manfred Stock <m-ccc@nfred.ch>
Date: Tue, 28 Dec 2021 16:15:40 +0100
Subject: [PATCH] Move time display inside button-wrapper

That way, on narrow displays, it should appear on the same row as the
buttons and not overlap the stream name/title anymore. Also use the
`navbar-text` class on the text for positioning.
---
 assets/css/_structure.less       |  4 ++--
 template/assemblies/header.phtml | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/assets/css/_structure.less b/assets/css/_structure.less
index a5041067..e7b4df80 100644
--- a/assets/css/_structure.less
+++ b/assets/css/_structure.less
@@ -55,9 +55,9 @@ nav {
 		}
 	}
 
-	.navbar-time {
+	.button-wrapper > .navbar-time {
 		line-height: 27px;
-		padding: 25px 15px;
+		color: inherit;
 	}
 
 	.button-wrapper > .btn {
diff --git a/template/assemblies/header.phtml b/template/assemblies/header.phtml
index f7051f1c..881cb14f 100644
--- a/template/assemblies/header.phtml
+++ b/template/assemblies/header.phtml
@@ -8,6 +8,11 @@
 		</div>
 
 		<div class="nav navbar-form navbar-right button-wrapper">
+			<? if(isset($room) && $room->hasSchedule()): ?>
+				<span class="navbar-text navbar-time">
+					Current Time
+				</span>
+			<? endif ?>
 			<? if(!$conference->hasEnded() && $conference->hasFeedback()): ?>
 				<a class="form-control btn btn-default feedback" title="Feedback" href="<?=h($conference->getFeedbackUrl())?>">
 					<span class="fa fa-bullhorn"></span>
@@ -22,12 +27,6 @@
 				<span class="fa fa-info"></span>
 			</a>
 		</div>
-
-		<? if(isset($room) && $room->hasSchedule()): ?>
-			<div class="navbar-right navbar-time">
-				Current Time
-			</div>
-		<? endif ?>
 	</div>
 </nav>