Skip to content

Commit 6adbe44

Browse files
susnuxnextcloud-command
authored andcommitted
refactor(UnifiedSearch): use NcHeaderButton for proper styles
Allowing to have the new styles from #54178 and nextcloud-libraries/nextcloud-vue#7242 Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
1 parent 7c69862 commit 6adbe44

1 file changed

Lines changed: 19 additions & 42 deletions

File tree

core/src/views/UnifiedSearch.vue

Lines changed: 19 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
- SPDX-License-Identifier: AGPL-3.0-or-later
44
-->
55
<template>
6-
<div class="header-menu unified-search-menu">
7-
<NcButton v-show="!showLocalSearch"
8-
class="header-menu__trigger"
6+
<div class="unified-search-menu">
7+
<NcHeaderButton v-show="!showLocalSearch"
98
:aria-label="t('core', 'Unified search')"
10-
type="tertiary-no-background"
119
@click="toggleUnifiedSearch">
1210
<template #icon>
13-
<Magnify class="header-menu__trigger-icon" :size="20" />
11+
<NcIconSvgWrapper :path="mdiMagnify" />
1412
</template>
15-
</NcButton>
13+
</NcHeaderButton>
1614
<UnifiedSearchLocalSearchBar v-if="supportsLocalSearch"
1715
:open.sync="showLocalSearch"
1816
:query.sync="queryText"
@@ -24,25 +22,24 @@
2422
</template>
2523

2624
<script lang="ts">
25+
import { mdiMagnify } from '@mdi/js'
2726
import { emit, subscribe } from '@nextcloud/event-bus'
28-
import { translate } from '@nextcloud/l10n'
27+
import { t } from '@nextcloud/l10n'
2928
import { useBrowserLocation } from '@vueuse/core'
29+
import debounce from 'debounce'
3030
import { defineComponent } from 'vue'
31-
32-
import NcButton from '@nextcloud/vue/components/NcButton'
33-
import Magnify from 'vue-material-design-icons/Magnify.vue'
31+
import NcHeaderButton from '@nextcloud/vue/components/NcHeaderButton'
32+
import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
3433
import UnifiedSearchModal from '../components/UnifiedSearch/UnifiedSearchModal.vue'
3534
import UnifiedSearchLocalSearchBar from '../components/UnifiedSearch/UnifiedSearchLocalSearchBar.vue'
36-
37-
import debounce from 'debounce'
38-
import logger from '../logger'
35+
import logger from '../logger.js'
3936
4037
export default defineComponent({
4138
name: 'UnifiedSearch',
4239
4340
components: {
44-
NcButton,
45-
Magnify,
41+
NcHeaderButton,
42+
NcIconSvgWrapper,
4643
UnifiedSearchModal,
4744
UnifiedSearchLocalSearchBar,
4845
},
@@ -52,7 +49,9 @@ export default defineComponent({
5249
5350
return {
5451
currentLocation,
55-
t: translate,
52+
53+
mdiMagnify,
54+
t,
5655
}
5756
},
5857
@@ -175,31 +174,9 @@ export default defineComponent({
175174

176175
<style lang="scss" scoped>
177176
// this is needed to allow us overriding component styles (focus-visible)
178-
#header {
179-
.header-menu {
180-
display: flex;
181-
align-items: center;
182-
justify-content: center;
183-
184-
&__trigger {
185-
height: var(--header-height);
186-
width: var(--header-height) !important;
187-
188-
&:focus-visible {
189-
// align with other header menu entries
190-
outline: none !important;
191-
box-shadow: none !important;
192-
}
193-
194-
&:not(:hover,:focus,:focus-visible) {
195-
opacity: .85;
196-
}
197-
198-
&-icon {
199-
// ensure the icon has the correct color
200-
color: var(--color-background-plain-text) !important;
201-
}
202-
}
203-
}
177+
.unified-search-menu {
178+
display: flex;
179+
align-items: center;
180+
justify-content: center;
204181
}
205182
</style>

0 commit comments

Comments
 (0)