Commit 0a089661 authored by Marin Jankovski's avatar Marin Jankovski

Rename the checkbox css class to prevent it from being overwritten by the same...

Rename the checkbox css class to prevent it from being overwritten by the same named bootstrap class.
parent 31bcd047
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
line-height: 20px; line-height: 20px;
font-weight: bold; font-weight: bold;
.checkbox { .remove_source_checkbox {
margin: 0; margin: 0;
} }
} }
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
= f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request" = 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? - if can_remove_branch?(@merge_request.source_project, @merge_request.source_branch) && !@merge_request.for_fork?
.accept-control .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 = check_box_tag :should_remove_source_branch
Remove source-branch Remove source-branch
.accept-control .accept-control
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment