From bfa50a4444a9542e8c7d47def2b330d21dd6323b Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Mon, 16 Jan 2017 20:30:38 +0100
Subject: [PATCH] more cleanup

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 apps/files_sharing/templates/public.php | 56 ++++++++++++-------------
 core/css/header.scss                    | 16 +------
 2 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 2c321f2a398..8d6558612b2 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -35,40 +35,36 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 
 
 <header><div id="header" class="<?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>">
-		<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
-		   title="" id="nextcloud">
-			<div class="logo-icon svg">
-			</div>
-		</a>
-
-		<div class="header-appname-container">
-			<h1 class="header-appname">
-				<?php p($theme->getName()); ?>
-			</h1>
+		<div id="header-left">
+			<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
+				title="" id="nextcloud">
+				<div class="logo-icon svg">
+					<h1 class="header-appname">
+						<?php p($theme->getName()); ?>
+					</h1>
+				</div>
+			</a>
 		</div>
 
 		<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
-		<div class="header-right">
-			<span id="details">
-				<?php
-				if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) {
-					if ($_['server2serversharing']) {
-						?>
-						<span id="save" data-protected="<?php p($_['protected']) ?>"
-							  data-owner-display-name="<?php p($_['displayName']) ?>" data-owner="<?php p($_['owner']) ?>" data-name="<?php p($_['filename']) ?>">
-						<button id="save-button"><?php p($l->t('Add to your Nextcloud')) ?></button>
-						<form class="save-form hidden" action="#">
-							<input type="email" id="remote_address" placeholder="user@yourNextcloud.org"/>
-							<button id="save-button-confirm" class="icon-confirm svg" disabled></button>
-						</form>
-					</span>
-					<?php } ?>
-					<a href="<?php p($_['downloadURL']); ?>" id="download" class="button">
-						<span class="icon icon-download"></span>
-						<span id="download-text"><?php p($l->t('Download'))?></span>
-					</a>
+		<div id="header-right">
+			<?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) {
+				if ($_['server2serversharing']) {
+					?>
+					<span id="save" data-protected="<?php p($_['protected']) ?>"
+						  data-owner-display-name="<?php p($_['displayName']) ?>" data-owner="<?php p($_['owner']) ?>" data-name="<?php p($_['filename']) ?>">
+					<button id="save-button"><?php p($l->t('Add to your Nextcloud')) ?></button>
+					<form class="save-form hidden" action="#">
+						<input type="email" id="remote_address" placeholder="user@yourNextcloud.org"/>
+						<button id="save-button-confirm" class="icon-confirm svg" disabled></button>
+					</form>
+				</span>
 				<?php } ?>
-			</span>
+				<a href="<?php p($_['downloadURL']); ?>" id="download" class="button">
+					<span class="icon icon-download"></span>
+					<span id="download-text"><?php p($l->t('Download'))?></span>
+				</a>
+			<?php } ?>
 		</div>
 	</div></header>
 <div id="content-wrapper">
diff --git a/core/css/header.scss b/core/css/header.scss
index 8ecdfaa1a9c..a46326e6a44 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -108,7 +108,8 @@
 
 	#header-left,
 	#header-right {
-		display: flex;
+		display: inline-flex;
+		align-items: center;
 	}
 
 	#header-left {
@@ -117,7 +118,6 @@
 	}
 
 	#header-right {
-		display: flex;
 		justify-content: flex-end;
 	}
 }
@@ -305,18 +305,6 @@
 
 /* USER MENU -----------------------------------------------------------------*/
 
-/* info part on the right, used e.g. for info on who shared something */
-.header-right {
-	position: absolute;
-	right: 0;
-	padding: 7px 5px;
-	color: #fff;
-	height: 100%;
-	max-width: 80%;
-	white-space: nowrap;
-	box-sizing: border-box;
-}
-
 #settings {
 	display: inline-block;
 	color: #ddd;