This commit is contained in:
syuilo 2018-11-13 00:21:49 +09:00
parent 0fbf56219f
commit a4b2b093fc
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69

View file

@ -24,7 +24,6 @@
<button class="emoji" @click="emoji" ref="emoji">
<fa :icon="['far', 'laugh']"/>
</button>
</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">
@ -36,6 +35,7 @@
</div>
<mk-poll-editor v-if="poll" ref="poll" @destroyed="poll = false" @updated="saveDraft()"/>
</div>
</div>
<mk-uploader ref="uploader" @uploaded="attachMedia" @change="onChangeUploadings"/>
<button class="upload" :title="$t('attach-media-from-local')" @click="chooseFile"><fa icon="upload"/></button>
<button class="drive" :title="$t('attach-media-from-drive')" @click="chooseFileFromDrive"><fa icon="cloud"/></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,27 +559,6 @@ export default Vue.extend({
border-bottom solid 1px var(--primaryAlpha01) !important
border-radius 4px 4px 0 0
> .visibleUsers
margin-bottom 8px
font-size 14px
> span
margin-right 16px
color var(--primary)
> .hashtags
margin 0 0 8px 0
overflow hidden
white-space nowrap
font-size 14px
> b
color var(--primary)
> *
margin-right 8px
white-space nowrap
> .files
margin 0
padding 0
@ -640,6 +619,27 @@ 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
white-space nowrap
font-size 14px
> b
color var(--primary)
> *
margin-right 8px
white-space nowrap
> .mk-uploader
margin 8px 0 0 0
padding 8px