From cea667e0e330959a81ccbff4a863823132065652 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Tue, 31 Mar 2020 23:05:28 +0300
Subject: [PATCH] Fix displaing emoji from remote packs
---
src/views/emojiPacks/components/SingleEmojiEditor.vue | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/views/emojiPacks/components/SingleEmojiEditor.vue b/src/views/emojiPacks/components/SingleEmojiEditor.vue
index 998a3d79..a1d2383a 100644
--- a/src/views/emojiPacks/components/SingleEmojiEditor.vue
+++ b/src/views/emojiPacks/components/SingleEmojiEditor.vue
@@ -34,6 +34,7 @@
<el-button
:disabled="!copyToLocalPackName"
type="primary"
+ class="copy-to-local-pack-button"
@click="copyToLocal">{{ $t('emoji.copy') }}</el-button>
<el-button slot="reference" type="primary" class="emoji-button">{{ $t('emoji.copyToLocalPack') }}</el-button>
</el-popover>
@@ -102,7 +103,7 @@ export default {
return this.$store.state.emojiPacks.localPacks
},
remoteInstance() {
- return this.$store.state.emojiPacks.remoteInstance
+ return new URL(this.$store.state.emojiPacks.remoteInstance).host
}
},
methods: {
@@ -167,6 +168,10 @@ export default {
.copy-popover {
width: 330px
}
+.copy-to-local-pack-button {
+ margin-top: 15px;
+ float: right;
+}
.emoji-buttons {
place-self: center;
min-width: 200px
--
GitLab