Merge pull request #4623 from nextcloud/deps/update

src/components/ActivityEntry.vue

@@ -24,7 +24,7 @@
 	<div v-if="activity" class="activity">
 		<div class="activity--header">
 			<img :src="activity.icon" class="activity--icon">
-			<RichText class="activity--subject" :text="message.subject" :arguments="message.parameters" />
+			<NcRichText class="activity--subject" :text="message.subject" :arguments="message.parameters" />
 			<div class="activity--timestamp">
 				{{ relativeDate(activity.datetime) }}
 			</div>
@@ -35,8 +35,7 @@
 </template>
 
 <script>
-import { RichText } from '@nextcloud/vue-richtext'
-import { NcUserBubble } from '@nextcloud/vue'
+import { NcRichText, NcUserBubble } from '@nextcloud/vue'
 import moment from '@nextcloud/moment'
 import DOMPurify from 'dompurify'
 import relativeDate from '../mixins/relativeDate.js'
@@ -61,7 +60,7 @@ const InternalLink = {
 export default {
 	name: 'ActivityEntry',
 	components: {
-		RichText,
+		NcRichText,
 	},
 	mixins: [relativeDate],
 	props: {

src/components/board/BoardSidebar.vue

@@ -27,31 +27,39 @@
 		@close="closeSidebar">
 		<NcAppSidebarTab id="sharing"
 			:order="0"
-			:name="t('deck', 'Sharing')"
-			icon="icon-shared">
+			:name="t('deck', 'Sharing')">
+			<template #icon>
+				<SharingIcon :size="20" />
+			</template>
 			<SharingTabSidebar :board="board" />
 		</NcAppSidebarTab>
 
 		<NcAppSidebarTab id="tags"
 			:order="1"
-			:name="t('deck', 'Tags')"
-			icon="icon-tag">
+			:name="t('deck', 'Tags')">
+			<template #icon>
+				<TagsIcon :size="20" />
+			</template>
 			<TagsTabSidebar :board="board" />
 		</NcAppSidebarTab>
 
 		<NcAppSidebarTab v-if="canEdit"
 			id="deleted"
 			:order="2"
-			:name="t('deck', 'Deleted items')"
-			icon="icon-delete">
+			:name="t('deck', 'Deleted items')">
+			<template #icon>
+				<TrashIcon :size="20" />
+			</template>
 			<DeletedTabSidebar :board="board" />
 		</NcAppSidebarTab>
 
 		<NcAppSidebarTab v-if="hasActivity"
 			id="activity"
 			:order="3"
-			:name="t('deck', 'Timeline')"
-			icon="icon-activity">
+			:name="t('deck', 'Timeline')">
+			<template #icon>
+				<ActivityIcon :size="20" />
+			</template>
 			<TimelineTabSidebar :board="board" />
 		</NcAppSidebarTab>
 	</NcAppSidebar>
@@ -64,7 +72,10 @@ import TagsTabSidebar from './TagsTabSidebar.vue'
 import DeletedTabSidebar from './DeletedTabSidebar.vue'
 import TimelineTabSidebar from './TimelineTabSidebar.vue'
 import { NcAppSidebar, NcAppSidebarTab } from '@nextcloud/vue'
-
+import ActivityIcon from 'vue-material-design-icons/LightningBolt.vue'
+import SharingIcon from 'vue-material-design-icons/ShareVariant.vue'
+import TagsIcon from 'vue-material-design-icons/TagMultiple.vue'
+import TrashIcon from 'vue-material-design-icons/Delete.vue'
 const capabilities = window.OC.getCapabilities()
 
 export default {
@@ -76,6 +87,10 @@ export default {
 		TagsTabSidebar,
 		DeletedTabSidebar,
 		TimelineTabSidebar,
+		ActivityIcon,
+		SharingIcon,
+		TagsIcon,
+		TrashIcon,
 	},
 	props: {
 		id: {

src/components/card/CardSidebar.vue

@@ -50,32 +50,38 @@
 
 		<NcAppSidebarTab id="details"
 			:order="0"
-			:name="t('deck', 'Details')"
-			icon="icon-home">
+			:name="t('deck', 'Details')">
 			<CardSidebarTabDetails :card="currentCard" />
+			<template #icon>
+				<HomeIcon :size="20" />
+			</template>
 		</NcAppSidebarTab>
 
 		<NcAppSidebarTab id="attachments"
 			:order="1"
 			:name="t('deck', 'Attachments')">
 			<template #icon>
-				<AttachmentIcon :size="20" decorative />
+				<AttachmentIcon :size="20" />
 			</template>
 			<CardSidebarTabAttachments :card="currentCard" />
 		</NcAppSidebarTab>
 
 		<NcAppSidebarTab id="comments"
 			:order="2"
-			:name="t('deck', 'Comments')"
-			icon="icon-comment">
+			:name="t('deck', 'Comments')">
+			<template #icon>
+				<CommentIcon :size="20" />
+			</template>
 			<CardSidebarTabComments :card="currentCard" :tab-query="tabQuery" />
 		</NcAppSidebarTab>
 
 		<NcAppSidebarTab v-if="hasActivity"
 			id="timeline"
 			:order="3"
-			:name="t('deck', 'Timeline')"
-			icon="icon-activity">
+			:name="t('deck', 'Timeline')">
+			<template #icon>
+				<ActivityIcon :size="20" />
+			</template>
 			<CardSidebarTabActivity :card="currentCard" />
 		</NcAppSidebarTab>
 	</NcAppSidebar>
@@ -92,6 +98,9 @@ import CardSidebarTabActivity from './CardSidebarTabActivity.vue'
 import relativeDate from '../../mixins/relativeDate.js'
 import moment from '@nextcloud/moment'
 import AttachmentIcon from 'vue-material-design-icons/Paperclip.vue'
+import HomeIcon from 'vue-material-design-icons/Home.vue'
+import CommentIcon from 'vue-material-design-icons/Comment.vue'
+import ActivityIcon from 'vue-material-design-icons/LightningBolt.vue'
 
 import { showError } from '@nextcloud/dialogs'
 import { getLocale } from '@nextcloud/l10n'
@@ -108,7 +117,10 @@ export default {
 		CardSidebarTabComments,
 		CardSidebarTabActivity,
 		CardSidebarTabDetails,
+		ActivityIcon,
 		AttachmentIcon,
+		CommentIcon,
+		HomeIcon,
 	},
 	mixins: [relativeDate],
 	props: {

src/components/card/CommentItem.vue

@@ -12,7 +12,7 @@
 					</NcActionButton>
 				</NcActions>
 			</div>
-			<RichText class="comment--content"
+			<NcRichText class="comment--content"
 				:text="richText(comment)"
 				:arguments="richArgs(comment)"
 				:autolink="true" />
@@ -54,7 +54,7 @@
 		</div>
 		<CommentItem v-if="comment.replyTo" :reply="true" :comment="comment.replyTo" />
 		<div v-show="!edit" ref="richTextElement">
-			<RichText class="comment--content"
+			<NcRichText class="comment--content"
 				:text="richText(comment)"
 				:arguments="richArgs(comment)"
 				:autolink="true" />
@@ -64,8 +64,7 @@
 </template>
 
 <script>
-import { NcAvatar, NcActions, NcActionButton, NcUserBubble } from '@nextcloud/vue'
-import { RichText } from '@nextcloud/vue-richtext'
+import { NcAvatar, NcActions, NcActionButton, NcRichText, NcUserBubble } from '@nextcloud/vue'
 import CommentForm from './CommentForm.vue'
 import { getCurrentUser } from '@nextcloud/auth'
 import md5 from 'blueimp-md5'
@@ -93,7 +92,7 @@ export default {
 		NcActions,
 		NcActionButton,
 		CommentForm,
-		RichText,
+		NcRichText,
 		ReplyIcon,
 	},
 	mixins: [relativeDate],

src/components/search/GlobalSearchResults.vue

@@ -23,7 +23,7 @@
 <template>
 	<div v-if="searchQuery!==''" class="global-search">
 		<h2>
-			<RichText :text="t('deck', 'Search for {searchQuery} in all boards')" :arguments="queryStringArgs" />
+			<NcRichText :text="t('deck', 'Search for {searchQuery} in all boards')" :arguments="queryStringArgs" />
 			<div v-if="loading" class="icon-loading-small" />
 		</h2>
 		<NcActions>
@@ -57,9 +57,8 @@ import { mapState } from 'vuex'
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 import InfiniteLoading from 'vue-infinite-loading'
-import { RichText } from '@nextcloud/vue-richtext'
 import Placeholder from './Placeholder.vue'
-import { NcActions, NcActionButton } from '@nextcloud/vue'
+import { NcActions, NcActionButton, NcRichText } from '@nextcloud/vue'
 
 const createCancelToken = () => axios.CancelToken.source()
 
@@ -88,7 +87,7 @@ function search({ query, cursor }) {
 
 export default {
 	name: 'GlobalSearchResults',
-	components: { CardItem, InfiniteLoading, RichText, Placeholder, NcActions, NcActionButton },
+	components: { CardItem, InfiniteLoading, NcRichText, Placeholder, NcActions, NcActionButton },
 	data() {
 		return {
 			results: [],