kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix alignment of MR conflict resolution

Browse source
This commit is contained in:
Annabel Dunstone Gray 2018-05-23 11:07:43 -07:00
parent 1956a8a737
commit 95685cafc9
No known key found for this signature in database
GPG key ID: 7C8C78A372AD7A2D
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/bootstrap_migration.scss vendored
View file

@ -46,12 +46,6 @@ a {
text-align: right; text-align: right;
} }
.form-control,
.search form {
// Bootstrap 4 does not have a height
height: 34px;
}
table { table {
// Remove any table border lines // Remove any table border lines
border-spacing: 0; border-spacing: 0;

2
app/views/projects/merge_requests/conflicts/_submit_form.html.haml
View file

@ -15,7 +15,7 @@
.max-width-marker .max-width-marker
%textarea.form-control.js-commit-message#commit-message{ "v-model" => "conflictsData.commitMessage", "rows" => "5" } %textarea.form-control.js-commit-message#commit-message{ "v-model" => "conflictsData.commitMessage", "rows" => "5" }
.form-group.row .form-group.row
.col-md-offset-4.col-md-8 .offset-md-4.col-md-8
.row .row
.col-6 .col-6
%button.btn.btn-success.js-submit-button{ type: "button", "@click" => "commit()", ":disabled" => "!readyToCommit" } %button.btn.btn-success.js-submit-button{ type: "button", "@click" => "commit()", ":disabled" => "!readyToCommit" }