mirror of
https://github.com/nextcloud/server.git
synced 2026-04-27 01:00:20 -04:00
fix(comments): Use proper icon components instead of icon classes to fix dark mode
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
parent
ba8a0ef0b4
commit
9154b8d6f4
2 changed files with 27 additions and 13 deletions
|
|
@ -40,22 +40,27 @@
|
|||
show if we have a message id and current user is author -->
|
||||
<NcActions v-if="isOwnComment && id && !loading" class="comment__actions">
|
||||
<template v-if="!editing">
|
||||
<NcActionButton :close-after-click="true"
|
||||
icon="icon-rename"
|
||||
<NcActionButton close-after-click
|
||||
@click="onEdit">
|
||||
<template #icon>
|
||||
<IconEdit :size="20" />
|
||||
</template>
|
||||
{{ t('comments', 'Edit comment') }}
|
||||
</NcActionButton>
|
||||
<NcActionSeparator />
|
||||
<NcActionButton :close-after-click="true"
|
||||
icon="icon-delete"
|
||||
<NcActionButton close-after-click
|
||||
@click="onDeleteWithUndo">
|
||||
<template #icon>
|
||||
<IconDelete :size="20" />
|
||||
</template>
|
||||
{{ t('comments', 'Delete comment') }}
|
||||
</NcActionButton>
|
||||
</template>
|
||||
|
||||
<NcActionButton v-else
|
||||
icon="icon-close"
|
||||
@click="onEditCancel">
|
||||
<NcActionButton v-else @click="onEditCancel">
|
||||
<template #icon>
|
||||
<IconClose :size="20" />
|
||||
</template>
|
||||
{{ t('comments', 'Cancel edit') }}
|
||||
</NcActionButton>
|
||||
</NcActions>
|
||||
|
|
@ -87,8 +92,8 @@
|
|||
:disabled="isEmptyMessage"
|
||||
@click="onSubmit">
|
||||
<template #icon>
|
||||
<span v-if="loading" class="icon-loading-small" />
|
||||
<ArrowRight v-else :size="20" />
|
||||
<NcLoadingIcon v-if="loading" />
|
||||
<IconArrowRight v-else :size="20" />
|
||||
</template>
|
||||
</NcButton>
|
||||
</div>
|
||||
|
|
@ -122,7 +127,11 @@ import NcActionSeparator from '@nextcloud/vue/dist/Components/NcActionSeparator.
|
|||
import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
|
||||
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
|
||||
import RichEditorMixin from '@nextcloud/vue/dist/Mixins/richEditor.js'
|
||||
import ArrowRight from 'vue-material-design-icons/ArrowRight.vue'
|
||||
|
||||
import IconArrowRight from 'vue-material-design-icons/ArrowRight.vue'
|
||||
import IconClose from 'vue-material-design-icons/Close.vue'
|
||||
import IconDelete from 'vue-material-design-icons/Delete.vue'
|
||||
import IconEdit from 'vue-material-design-icons/Pencil.vue'
|
||||
|
||||
import Moment from './Moment.vue'
|
||||
import CommentMixin from '../mixins/CommentMixin.js'
|
||||
|
|
@ -134,15 +143,19 @@ export default {
|
|||
name: 'Comment',
|
||||
|
||||
components: {
|
||||
IconArrowRight,
|
||||
IconClose,
|
||||
IconDelete,
|
||||
IconEdit,
|
||||
Moment,
|
||||
NcActionButton,
|
||||
NcActions,
|
||||
NcActionSeparator,
|
||||
ArrowRight,
|
||||
NcAvatar,
|
||||
NcButton,
|
||||
Moment,
|
||||
NcRichContenteditable,
|
||||
},
|
||||
|
||||
mixins: [RichEditorMixin, CommentMixin],
|
||||
|
||||
inheritAttrs: false,
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import type { PropType } from 'vue'
|
||||
import { translate as t } from '@nextcloud/l10n'
|
||||
|
||||
import Comment from '../components/Comment.vue'
|
||||
|
|
@ -53,7 +54,7 @@ export default {
|
|||
required: true,
|
||||
},
|
||||
reloadCallback: {
|
||||
type: Function,
|
||||
type: Function as PropType<() => void>,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in a new issue