diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-06-15 13:11:31 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2018-06-15 13:11:31 +0900 |
commit | 03495dd0cff7510273119c863a1b774d1896af32 (patch) | |
tree | d315ef16e41e65cc0ff095cf73f849e5146b0028 /app/assets/javascripts/ide/components/commit_sidebar/form.vue | |
parent | d7a3180d06e7b16728d4f23b1e68007c9c2f3b9a (diff) | |
parent | fb08183e63733dd7845a16d9f827a5cd5f2d9080 (diff) | |
download | gitlab-ce-03495dd0cff7510273119c863a1b774d1896af32.tar.gz |
Merge branch 'master' into build-chunks-on-object-storage
Diffstat (limited to 'app/assets/javascripts/ide/components/commit_sidebar/form.vue')
-rw-r--r-- | app/assets/javascripts/ide/components/commit_sidebar/form.vue | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/form.vue b/app/assets/javascripts/ide/components/commit_sidebar/form.vue index e2b42ab2642..955d9280728 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/form.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/form.vue @@ -91,7 +91,6 @@ export default { <template> <div - class="multi-file-commit-form" :class="{ 'is-compact': isCompact, 'is-full': !isCompact @@ -99,6 +98,7 @@ export default { :style="{ height: componentHeight ? `${componentHeight}px` : null, }" + class="multi-file-commit-form" > <transition name="commit-form-slide-up" @@ -108,12 +108,12 @@ export default { > <div v-if="isCompact" - class="commit-form-compact" ref="compactEl" + class="commit-form-compact" > <button - type="button" :disabled="!hasChanges" + type="button" class="btn btn-primary btn-sm btn-block" @click="toggleIsSmall" > @@ -126,8 +126,8 @@ export default { </div> <form v-if="!isCompact" - @submit.prevent.stop="commitChanges" ref="formEl" + @submit.prevent.stop="commitChanges" > <transition name="fade"> <success-message @@ -143,8 +143,8 @@ export default { <loading-button :loading="submitCommitLoading" :disabled="commitButtonDisabled" - container-class="btn btn-success btn-sm float-left" :label="__('Commit')" + container-class="btn btn-success btn-sm float-left" @click="commitChanges" /> <button |