diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-01-12 13:35:29 +0100 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-01-12 13:35:29 +0100 |
| commit | 0a089661fd488bf71b7a426441204713200f57ed (patch) | |
| tree | 01db710640e61104669fbbfa3cf97ccd5af7b10a | |
| parent | 31bcd04711d448c016506897b8431273e3454faa (diff) | |
| download | gitlab-ce-0a089661fd488bf71b7a426441204713200f57ed.tar.gz | |
Rename the checkbox css class to prevent it from being overwritten by the same named bootstrap class.
| -rw-r--r-- | app/assets/stylesheets/sections/merge_requests.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_accept.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index 8445b77c1a8..74e1d8beb5a 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -29,7 +29,7 @@ line-height: 20px; font-weight: bold; - .checkbox { + .remove_source_checkbox { margin: 0; } } diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml index dd5f29e5389..11a111e5faa 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -18,7 +18,7 @@ = f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request" - if can_remove_branch?(@merge_request.source_project, @merge_request.source_branch) && !@merge_request.for_fork? .accept-control - = label_tag :should_remove_source_branch, class: "checkbox" do + = label_tag :should_remove_source_branch, class: "remove_source_checkbox" do = check_box_tag :should_remove_source_branch Remove source-branch .accept-control |