Skip to content

Commit b42f6bd

Browse files
authored
Merge pull request #54143 from nextcloud/fix/icons-header-meu
fix(ContactsMenu): use proper icons in the header navigation
2 parents b4803f9 + d3e4db1 commit b42f6bd

108 files changed

Lines changed: 176 additions & 167 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

core/src/views/ContactsMenu.vue

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
:aria-label="t('core', 'Search contacts')"
1010
@open="handleOpen">
1111
<template #trigger>
12-
<Contacts class="contactsmenu__trigger-icon" :size="20" />
12+
<NcIconSvgWrapper class="contactsmenu__trigger-icon" :path="mdiContacts" />
1313
</template>
1414
<div class="contactsmenu__menu">
1515
<div class="contactsmenu__menu__input-wrapper">
@@ -27,7 +27,7 @@
2727
</div>
2828
<NcEmptyContent v-if="error" :name="t('core', 'Could not load your contacts')">
2929
<template #icon>
30-
<Magnify />
30+
<NcIconSvgWrapper :path="mdiMagnify" />
3131
</template>
3232
</NcEmptyContent>
3333
<NcEmptyContent v-else-if="loadingText" :name="loadingText">
@@ -37,7 +37,7 @@
3737
</NcEmptyContent>
3838
<NcEmptyContent v-else-if="contacts.length === 0" :name="t('core', 'No contacts found')">
3939
<template #icon>
40-
<Magnify />
40+
<NcIconSvgWrapper :path="mdiMagnify" />
4141
</template>
4242
</NcEmptyContent>
4343
<div v-else class="contactsmenu__menu__content">
@@ -62,40 +62,46 @@
6262
</template>
6363

6464
<script>
65+
import { mdiContacts, mdiMagnify } from '@mdi/js'
6566
import { generateUrl } from '@nextcloud/router'
6667
import { getCurrentUser } from '@nextcloud/auth'
6768
import { t } from '@nextcloud/l10n'
6869
import axios from '@nextcloud/axios'
6970
import debounce from 'debounce'
7071
71-
import Contacts from 'vue-material-design-icons/ContactsOutline.vue'
72-
import Magnify from 'vue-material-design-icons/Magnify.vue'
7372
import NcButton from '@nextcloud/vue/components/NcButton'
7473
import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
7574
import NcHeaderMenu from '@nextcloud/vue/components/NcHeaderMenu'
75+
import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
7676
import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
77+
import NcTextField from '@nextcloud/vue/components/NcTextField'
7778
7879
import Contact from '../components/ContactsMenu/Contact.vue'
7980
import logger from '../logger.js'
8081
import Nextcloud from '../mixins/Nextcloud.js'
81-
import NcTextField from '@nextcloud/vue/components/NcTextField'
8282
8383
export default {
8484
name: 'ContactsMenu',
8585
8686
components: {
8787
Contact,
88-
Contacts,
89-
Magnify,
9088
NcButton,
9189
NcEmptyContent,
9290
NcHeaderMenu,
91+
NcIconSvgWrapper,
9392
NcLoadingIcon,
9493
NcTextField,
9594
},
9695
9796
mixins: [Nextcloud],
9897
98+
setup() {
99+
return {
100+
mdiContacts,
101+
mdiMagnify,
102+
}
103+
},
104+
99105
data() {
100106
const user = getCurrentUser()
101107
return {

dist/7432-7432.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/7432-7432.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.

dist/comments-comments-app.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/comments-comments-app.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.

dist/comments-comments-tab.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/comments-comments-tab.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.

dist/core-common.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-common.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.

dist/core-legacy-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.

0 commit comments

Comments
 (0)