update branch and fix merge conflicts

2 files changed, 36 insertions, 15 deletions

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 797fcdbb..881a9d1c 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -5,6 +5,7 @@ import Completion from '../../services/completion/completion.js'
 
 import { take, filter, reject, map, uniqBy } from 'lodash'
 
+
 const buildMentionsString = ({user, attentions}, currentUser) => {
   let allAttentions = [...attentions]
 
@@ -87,6 +88,8 @@ const PostStatusForm = {
         files: []
       }
       this.$emit('posted')
+      let el = this.$el.querySelector('textarea')
+      el.style.height = '16px'
     },
     addMediaFile (fileInfo) {
       this.newStatus.files.push(fileInfo)
@@ -113,6 +116,13 @@ const PostStatusForm = {
     },
     fileDrag (e) {
       e.dataTransfer.dropEffect = 'copy'
+    },
+    resize (e) {
+      e.target.style.height = 'auto'
+      e.target.style.height = `${e.target.scrollHeight - 10}px`
+      if (e.target.value === '') {
+        e.target.style.height = '16px'
+      }
     }
   }
 }
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 12a9c88a..4f6d4565 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -1,17 +1,8 @@
 <template>
   <div class="post-status-form">
     <form @submit.prevent="postStatus(newStatus)">
-      <div class="form-group" >
-        <textarea @click="setCaret" @keyup="setCaret" 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" @dragover.prevent="fileDrag"></textarea>
-      </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>
-        </div>
+      <div class="form-group base03-border" >
+        <textarea @click="setCaret" @keyup="setCaret" v-model="newStatus.status" placeholder="Just landed in L.A." rows="1" class="form-control" @keydown.meta.enter="postStatus(newStatus)" @keyup.ctrl.enter="postStatus(newStatus)" @drop="fileDrop" @dragover.prevent="fileDrag" @input="resize"></textarea>
       </div>
       <div>
         <h1>Word</h1>
@@ -24,6 +15,15 @@
         <media-upload @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="enableSubmit" :drop-files="dropFiles"></media-upload>
         <button :disabled="submitDisabled" type="submit" class="btn btn-default base05 base01-background">Submit</button>
       </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>
+        </div>
+      </div>
     </form>
   </div>
 </template>
@@ -51,14 +51,20 @@
      .form-bottom {
          display: flex;
          padding: 0.5em;
+         height: 32px;
 
          button {
-             flex: 2;
+             width: 10em;
          }
      }
 
      .attachments {
-         padding: 0.5em;
+         padding: 0 0.5em;
+
+         .attachment {
+           position: relative;
+           margin: 0.5em 0.8em 0.2em 0;
+         }
 
          i {
             position: absolute;
@@ -86,11 +92,16 @@
      form textarea {
          border: solid;
          border-width: 1px;
-         border-color: silver;
+         border-color: inherit;
          border-radius: 5px;
          line-height:16px;
          padding: 5px;
-         resize: vertical;
+         resize: none;
+         overflow: hidden;
+     }
+
+     form textarea:focus {
+       min-height: 48px;
      }
 
      .btn {