Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Petry <vincent@nextcloud.com>2021-06-22 18:42:44 +0300
committerVincent Petry <vincent@nextcloud.com>2021-06-22 18:42:44 +0300
commit1c2aae6c8745d7b5d19122c5da630914f9cb8d20 (patch)
tree264f8cb10b706f13d1e24561ba5d792f498f4852 /src/components/NewMessageForm
parent40ec034568336675c9d3230ee2df6afb26a0ea87 (diff)
Fix emoji picker icon in guest mode
Moved emoji picker div into the input div so we can use its relative position. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Diffstat (limited to 'src/components/NewMessageForm')
-rw-r--r--src/components/NewMessageForm/NewMessageForm.vue37
1 files changed, 19 insertions, 18 deletions
diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index cd9e0d3ab..6f3ae7de4 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -67,24 +67,24 @@
</ActionButton>
</Actions>
</div>
- <div class="new-message-form__emoji-picker">
- <EmojiPicker
- container="#content-vue"
- @select="addEmoji">
- <button
- type="button"
- :disabled="disabled"
- class="nc-button nc-button__main emoji-picker-button"
- :aria-label="t('spreed', 'Add emoji')"
- :aria-haspopup="true">
- <EmoticonOutline
- :size="16"
- decorative
- title="" />
- </button>
- </EmojiPicker>
- </div>
<div class="new-message-form__input">
+ <div class="new-message-form__emoji-picker">
+ <EmojiPicker
+ container="#content-vue"
+ @select="addEmoji">
+ <button
+ type="button"
+ :disabled="disabled"
+ class="nc-button nc-button__main emoji-picker-button"
+ :aria-label="t('spreed', 'Add emoji')"
+ :aria-haspopup="true">
+ <EmoticonOutline
+ :size="16"
+ decorative
+ title="" />
+ </button>
+ </EmojiPicker>
+ </div>
<div v-if="messageToBeReplied" class="new-message-form__quote">
<Quote
:is-new-message-form-quote="true"
@@ -504,7 +504,7 @@ export default {
margin: 0 4px;
&__emoji-picker {
position: absolute;
- left: 48px;
+ left: 5px;
bottom: 1;
.emoji-picker-button {
opacity: .7;
@@ -520,6 +520,7 @@ export default {
&__input {
flex-grow: 1;
overflow: hidden;
+ position: relative;
}
&__quote {
margin: 0 16px 12px 24px;