mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
Merge branch 'master' into 5984-fix-gap-news-feed
This commit is contained in:
commit
4a446706ce
@ -42,7 +42,7 @@
|
||||
</div>
|
||||
<div v-else class="categories-placeholder"></div>
|
||||
<counter-icon
|
||||
icon="bullhorn"
|
||||
icon="heart-o"
|
||||
:count="post.shoutedCount"
|
||||
:title="$t('contribution.amount-shouts', { amount: post.shoutedCount })"
|
||||
/>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
:loading="loading"
|
||||
:disabled="disabled"
|
||||
:filled="shouted"
|
||||
icon="bullhorn"
|
||||
icon="heart-o"
|
||||
circle
|
||||
@click="toggle"
|
||||
/>
|
||||
|
||||
@ -21,7 +21,7 @@ storiesOf('Generic/BaseButton', module)
|
||||
template: `
|
||||
<div>
|
||||
<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" loading />
|
||||
</div>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<div class="metadata">
|
||||
<span class="counts">
|
||||
<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="eye" :count="option.viewedTeaserCount" soft />
|
||||
</span>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user