Merge pull request #28672 from nextcloud/backport/28660/stable20

[stable20] Fix position of search bar
nextcloud · Sep 3, 2021 · 864dd06 · 864dd06
2 parents f506d45 + 25a4914
commit 864dd06
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 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
@@ -154,6 +154,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;
@@ -175,10 +181,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);
@@ -189,7 +195,7 @@ export default {
 
 	&__carret {
 		position: absolute;
-		right: 165px;
+		right: 128px;
 		bottom: 100%;
 		width: 0;
 		height: 0;
@@ -202,7 +208,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);
 	}