diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-04-17 05:02:44 -0400 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-04-17 05:02:44 -0400 |
| commit | 1f8d30386388f8b91aa84fdbd7861e588aa0d935 (patch) | |
| tree | 1eef07d357f4e1f3208a263f9a2247337ddd04a0 /src | |
| parent | 6b777482b6332bed1bb9aa268955ac5d5bc0a40d (diff) | |
| parent | 88309b446f9adc2c074b653661b182f39a07cfbc (diff) | |
Merge branch 'feature/post-form-improvement' into 'develop'
Polish up post-status form
See merge request !78
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/post_status_form/post_status_form.vue | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index b5a3c738..c3f1b1f0 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -4,6 +4,10 @@ <div class="form-group" > <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" @dragover.prevent="fileDrag"></textarea> </div> + <div class='form-bottom'> + <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> @@ -13,10 +17,6 @@ <a v-if="type(file) === 'unknown'" :href="file.image">{{file.url}}</a> </div> </div> - <div class='form-bottom'> - <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> </form> </div> </template> @@ -44,17 +44,19 @@ .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 { |