summaryrefslogtreecommitdiff
path: root/src/client/app/desktop/views/components
diff options
context:
space:
mode:
authorSatsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>2019-07-20 03:23:16 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-07-20 03:23:16 +0900
commit56c8ad9df37d6c1a697fb6cdbe7ccf56752b14c6 (patch)
treee01dcfb0afca3bedc860fccc10457ab39376769b /src/client/app/desktop/views/components
parentFix question (#5197) (diff)
downloadsharkey-56c8ad9df37d6c1a697fb6cdbe7ccf56752b14c6.tar.gz
sharkey-56c8ad9df37d6c1a697fb6cdbe7ccf56752b14c6.tar.bz2
sharkey-56c8ad9df37d6c1a697fb6cdbe7ccf56752b14c6.zip
Improve usability of quote note by pasting url (#5196)
Diffstat (limited to 'src/client/app/desktop/views/components')
-rw-r--r--src/client/app/desktop/views/components/post-form.vue34
1 files changed, 19 insertions, 15 deletions
diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue
index 39b7781a1c..5ce5eba730 100644
--- a/src/client/app/desktop/views/components/post-form.vue
+++ b/src/client/app/desktop/views/components/post-form.vue
@@ -6,18 +6,18 @@
@drop.stop="onDrop"
>
<div class="content">
- <div v-if="visibility == 'specified'" class="visibleUsers">
+ <div class="hashtags" v-if="recentHashtags.length > 0 && $store.state.settings.suggestRecentHashtags">
+ <b>{{ $t('@.post-form.recent-tags') }}:</b>
+ <a v-for="tag in recentHashtags.slice(0, 5)" @click="addTag(tag)" :title="$t('@.post-form.click-to-tagging')">#{{ tag }}</a>
+ </div>
+ <div class="with-quote" v-if="quoteId">{{ $t('@.post-form.quote-attached') }} <a @click="quoteId = null">[x]</a></div>
+ <div v-if="visibility === 'specified'" class="visibleUsers">
<span v-for="u in visibleUsers">
<mk-user-name :user="u"/><a @click="removeVisibleUser(u)">[x]</a>
</span>
<a @click="addVisibleUser">{{ $t('@.post-form.add-visible-user') }}</a>
</div>
- <div class="hashtags" v-if="recentHashtags.length > 0 && $store.state.settings.suggestRecentHashtags">
- <b>{{ $t('@.post-form.recent-tags') }}:</b>
- <a v-for="tag in recentHashtags.slice(0, 5)" @click="addTag(tag)" :title="$t('@.post-form.click-to-tagging')">#{{ tag }}</a>
- </div>
- <div class="with-quote" v-if="quoteId">{{ $t('@.post-form.quote-attached') }}</div>
- <div class="local-only" v-if="localOnly == true">{{ $t('@.post-form.local-only-message') }}</div>
+ <div class="local-only" v-if="localOnly === true">{{ $t('@.post-form.local-only-message') }}</div>
<input v-show="useCw" ref="cw" v-model="cw" :placeholder="$t('@.post-form.cw-placeholder')" v-autocomplete="{ model: 'cw' }">
<div class="textarea">
<textarea :class="{ with: (files.length != 0 || poll) }"
@@ -190,14 +190,6 @@ export default Vue.extend({
border-radius 0 0 4px 4px
transition border-color .3s ease
- > .visibleUsers
- margin-bottom 8px
- font-size 14px
-
- > span
- margin-right 16px
- color var(--primary)
-
> .hashtags
margin 0 0 8px 0
overflow hidden
@@ -211,6 +203,18 @@ export default Vue.extend({
margin-right 8px
white-space nowrap
+ > .with-quote
+ margin 0 0 8px 0
+ color var(--primary)
+
+ > .visibleUsers
+ margin-bottom 8px
+ font-size 14px
+
+ > span
+ margin-right 16px
+ color var(--primary)
+
> .local-only
margin 0 0 8px 0
color var(--primary)