diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-09 11:45:38 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-09 11:45:38 -0500 |
| commit | 63c9b63a3f2f996a2a7b40743613772a2351e842 (patch) | |
| tree | 02aa934ebaf09104cd87e3f9237527ab3eef021c /app/views/projects/merge_requests/conflicts | |
| parent | ab3d194cbe6fa711977a7fc0afccd25a063536ff (diff) | |
| download | gitlab-ce-63c9b63a3f2f996a2a7b40743613772a2351e842.tar.gz | |
Rename col-xs-* to col-*
Diffstat (limited to 'app/views/projects/merge_requests/conflicts')
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/_submit_form.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
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 13026b7566a..119c8e8e223 100644 --- a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml +++ b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml @@ -9,8 +9,8 @@ .form-group .col-sm-offset-2.col-sm-10 .row - .col-xs-6 + .col-6 %button.btn.btn-success.js-submit-button{ type: "button", "@click" => "commit()", ":disabled" => "!readyToCommit" } %span {{commitButtonText}} - .col-xs-6.text-right + .col-6.text-right = link_to "Cancel", project_merge_request_path(@merge_request.project, @merge_request), class: "btn btn-cancel" |