diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-05-23 11:07:43 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-05-23 11:07:43 -0700 |
| commit | 95685cafc9af5bd24606bbe5b9b3776670787973 (patch) | |
| tree | 34ddab7e969c1e5cd2d6d0ed0dc45d7c79577175 | |
| parent | 1956a8a737d9db2813646abaadfd32a40d1f5567 (diff) | |
| download | gitlab-ce-95685cafc9af5bd24606bbe5b9b3776670787973.tar.gz | |
Fix alignment of MR conflict resolution
| -rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/_submit_form.html.haml | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 0c492e7d4a5..3d850523480 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -46,12 +46,6 @@ a { text-align: right; } -.form-control, -.search form { - // Bootstrap 4 does not have a height - height: 34px; -} - table { // Remove any table border lines border-spacing: 0; diff --git a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml index 88db69edb9b..4d84ee2488b 100644 --- a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml +++ b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml @@ -15,7 +15,7 @@ .max-width-marker %textarea.form-control.js-commit-message#commit-message{ "v-model" => "conflictsData.commitMessage", "rows" => "5" } .form-group.row - .col-md-offset-4.col-md-8 + .offset-md-4.col-md-8 .row .col-6 %button.btn.btn-success.js-submit-button{ type: "button", "@click" => "commit()", ":disabled" => "!readyToCommit" } |