BigW Consortium Gitlab

fixed incorrect computed prop being used

reduced duplicated CSS
parent 0917b1d8
......@@ -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>
......@@ -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"
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment