From d55bbf17ada3f606b50ac635d71c95b2fc538098 Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Tue, 31 Aug 2021 13:18:34 +0200
Subject: [PATCH] Fix position of search bar

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
---
 core/src/components/HeaderMenu.vue | 14 ++++++++++----
 core/templates/layout.user.php     |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/core/src/components/HeaderMenu.vue b/core/src/components/HeaderMenu.vue
index 44d9c6d1a1e5e..0bf6dbfc51086 100644
--- a/core/src/components/HeaderMenu.vue
+++ b/core/src/components/HeaderMenu.vue
@@ -163,6 +163,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.notifications:not(:empty) ~ #unified-search {
+	order: -1;
+	.header-menu__carret {
+		right: 175px;
+	}
+}
 .header-menu {
 	&__trigger {
 		display: flex;
@@ -184,10 +190,10 @@ export default {
 	}
 
 	&__wrapper {
-		position: absolute;
+		position: fixed;
 		z-index: 2000;
 		top: 50px;
-		right: -150px;
+		right: 0;
 		box-sizing: border-box;
 		margin: 0;
 		border-radius: 0 0 var(--border-radius) var(--border-radius);
@@ -198,7 +204,7 @@ export default {
 
 	&__carret {
 		position: absolute;
-		right: 165px;
+		right: 128px;
 		bottom: 100%;
 		width: 0;
 		height: 0;
@@ -211,7 +217,7 @@ export default {
 	&__content {
 		overflow: auto;
 		width: 350px;
-		max-width: 350px;
+		max-width: 100vw;
 		min-height: calc(44px * 1.5);
 		max-height: calc(100vh - 50px * 2);
 	}
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 3a698550ead76..c1e30894c4d18 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -103,8 +103,8 @@
 			</div>
 
 			<div class="header-right">
-				<div id="unified-search"></div>
 				<div id="notifications"></div>
+				<div id="unified-search"></div>
 				<div id="contactsmenu">
 					<div class="icon-contacts menutoggle" tabindex="0" role="button"
 					aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false">