3 files changed, 25 insertions, 19 deletions

diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss
index 3d6fc62ceba..2b83db46007 100644
--- a/apps/files_sharing/css/public.scss
+++ b/apps/files_sharing/css/public.scss
@@ -160,17 +160,26 @@ thead {
 }
 
 #header .header-shared-by  {
-	display: inline-block;
 	color: var(--color-primary-text);
 	position: relative;
-	top: -10px;
 	font-weight: 300;
 	font-size: 11px;
 	opacity: .57;
-	margin-top: 10px;
 }
 
 #note {
 	text-align: center;
 	padding: 10px;
 }
+
+
+// hide the primary on public share on mobile
+@media only screen and (max-width: 768px) {
+	#body-public {
+		.header-right {
+			#header-primary-action {
+				display: none;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/core/css/header.scss b/core/css/header.scss
index 41ee0a63fbe..a4ea6c0d75f 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -56,10 +56,15 @@
 
 /* LOGO and APP NAME -------------------------------------------------------- */
 #nextcloud {
-	padding: 8px 12px;
+	padding: 7px 12px;
+	padding-left: 86px; // logo width + 2* pa
+	position: relative;
 	height: 100%;
 	box-sizing: border-box;
 	opacity: 1;
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
 	&:focus {
 		opacity: .75;
 	}
@@ -107,12 +112,10 @@
 		background-repeat: no-repeat;
 		background-size: contain;
 		background-position: center;
-		width: 256px;
-		height: 128px;
-		margin: 0 auto;
-		&.logo-icon {
-			width: 62px;
-			height: 34px;
+		width: 62px;
+		height: 100%;
+		position: absolute;
+		left: 12px;
 
 		img {
 			opacity: 0;
@@ -121,10 +124,8 @@
 		}
 	}
 
-	}
 	.header-appname-container {
 		display: none;
-		padding-top: 22px;
 		padding-right: 10px;
 		flex-shrink: 0;
 	}
@@ -153,7 +154,6 @@
 
 	#header-right, .header-right {
 		justify-content: flex-end;
-		flex-basis: 210px;
 		flex-shrink: 1;
 	}
 
@@ -207,15 +207,12 @@
 
 /* show appname next to logo */
 .header-appname {
-	display: inline-block;
-	position: relative;
 	color: var(--color-primary-text);
 	font-size: 16px;
 	font-weight: 300;
 	margin: 0;
-	margin-top: -26px;
-	padding: 7px 0 7px 5px;
-	vertical-align: middle;
+	padding: 0;
+	padding-right: 5px;
 }
 
 /* do not show menu toggle on public share links as there is no menu */
diff --git a/core/js/js.js b/core/js/js.js
index 2812cba988c..201f4d7f09b 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1566,7 +1566,7 @@ function initCore() {
 
 	var resizeMenu = function() {
 		var appList = $('#appmenu li');
-		var headerWidth = $('.header-left').width() - $('#nextcloud').width();
+		var headerWidth = $('.header-left').outerWidth() - $('#nextcloud').outerWidth();
 		var usePercentualAppMenuLimit = 0.33;
 		var minAppsDesktop = 8;
 		var availableWidth = headerWidth - $(appList).width();