ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-16 18:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lint

Browse Source
This commit is contained in:
Wolfgang Huß 2020-01-22 13:34:52 +01:00
parent 0bb2b905ee
commit 1c0d54a935
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
webapp/components/Notification/Notification.vue
View File

@ -2,10 +2,7 @@
<ds-space :class="{ read: notificationData.read, notification: true }" margin-bottom="x-small">
<client-only>
<ds-space margin-bottom="x-small">
<user-teaser
:user="notificationData.triggerer"
:date-time="notificationData.createdAt"
/>
<user-teaser :user="notificationData.triggerer" :date-time="notificationData.createdAt" />
</ds-space>
<ds-text class="reason-text-for-test" color="soft">
<base-icon
@ -35,7 +32,12 @@
@click.native="$emit('read')"
>
<ds-space margin-bottom="x-small">
<ds-card :header="(notificationData.post || notificationData.comment) && notificationData.title" hover space="x-small" class="notifications-card">
<ds-card
:header="(notificationData.post || notificationData.comment) && notificationData.title"
hover
space="x-small"
class="notifications-card"
>
<div v-if="notificationData.user">
<!-- because of different margin above ds-card content without header property -->
<ds-space margin-bottom="small" />
@ -49,7 +51,9 @@
</div>
<div v-if="notificationData.report">
<ds-space margin-bottom="x-small" />
<span class="notification-content-header-text">{{ $t(`notifications.report.category`) }}:</span>
<span class="notification-content-header-text">
{{ $t(`notifications.report.category`) }}:
</span>
{{ $t('report.reason.category.options.' + notificationData.report.reasonCategory) }}
<br />
<span class="notification-content-header-text">
@ -68,7 +72,10 @@
</span>
</div>
<!-- because of different margin underneath ds-card content without header property -->
<ds-space v-if="!(notificationData.post || notificationData.comment)" margin-bottom="base" />
<ds-space
v-if="!(notificationData.post || notificationData.comment)"
margin-bottom="base"
/>
</ds-card>
</ds-space>
</nuxt-link>

8
webapp/components/NotificationsTable/NotificationsTable.vue
View File

@ -60,10 +60,14 @@
</div>
<div v-if="scope.row.report" :class="{ 'notification-status': scope.row.read }">
<ds-space margin-bottom="x-small" />
<span class="notification-content-header-text">{{ $t(`notifications.report.category`) }}:</span>
<span class="notification-content-header-text">
{{ $t(`notifications.report.category`) }}:
</span>
{{ $t('report.reason.category.options.' + scope.row.report.reasonCategory) }}
<br />
<span class="notification-content-header-text">{{ $t(`notifications.report.description`) }}:</span>
<span class="notification-content-header-text">
{{ $t(`notifications.report.description`) }}:
</span>
<span
v-if="scope.row.report.reasonDescription && scope.row.report.reasonDescription !== ''"
>