diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-12-22 16:00:12 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-12-22 16:00:12 +0000 |
| commit | a39866308cd7c8cb0d30a04a5215d1fae8bf8d47 (patch) | |
| tree | 59230ab336bf3bd13f0d046c6f45842a7fbdd02c /src/components/react_button/react_button.vue | |
| parent | a7567ce6d01781b4b1ff47f805b4a9a5109e960b (diff) | |
| parent | 00cb8d9dcee9a403fedb2800a0cdc4b0f77a0429 (diff) | |
Merge branch 'rc/2.2.2' into 'master'
prepare master for 2.2.2
See merge request pleroma/pleroma-fe!1315
Diffstat (limited to 'src/components/react_button/react_button.vue')
| -rw-r--r-- | src/components/react_button/react_button.vue | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue index e508a3e9..ac940b98 100644 --- a/src/components/react_button/react_button.vue +++ b/src/components/react_button/react_button.vue @@ -3,8 +3,8 @@ trigger="click" placement="top" :offset="{ y: 5 }" - class="react-button-popover" :bound-to="{ x: 'container' }" + remove-padding > <div slot="content" @@ -20,17 +20,19 @@ <div class="reaction-picker"> <span v-for="emoji in commonEmojis" - :key="emoji" + :key="emoji.replacement" class="emoji-button" - @click="addReaction($event, emoji, close)" + :title="emoji.displayText" + @click="addReaction($event, emoji.replacement, close)" > - {{ emoji }} + {{ emoji.replacement }} </span> <div class="reaction-picker-divider" /> <span v-for="(emoji, key) in emojis" :key="key" class="emoji-button" + :title="emoji.displayText" @click="addReaction($event, emoji.replacement, close)" > {{ emoji.replacement }} @@ -38,11 +40,14 @@ <div class="reaction-bottom-fader" /> </div> </div> - <span slot="trigger"> + <span + slot="trigger" + class="ReactButton" + :title="$t('tool_tip.add_reaction')" + > <FAIcon - class="fa-scale-110 fa-old-padding add-reaction-button" + class="fa-scale-110 fa-old-padding" :icon="['far', 'smile-beam']" - :title="$t('tool_tip.add_reaction')" /> </span> </Popover> @@ -102,10 +107,11 @@ } } -.add-reaction-button { - cursor: pointer; +.ReactButton { + padding: 10px; + margin: -10px; - &:hover { + &:hover .svg-inline--fa { color: $fallback--text; color: var(--text, $fallback--text); } |