Skip to content

Commit

Permalink
Merge pull request #2885 from nextcloud/enh/NcNoteCard
Browse files Browse the repository at this point in the history
use NcNoteCard
  • Loading branch information
dartcafe committed May 1, 2023
2 parents 8698152 + a7e9672 commit 787e3e3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
### Fix
- show unprocessed share invitations
- fix bulk adding of options
### Changes
- change warning design (use NcNoteCard)
# [5.0.4] - 2023-04-25
### Fix
- Ensure duplicate removal after migration and in repair command
Expand Down
7 changes: 4 additions & 3 deletions src/js/components/SideBar/SideBarTabConfiguration.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

<template>
<div>
<div v-if="hasVotes" class="warning">
<NcNoteCard v-if="hasVotes" type="warning">
{{ t('polls', 'Please be careful when changing options, because it can affect existing votes in an unwanted manner.') }}
</div>
</NcNoteCard>

<ConfigBox v-if="!isOwner" :title="t('polls', 'As an admin you may edit this poll')" icon-class="icon-checkmark" />

Expand Down Expand Up @@ -100,7 +100,7 @@
<script>
import { mapGetters, mapState } from 'vuex'
import { showError } from '@nextcloud/dialogs'
import { NcButton } from '@nextcloud/vue'
import { NcButton, NcNoteCard } from '@nextcloud/vue'
import moment from '@nextcloud/moment'
import ConfigBox from '../Base/ConfigBox.vue'
import ConfigAllowComment from '../Configuration/ConfigAllowComment.vue'
Expand Down Expand Up @@ -157,6 +157,7 @@ export default {
ConfigUseNo,
ConfigVoteLimit,
NcButton,
NcNoteCard,
},
mixins: [writePoll],
Expand Down

0 comments on commit 787e3e3

Please sign in to comment.