Skip to content

Commit 984d5ee

Browse files
authored
Merge pull request #33974 from nextcloud/fix/search-menu
Fix UnifiedSearch
2 parents f8796b8 + 9e04544 commit 984d5ee

File tree

5 files changed

+20
-7
lines changed

5 files changed

+20
-7
lines changed

core/src/components/HeaderMenu.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ export default {
161161
</script>
162162

163163
<style lang="scss" scoped>
164+
$externalMargin: 8px;
165+
164166
.header-menu {
165167
&__trigger {
166168
display: flex;
@@ -191,11 +193,11 @@ export default {
191193
top: 50px;
192194
right: 0;
193195
box-sizing: border-box;
194-
margin: 0;
196+
margin: 0 $externalMargin;
195197
border-radius: 0 0 var(--border-radius) var(--border-radius);
196198
background-color: var(--color-main-background);
197199
filter: drop-shadow(0 1px 5px var(--color-box-shadow));
198-
padding: 20px;
200+
padding: 8px;
199201
border-radius: var(--border-radius-large);
200202
}
201203
@@ -215,7 +217,7 @@ export default {
215217
&__content {
216218
overflow: auto;
217219
width: 350px;
218-
max-width: 100vw;
220+
max-width: calc(100vw - 2 * $externalMargin);
219221
min-height: calc(44px * 1.5);
220222
max-height: calc(100vh - 50px * 2);
221223
}

core/src/components/UnifiedSearch/SearchResult.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ $margin: 10px;
169169
170170
.unified-search__result {
171171
display: flex;
172+
align-items: center;
172173
height: $clickable-area;
173174
padding: $margin;
174175
border-bottom: 1px solid var(--color-border);

core/src/views/UnifiedSearch.vue

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,9 +710,14 @@ $input-padding: 6px;
710710
align-self: flex-start;
711711
font-weight: bold;
712712
font-size: 18px;
713+
margin-left: 13px;
713714
}
714715
}
715716
717+
&__form-input {
718+
margin: 0 !important;
719+
}
720+
716721
&__input-row {
717722
display: flex;
718723
width: 100%;
@@ -774,9 +779,10 @@ $input-padding: 6px;
774779
&-reset, &-submit {
775780
position: absolute;
776781
top: 0;
777-
right: 0;
782+
right: 4px;
778783
width: $input-height - $input-padding;
779784
height: $input-height - $input-padding;
785+
min-height: 30px;
780786
padding: 0;
781787
opacity: .5;
782788
border: none;
@@ -799,11 +805,15 @@ $input-padding: 6px;
799805
&-header {
800806
display: block;
801807
margin: $margin;
808+
margin-bottom: $margin - 4px;
802809
margin-left: $margin + $input-padding;
803810
color: var(--color-primary-element);
804811
font-weight: normal;
805812
font-size: 18px;
806813
}
814+
display: flex;
815+
flex-direction: column;
816+
gap: 4px;
807817
}
808818
809819
.unified-search__result-more::v-deep {

dist/core-unified-search.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-unified-search.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)