aboutsummaryrefslogtreecommitdiff
path: root/src/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/components')
-rw-r--r--src/components/emoji_reactions/emoji_reactions.vue6
-rw-r--r--src/components/react_button/react_button.js9
-rw-r--r--src/components/react_button/react_button.vue3
3 files changed, 5 insertions, 13 deletions
diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index 8a229240..741fc11e 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -7,8 +7,8 @@
:class="{ 'picked-reaction': reactedWith(reaction.emoji) }"
@click="emojiOnClick(reaction.emoji, $event)"
>
- <span>{{ reaction.count }}</span>
<span>{{ reaction.emoji }}</span>
+ <span>{{ reaction.count }}</span>
</button>
</div>
</template>
@@ -31,10 +31,10 @@
align-items: center;
justify-content: center;
box-sizing: border-box;
- :first-child {
+ &:first-child {
margin-right: 0.25em;
}
- :last-child {
+ &:last-child {
width: 1.5em;
}
&:focus {
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index d1a179bc..6fb2a780 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -4,7 +4,6 @@ const ReactButton = {
props: ['status', 'loggedIn'],
data () {
return {
- animated: false,
showTooltip: false,
filterWord: '',
popperOptions: {
@@ -29,7 +28,7 @@ const ReactButton = {
},
computed: {
commonEmojis () {
- return ['💖', '😠', '👀', '😂', '🔥']
+ return ['❤️', '😠', '👀', '😂', '🔥']
},
emojis () {
if (this.filterWord !== '') {
@@ -37,12 +36,6 @@ const ReactButton = {
}
return this.$store.state.instance.emoji || []
},
- classes () {
- return {
- 'icon-smile': true,
- 'animate-spin': this.animated
- }
- },
...mapGetters(['mergedConfig'])
}
}
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index 7f1bc492..c925dd71 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -40,8 +40,7 @@
@click.prevent="openReactionSelect"
>
<i
- :class="classes"
- class="button-icon add-reaction-button"
+ class="icon-smile button-icon add-reaction-button"
:title="$t('tool_tip.add_reaction')"
/>
</div>