diff options
| author | tauriedavis <taurie@gitlab.com> | 2018-06-08 14:35:03 -0700 |
|---|---|---|
| committer | tauriedavis <taurie@gitlab.com> | 2018-06-08 14:35:03 -0700 |
| commit | 1610713cee0ae2e4a510365f3f655c32580316e9 (patch) | |
| tree | e5798ea47d6478a53307585ea5d4acd351c89895 /app/views | |
| parent | 214de734a63af88db3f30bf93995aadc0982a349 (diff) | |
| download | gitlab-ce-1610713cee0ae2e4a510365f3f655c32580316e9.tar.gz | |
Fix styling of revert MR modal
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/commit/_change.html.haml | 7 | ||||
| -rw-r--r-- | app/views/shared/_new_merge_request_checkbox.html.haml | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/commit/_change.html.haml b/app/views/projects/commit/_change.html.haml index 30605927fd1..49ce126576f 100644 --- a/app/views/projects/commit/_change.html.haml +++ b/app/views/projects/commit/_change.html.haml @@ -20,11 +20,12 @@ %span{ "aria-hidden": true } × .modal-body - if description - %p.append-bottom-20= description + %p= description = form_tag [type.underscore, @project.namespace.becomes(Namespace), @project, commit], method: :post, remote: false, class: "js-#{type}-form js-requires-input" do .form-group.row.branch - = label_tag 'start_branch', branch_label, class: 'col-form-label col-sm-2' - .col-sm-10 + .col-sm-12 + = label_tag 'start_branch', branch_label, class: 'label-light' + = hidden_field_tag :start_branch, @project.default_branch, id: 'start_branch' = dropdown_tag(@project.default_branch, options: { title: s_("BranchSwitcherTitle|Switch branch"), filter: true, placeholder: s_("BranchSwitcherPlaceholder|Search branches"), toggle_class: 'js-project-refs-dropdown dynamic', dropdown_class: 'dropdown-menu-selectable', data: { field_name: "start_branch", selected: @project.default_branch, start_branch: @project.default_branch, refs_url: project_branches_path(@project), submit_form_on_click: false } }) diff --git a/app/views/shared/_new_merge_request_checkbox.html.haml b/app/views/shared/_new_merge_request_checkbox.html.haml index 165109b6b70..24c0dfe247f 100644 --- a/app/views/shared/_new_merge_request_checkbox.html.haml +++ b/app/views/shared/_new_merge_request_checkbox.html.haml @@ -1,4 +1,4 @@ -.form-check +.form-check.prepend-top-8 - nonce = SecureRandom.hex = check_box_tag 'create_merge_request', 1, true, class: 'js-create-merge-request form-check-input', id: "create_merge_request-#{nonce}" = label_tag "create_merge_request-#{nonce}", class: 'form-check-label' do |