deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix MR css for accept MR block

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-31 18:35:38 +02:00
parent e5ff5c2869
commit 22ec3fa14c
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/sections/merge_requests.scss
View file

@ -47,6 +47,7 @@
} }
label { label {
color: #444; color: #444;
text-align: left
} }
} }

2
app/views/merge_requests/show/_mr_accept.html.haml
View file

@ -14,7 +14,7 @@
%strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge" %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
for instructions for instructions
.accept_group .accept_group
= f.submit "Accept Merge Request", class: "btn small success accept_merge_request" = f.submit "Accept Merge Request", class: "btn success accept_merge_request"
- unless @project.root_ref? @merge_request.source_branch - unless @project.root_ref? @merge_request.source_branch
.remove_branch_holder .remove_branch_holder
= label_tag :should_remove_source_branch, class: "checkbox" do = label_tag :should_remove_source_branch, class: "checkbox" do