diff options
author | Carl Schwan <carl@carlschwan.eu> | 2022-09-09 09:43:09 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-09 09:43:09 +0300 |
commit | 984d5ee7cbca9ad847c7c396cab73ec4b6c9983a (patch) | |
tree | c580ea4e5ceb2a28b33487b081d8c7d161ba32fe /core | |
parent | f8796b86d17ad5cdf33c6bad78627af9d9fb52ff (diff) | |
parent | 9e045447f7a0a4de9ed2b70b09d027eda2036693 (diff) |
Merge pull request #33974 from nextcloud/fix/search-menu
Fix UnifiedSearch
Diffstat (limited to 'core')
-rw-r--r-- | core/src/components/HeaderMenu.vue | 8 | ||||
-rw-r--r-- | core/src/components/UnifiedSearch/SearchResult.vue | 1 | ||||
-rw-r--r-- | core/src/views/UnifiedSearch.vue | 12 |
3 files changed, 17 insertions, 4 deletions
diff --git a/core/src/components/HeaderMenu.vue b/core/src/components/HeaderMenu.vue index 9a78b769dc3..172ea7268d8 100644 --- a/core/src/components/HeaderMenu.vue +++ b/core/src/components/HeaderMenu.vue @@ -161,6 +161,8 @@ export default { </script> <style lang="scss" scoped> +$externalMargin: 8px; + .header-menu { &__trigger { display: flex; @@ -191,11 +193,11 @@ export default { top: 50px; right: 0; box-sizing: border-box; - margin: 0; + margin: 0 $externalMargin; border-radius: 0 0 var(--border-radius) var(--border-radius); background-color: var(--color-main-background); filter: drop-shadow(0 1px 5px var(--color-box-shadow)); - padding: 20px; + padding: 8px; border-radius: var(--border-radius-large); } @@ -215,7 +217,7 @@ export default { &__content { overflow: auto; width: 350px; - max-width: 100vw; + max-width: calc(100vw - 2 * $externalMargin); min-height: calc(44px * 1.5); max-height: calc(100vh - 50px * 2); } diff --git a/core/src/components/UnifiedSearch/SearchResult.vue b/core/src/components/UnifiedSearch/SearchResult.vue index 9c787de111c..0b8b6c8b33e 100644 --- a/core/src/components/UnifiedSearch/SearchResult.vue +++ b/core/src/components/UnifiedSearch/SearchResult.vue @@ -169,6 +169,7 @@ $margin: 10px; .unified-search__result { display: flex; + align-items: center; height: $clickable-area; padding: $margin; border-bottom: 1px solid var(--color-border); diff --git a/core/src/views/UnifiedSearch.vue b/core/src/views/UnifiedSearch.vue index e7d3f9d5809..8611779754f 100644 --- a/core/src/views/UnifiedSearch.vue +++ b/core/src/views/UnifiedSearch.vue @@ -710,9 +710,14 @@ $input-padding: 6px; align-self: flex-start; font-weight: bold; font-size: 18px; + margin-left: 13px; } } + &__form-input { + margin: 0 !important; + } + &__input-row { display: flex; width: 100%; @@ -774,9 +779,10 @@ $input-padding: 6px; &-reset, &-submit { position: absolute; top: 0; - right: 0; + right: 4px; width: $input-height - $input-padding; height: $input-height - $input-padding; + min-height: 30px; padding: 0; opacity: .5; border: none; @@ -799,11 +805,15 @@ $input-padding: 6px; &-header { display: block; margin: $margin; + margin-bottom: $margin - 4px; margin-left: $margin + $input-padding; color: var(--color-primary-element); font-weight: normal; font-size: 18px; } + display: flex; + flex-direction: column; + gap: 4px; } .unified-search__result-more::v-deep { |