ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 5984-fix-gap-news-feed

Browse Source
This commit is contained in:
Wolfgang Huß 2023-03-10 12:02:18 +01:00 committed by GitHub
commit 4a446706ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/components/PostTeaser/PostTeaser.vue
View File

@ -42,7 +42,7 @@
</div> </div>
<div v-else class="categories-placeholder"></div> <div v-else class="categories-placeholder"></div>
<counter-icon <counter-icon
icon="bullhorn" icon="heart-o"
:count="post.shoutedCount" :count="post.shoutedCount"
:title="$t('contribution.amount-shouts', { amount: post.shoutedCount })" :title="$t('contribution.amount-shouts', { amount: post.shoutedCount })"
/> />

2
webapp/components/ShoutButton.vue
View File

@ -4,7 +4,7 @@
:loading="loading" :loading="loading"
:disabled="disabled" :disabled="disabled"
:filled="shouted" :filled="shouted"
icon="bullhorn" icon="heart-o"
circle circle
@click="toggle" @click="toggle"
/> />

2
webapp/components/_new/generic/BaseButton/BaseButton.story.js
View File

@ -21,7 +21,7 @@ storiesOf('Generic/BaseButton', module)
template: ` template: `
<div> <div>
<base-button icon="edit">With Text</base-button> <base-button icon="edit">With Text</base-button>
<base-button icon="bullhorn" /> <base-button icon="heart-o" />
<base-button icon="trash" disabled /> <base-button icon="trash" disabled />
<base-button icon="trash" loading /> <base-button icon="trash" loading />
</div> </div>

2
webapp/components/generic/SearchPost/SearchPost.vue
View File

@ -4,7 +4,7 @@
<div class="metadata"> <div class="metadata">
<span class="counts"> <span class="counts">
<counter-icon icon="comments" :count="option.commentsCount" soft /> <counter-icon icon="comments" :count="option.commentsCount" soft />
<counter-icon icon="bullhorn" :count="option.shoutedCount" soft /> <counter-icon icon="heart-o" :count="option.shoutedCount" soft />
<counter-icon icon="hand-pointer" :count="option.clickedCount" soft /> <counter-icon icon="hand-pointer" :count="option.clickedCount" soft />
<counter-icon icon="eye" :count="option.viewedTeaserCount" soft /> <counter-icon icon="eye" :count="option.viewedTeaserCount" soft />
</span> </span>