Skip to content

[stable5.6] fix(Settings): followup on redesign #12048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristophWurst merged 1 commit into from
Nov 18, 2025
Merged

[stable5.6] fix(Settings): followup on redesign #12048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/components/AppSettingsMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
:aria-label="t('mail', 'Account settings')"
@click="openAccountSettings(account.id)">
<template #icon>
<IconLink :size="20" />
<IconArrow :size="20" />
</template>
{{ account.emailAddress }}
</NcFormBoxButton>
Expand Down Expand Up @@ -112,7 +112,10 @@
<List
:text-blocks="getMyTextBlocks()"
@show-toolbar="handleShowToolbar" />
<NcButton variant="secondary" @click="() => textBlockDialogOpen = true" wide>
<NcButton variant="secondary" wide @click="() => textBlockDialogOpen = true">
<template #icon>
<IconAdd :size="20" />
</template>
{{ t('mail', 'New text block') }}
</NcButton>
<template v-if="getSharedTextBlocks().length > 0">
Expand All @@ -129,7 +132,7 @@
<NcFormBoxSwitch
v-model="useDataCollection"
:label="t('mail', 'Data collection')"
:description="t('mail', 'Allow the app to collect and process data locally to adapt to your preferences.')"
:description="t('mail', 'Allow the app to collect and process data locally to adapt to your preferences')"
@update:modelValue="onToggleCollectData" />

<NcFormGroup :label="t('mail', 'Always show images from')">
Expand All @@ -141,7 +144,7 @@
v-model="useInternalAddresses"
:disabled="loadingInternalAddresses"
:label="internalAddressText"
:description="t('mail', 'Highlight external email addresses by enabling this feature, manage your internal addresses and domains to ensure recognized contacts stay unmarked.')"
:description="t('mail', 'Manage your internal addresses and domains to ensure recognized contacts stay unmarked')"
@update:modelValue="onToggleInternalAddress" />
<InternalAddress />

Expand Down Expand Up @@ -279,7 +282,7 @@ import {
} from '@nextcloud/vue'
import mitt from 'mitt'
import { mapState, mapStores } from 'pinia'
import IconLink from 'vue-material-design-icons/ArrowTopRight.vue'
import IconArrow from 'vue-material-design-icons/ArrowRight.vue'
import IconCheck from 'vue-material-design-icons/Check.vue'
import IconClose from 'vue-material-design-icons/Close.vue'
import HorizontalSplit from 'vue-material-design-icons/DockBottom.vue'
Expand Down Expand Up @@ -323,11 +326,11 @@ export default {
NcFormBoxButton,
NcFormBoxSwitch,
NcFormGroup,
IconLink,
IconDomain,
NcNoteCard,
NcHotkeyList,
NcHotkey,
IconArrow,
},

props: {
Expand Down
5 changes: 5 additions & 0 deletions src/components/InternalAddress.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
type="secondary"
wide
@click="openDialog = true">
<template #icon>
<IconAdd :size="20" />
</template>
{{ t('mail', 'Add internal address') }}
</ButtonVue>
<NcDialog
Expand All @@ -76,6 +79,7 @@ import sortBy from 'lodash/fp/sortBy.js'
import { mapStores } from 'pinia'
import IconDomain from 'vue-material-design-icons/Domain.vue'
import IconEmail from 'vue-material-design-icons/EmailOutline.vue'
import IconAdd from 'vue-material-design-icons/Plus.vue'
import IconDelete from 'vue-material-design-icons/TrashCanOutline.vue'
import logger from '../logger.js'
import useMainStore from '../store/mainStore.js'
Expand All @@ -93,6 +97,7 @@ export default {
IconDomain,
IconEmail,
IconDelete,
IconAdd,
},

data() {
Expand Down
Loading