Commit 1fcd1422 authored by Simon Knox's avatar Simon Knox

fix Modify commit message button spacing

parent 9a7e25a5
......@@ -283,15 +283,14 @@ export default {
<span v-if="mr.ffOnlyEnabled">
Fast-forward merge without a merge commit
</span>
<span v-else>
<button
@click="toggleCommitMessageEditor"
:disabled="isMergeButtonDisabled"
class="btn btn-default btn-xs"
type="button">
Modify commit message
</button>
</span>
<button
v-else
@click="toggleCommitMessageEditor"
:disabled="isMergeButtonDisabled"
class="btn btn-default btn-xs"
type="button">
Modify commit message
</button>
</template>
<template v-else>
<span class="bold">
......
......@@ -24,7 +24,7 @@ export default {
},
},
template: `
<div class="accept-control spacing inline">
<div class="accept-control inline">
<label class="merge-param-checkbox">
<input
type="checkbox"
......
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