Merge pull request #28673 from nextcloud/backport/28660/stable21

[stable21] Fix position of search bar
nextcloud · Sep 3, 2021 · 5df3878 · 5df3878
2 parents 9d9f8d0 + 35eca15
commit 5df3878
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/core/js/dist/unified-search.js b/core/js/dist/unified-search.js
diff --git a/core/js/dist/unified-search.js.map b/core/js/dist/unified-search.js.map
diff --git 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
@@ -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">