summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-05-03 09:58:58 +0100
committerPhil Hughes <me@iamphill.com>2018-05-03 09:58:58 +0100
commit58c270330ea987382913ec9b5b0de028ab93b0aa (patch)
tree0ddfb2525705e4ba1dd9bf51d1a615c665c835eb
parent0917b1d81bd2f9a6344b53e93d6e95cae17d1e43 (diff)
downloadgitlab-ce-58c270330ea987382913ec9b5b0de028ab93b0aa.tar.gz
fixed incorrect computed prop being used
reduced duplicated CSS
-rw-r--r--app/assets/javascripts/ide/components/commit_sidebar/actions.vue2
-rw-r--r--app/assets/javascripts/ide/components/commit_sidebar/list.vue7
-rw-r--r--app/assets/stylesheets/pages/repo.scss14
3 files changed, 10 insertions, 13 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/actions.vue b/app/assets/javascripts/ide/components/commit_sidebar/actions.vue
index a2763a45734..378c93b2e2e 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/actions.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/actions.vue
@@ -45,7 +45,7 @@ export default {
:value="$options.commitToNewBranchMR"
:label="__('Create a new branch and merge request')"
:show-input="true"
- :disabled="!!changedFiles.length && !!changedFiles.length"
+ :disabled="!!changedFiles.length && !!stagedFiles.length"
/>
</div>
</template>
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list.vue b/app/assets/javascripts/ide/components/commit_sidebar/list.vue
index a0cb4c16482..f6625fda596 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/list.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/list.vue
@@ -61,6 +61,9 @@ export default {
actionBtnClicked() {
this[this.action]();
},
+ setShowActionButton(show) {
+ this.showActionButton = show;
+ },
},
};
</script>
@@ -83,14 +86,14 @@ export default {
{{ titleText }}
<span
v-show="!showActionButton"
- @mouseenter="showActionButton = true"
+ @mouseenter="setShowActionButton(true)"
class="ide-commit-file-count"
>
{{ fileList.length }}
</span>
<button
v-show="showActionButton"
- @mouseleave="showActionButton = false"
+ @mouseleave="setShowActionButton(false)"
type="button"
class="btn btn-blank btn-link ide-staged-action-btn"
@click="actionBtnClicked"
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index 2abc715addf..cecb3075a5e 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -986,11 +986,13 @@
transition: all 0.3s ease;
}
-.is-full .commit-form-slide-up-enter {
+.is-full .commit-form-slide-up-enter,
+.is-compact .commit-form-slide-up-leave-to {
transform: translateY(100%);
}
-.is-full .commit-form-slide-up-enter-to {
+.is-full .commit-form-slide-up-enter-to,
+.is-compact .commit-form-slide-up-leave {
transform: translateY(0);
}
@@ -999,14 +1001,6 @@
opacity: 0;
}
-.is-compact .commit-form-slide-up-leave {
- transform: translateY(0);
-}
-
-.is-compact .commit-form-slide-up-leave-to {
- transform: translateY(100%);
-}
-
.ide-review-header {
flex-direction: column;
align-items: flex-start;