From 40fe40d96b2a4dadf706637954b529ee80af75a4 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Tue, 21 Feb 2017 15:24:35 +0100
Subject: Better attachment removal styling.

---
 src/components/post_status_form/post_status_form.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/components/post_status_form')

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 1bad41c7..ebb92b26 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 {
-- 
cgit v1.2.3-70-g09d2


From 892b826df59203a920bfebbd2ac37ef62dcf411b Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Tue, 21 Feb 2017 21:48:48 +0100
Subject: Small style adjustment, add meta-enter posting.

---
 src/components/media_upload/media_upload.js          | 5 +++--
 src/components/post_status_form/post_status_form.js  | 2 +-
 src/components/post_status_form/post_status_form.vue | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/components/post_status_form')

diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index 3f6fec5b..746970aa 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -16,7 +16,7 @@ const mediaUpload = {
     }
   },
   methods: {
-    uploadFile(file) {
+    uploadFile (file) {
       const self = this
       const store = this.$store
       const formData = new FormData()
@@ -40,8 +40,9 @@ const mediaUpload = {
   ],
   watch: {
     'dropFiles': function (fileInfos) {
-      if (!this.uploading)
+      if (!this.uploading) {
         this.uploadFile(fileInfos[0])
+      }
     }
   }
 }
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index e798b196..d55525bb 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -144,7 +144,7 @@ const PostStatusForm = {
       return fileTypeService.fileType(fileInfo.mimetype)
     },
     fileDrop (e) {
-      if(e.dataTransfer.files.length > 0) {
+      if (e.dataTransfer.files.length > 0) {
         e.preventDefault()  // allow dropping text like before
         this.dropFiles = e.dataTransfer.files
       }
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index d9138109..eceef4a2 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -2,7 +2,7 @@
   <div class="post-status-form">
     <form @submit.prevent="postStatus(newStatus)">
       <div class="form-group" >
-        <textarea v-model="newStatus.status" placeholder="Just landed in L.A." rows="3" class="form-control"  @keyup.ctrl.enter="postStatus(newStatus)" @drop="fileDrop"></textarea>
+        <textarea v-model="newStatus.status" placeholder="Just landed in L.A." rows="3" class="form-control" @keyup.meta.enter="postStatus(newStatus)" @keyup.ctrl.enter="postStatus(newStatus)" @drop="fileDrop"></textarea>
       </div>
       <div class="attachments">
         <div class="attachment" v-for="file in newStatus.files">
-- 
cgit v1.2.3-70-g09d2