diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-12-03 17:33:09 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-12-04 16:26:23 +0100 |
| commit | da6bcc1450181251f12a6e493d3d00520a84c528 (patch) | |
| tree | e181a10f5b9c062a43f5b158ce30aea10dba9c44 /src | |
| parent | e08e64477ec1713843bef43d88e0d1d0c9e54346 (diff) | |
Fix centering of timeline and search
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/Composer.vue | 16 | ||||
| -rw-r--r-- | src/components/Search.vue | 2 | ||||
| -rw-r--r-- | src/components/TimelineEntry.vue | 6 | ||||
| -rw-r--r-- | src/views/Timeline.vue | 2 |
4 files changed, 18 insertions, 8 deletions
diff --git a/src/components/Composer.vue b/src/components/Composer.vue index eda636e6..11f20a0e 100644 --- a/src/components/Composer.vue +++ b/src/components/Composer.vue @@ -35,14 +35,16 @@ <div v-contenteditable:post.dangerousHTML="canType" ref="composerInput" class="message" placeholder="Share a thought…" @keyup.enter="keyup" /> </vue-tribute> - <emoji-picker :search="search" class="emoji-picker-wrapper" @emoji="insert"> + <emoji-picker ref="emojiPicker" :search="search" class="emoji-picker-wrapper" + @emoji="insert"> <a v-tooltip="'Insert emoji'" slot="emoji-invoker" slot-scope="{ events }" class="emoji-invoker" tabindex="0" v-on="events" @keyup.enter="events.click" @keyup.space="events.click" /> <div slot="emoji-picker" slot-scope="{ emojis, insert, display }" class="emoji-picker popovermenu"> <div> <div> - <input v-focus-on-create v-model="search" type="text"> + <input v-focus-on-create v-model="search" type="text" + @keyup.enter="insert(emojis)"> </div> <div> <div v-for="(emojiGroup, category) in emojis" :key="category"> @@ -445,9 +447,15 @@ export default { }, methods: { insert(emoji) { + if (typeof emoji === 'object') { + let category = Object.keys(emoji)[0] + let emojis = emoji[category] + let firstEmoji = Object.keys(emojis)[0] + emoji = emojis[firstEmoji] + } this.post += this.$twemoji.parse(emoji) + ' ' - this.$refs.composerInput.innerHTML = this.post - this.hidePopoverMenu() + this.$refs.composerInput.innerHTML += this.$twemoji.parse(emoji) + ' ' + this.$refs.emojiPicker.hide() }, togglePopoverMenu() { this.menuOpened = !this.menuOpened diff --git a/src/components/Search.vue b/src/components/Search.vue index bd3f81b8..312d8d21 100644 --- a/src/components/Search.vue +++ b/src/components/Search.vue @@ -21,7 +21,7 @@ --> <template> - <div class="social__container"> + <div class="social__wrapper"> <div v-if="results.length < 1" id="emptycontent" :class="{'icon-loading': loading}"> <div v-if="!loading" class="icon-search" /> <h2 v-if="!loading">{{ t('social', 'No accounts found') }}</h2> diff --git a/src/components/TimelineEntry.vue b/src/components/TimelineEntry.vue index 8b95c2bb..7fa30b32 100644 --- a/src/components/TimelineEntry.vue +++ b/src/components/TimelineEntry.vue @@ -92,8 +92,10 @@ export default { flex-shrink: 0; } - .timestamp { - float: right; + .post-timestamp { + width: 120px; + text-align: right; + flex-shrink: 0; } span { diff --git a/src/views/Timeline.vue b/src/views/Timeline.vue index bc924e47..37704a00 100644 --- a/src/views/Timeline.vue +++ b/src/views/Timeline.vue @@ -1,5 +1,5 @@ <template> - <div class="social__container"> + <div class="social__wrapper"> <transition name="slide-fade"> <div v-if="showInfo" class="social__welcome"> <a class="close icon-close" href="#" @click="hideInfo()"><span class="hidden-visually">Close</span></a> |