upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 23

Merge pull request #28660 from nextcloud/work/carl/fix-search-position

Browse source 
Fix position of search bar
This commit is contained in:
Carl Schwan 2021-08-31 18:26:11 +02:00 committed by GitHub
commit 734a750074
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/js/dist/unified-search.js vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/unified-search.js.map vendored
View file

File diff suppressed because one or more lines are too long

14
core/src/components/HeaderMenu.vue
View file

@ -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);
}

2
core/templates/layout.user.php
View file

@ -117,8 +117,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">