diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-02-21 21:30:16 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-02-21 21:30:16 +0100 |
| commit | 34a593aa27bce261248a820f16c0b34b3a448387 (patch) | |
| tree | fdd5763b0fac7707731cc9f364da6ba53c8561e0 /src | |
| parent | ca71722c1eaa5c2aa4597bef38ca812c15294359 (diff) | |
| parent | 40fe40d96b2a4dadf706637954b529ee80af75a4 (diff) | |
Merge branch 'develop' into feature/drag_and_drop_for_media_upload
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/attachment/attachment.vue | 4 | ||||
| -rw-r--r-- | src/components/post_status_form/post_status_form.vue | 11 | ||||
| -rw-r--r-- | src/main.js | 3 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 738a1e86..e0eba6a9 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -16,8 +16,6 @@ <audio v-if="type === 'audio'" :src="attachment.url" controls></audio> - <span v-if="type === 'unknown'">Don't know how to display this...</span> - <div @click.prevent="linkClicked" v-if="type === 'html' && attachment.oembed" class="oembed"> <div v-if="attachment.thumb_url" class="image"> <img :src="attachment.thumb_url"></img> @@ -38,12 +36,12 @@ flex-wrap: wrap; .attachment { flex: 1 0 30%; - display: flex; margin: 0.5em 0.8em 0.6em 0.1em; align-self: flex-start; &.html { flex-basis: 100%; + display: flex; } .hider { diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 57572f65..d9138109 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -6,11 +6,11 @@ </div> <div class="attachments"> <div class="attachment" v-for="file in newStatus.files"> + <i class="fa icon-cancel" @click="removeMediaFile(file)"></i> <img class="thumbnail media-upload" :src="file.image" v-if="type(file) === 'image'"></img> <video v-if="type(file) === 'video'" :src="file.image" controls></video> <audio v-if="type(file) === 'audio'" :src="file.image" controls></audio> <a v-if="type(file) === 'unknown'" :href="file.image">{{file.url}}</a> - <i class="fa icon-cancel" @click="removeMediaFile(file)"></i> </div> </div> <div class='form-bottom'> @@ -52,6 +52,15 @@ .attachments { padding: 0.5em; + + i { + position: absolute; + margin: 10px; + padding: 5px; + background: rgba(230,230,230,0.6); + border-radius: 0.5em; + font-weight: bold; + } } form { diff --git a/src/main.js b/src/main.js index 97156b64..22879b34 100644 --- a/src/main.js +++ b/src/main.js @@ -67,8 +67,7 @@ new Vue({ router, store, el: '#app', - template: '<App/>', - components: { App } + render: h => h(App) }) window.fetch('/static/config.json') |