summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-11-13 00:21:49 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-11-13 00:21:49 +0900
commita4b2b093fc2310f2b618bac5c47325b4903ae4e7 (patch)
tree88460eefa5a913821d42d6c8fdb1042c2bb68857 /src
parent[Client] Emoji picker (diff)
downloadsharkey-a4b2b093fc2310f2b618bac5c47325b4903ae4e7.tar.gz
sharkey-a4b2b093fc2310f2b618bac5c47325b4903ae4e7.tar.bz2
sharkey-a4b2b093fc2310f2b618bac5c47325b4903ae4e7.zip
:art:
Diffstat (limited to 'src')
-rw-r--r--src/client/app/desktop/views/components/post-form.vue144
1 files changed, 72 insertions, 72 deletions
diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue
index 2bdefe94a2..4b86180289 100644
--- a/src/client/app/desktop/views/components/post-form.vue
+++ b/src/client/app/desktop/views/components/post-form.vue
@@ -24,17 +24,17 @@
<button class="emoji" @click="emoji" ref="emoji">
<fa :icon="['far', 'laugh']"/>
</button>
+ <div class="files" :class="{ with: poll }" v-show="files.length != 0">
+ <x-draggable :list="files" :options="{ animation: 150 }">
+ <div v-for="file in files" :key="file.id">
+ <div class="img" :style="{ backgroundImage: `url(${file.thumbnailUrl})` }" :title="file.name"></div>
+ <img class="remove" @click="detachMedia(file.id)" src="/assets/desktop/remove.png" :title="$t('attach-cancel')" alt=""/>
+ </div>
+ </x-draggable>
+ <p class="remain">{{ 4 - files.length }}/4</p>
+ </div>
+ <mk-poll-editor v-if="poll" ref="poll" @destroyed="poll = false" @updated="saveDraft()"/>
</div>
- <div class="files" :class="{ with: poll }" v-show="files.length != 0">
- <x-draggable :list="files" :options="{ animation: 150 }">
- <div v-for="file in files" :key="file.id">
- <div class="img" :style="{ backgroundImage: `url(${file.thumbnailUrl})` }" :title="file.name"></div>
- <img class="remove" @click="detachMedia(file.id)" src="/assets/desktop/remove.png" :title="$t('attach-cancel')" alt=""/>
- </div>
- </x-draggable>
- <p class="remain">{{ 4 - files.length }}/4</p>
- </div>
- <mk-poll-editor v-if="poll" ref="poll" @destroyed="poll = false" @updated="saveDraft()"/>
</div>
<mk-uploader ref="uploader" @uploaded="attachMedia" @change="onChangeUploadings"/>
<button class="upload" :title="$t('attach-media-from-local')" @click="chooseFile"><fa icon="upload"/></button>
@@ -541,14 +541,14 @@ export default Vue.extend({
min-height 84px
&:hover
- & + *
& + * + *
+ & + * + * + *
border-color var(--primaryAlpha02)
transition border-color .1s ease
&:focus
- & + *
& + * + *
+ & + * + * + *
border-color var(--primaryAlpha05)
transition border-color 0s ease
@@ -559,6 +559,66 @@ export default Vue.extend({
border-bottom solid 1px var(--primaryAlpha01) !important
border-radius 4px 4px 0 0
+ > .files
+ margin 0
+ padding 0
+ background var(--desktopPostFormTextareaBg)
+ border solid 1px var(--primaryAlpha01)
+ border-top none
+ border-radius 0 0 4px 4px
+ transition border-color .3s ease
+
+ &.with
+ border-bottom solid 1px var(--primaryAlpha01) !important
+ border-radius 0
+
+ > .remain
+ display block
+ position absolute
+ top 8px
+ right 8px
+ margin 0
+ padding 0
+ color var(--primaryAlpha04)
+
+ > div
+ padding 4px
+
+ &:after
+ content ""
+ display block
+ clear both
+
+ > div
+ float left
+ border solid 4px transparent
+ cursor move
+
+ &:hover > .remove
+ display block
+
+ > .img
+ width 64px
+ height 64px
+ background-size cover
+ background-position center center
+
+ > .remove
+ display none
+ position absolute
+ top -6px
+ right -6px
+ width 16px
+ height 16px
+ cursor pointer
+
+ > .mk-poll-editor
+ background var(--desktopPostFormTextareaBg)
+ border solid 1px var(--primaryAlpha01)
+ border-top none
+ border-radius 0 0 4px 4px
+ transition border-color .3s ease
+
> .visibleUsers
margin-bottom 8px
font-size 14px
@@ -580,66 +640,6 @@ export default Vue.extend({
margin-right 8px
white-space nowrap
- > .files
- margin 0
- padding 0
- background var(--desktopPostFormTextareaBg)
- border solid 1px var(--primaryAlpha01)
- border-top none
- border-radius 0 0 4px 4px
- transition border-color .3s ease
-
- &.with
- border-bottom solid 1px var(--primaryAlpha01) !important
- border-radius 0
-
- > .remain
- display block
- position absolute
- top 8px
- right 8px
- margin 0
- padding 0
- color var(--primaryAlpha04)
-
- > div
- padding 4px
-
- &:after
- content ""
- display block
- clear both
-
- > div
- float left
- border solid 4px transparent
- cursor move
-
- &:hover > .remove
- display block
-
- > .img
- width 64px
- height 64px
- background-size cover
- background-position center center
-
- > .remove
- display none
- position absolute
- top -6px
- right -6px
- width 16px
- height 16px
- cursor pointer
-
- > .mk-poll-editor
- background var(--desktopPostFormTextareaBg)
- border solid 1px var(--primaryAlpha01)
- border-top none
- border-radius 0 0 4px 4px
- transition border-color .3s ease
-
> .mk-uploader
margin 8px 0 0 0
padding 8px