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

buttons margin fixed

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-07-05 09:35:23 +03:00
parent 4e0c2f00d3
commit df6a75d52d
12 changed files with 46 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/merge_requests/_merge_request.html.haml
View file

@ -2,15 +2,15 @@
.right
.left
- if merge_request.merged?
%span.btn.small.disabled.padded
%span.btn.small.disabled.grouped
%strong
%i.icon-ok
= "MERGED"
- if merge_request.notes.any?
%span.btn.small.disabled.padded
%span.btn.small.disabled.grouped
%i.icon-comment
= merge_request.notes.count
%span.btn.small.disabled.padded
%span.btn.small.disabled.grouped
= merge_request.source_branch
→
= merge_request.target_branch

8
app/views/merge_requests/show/_mr_title.html.haml
View file

@ -7,19 +7,19 @@
%span.right
- if @merge_request.merged?
%span.btn.small.disabled.padded
%span.btn.small.disabled.grouped
%strong
%i.icon-ok
= "MERGED"
- if can?(current_user, :modify_merge_request, @merge_request)
- if @merge_request.open?
= link_to raw_project_merge_request_path(@project, @merge_request), :class => "btn padded" do
= link_to raw_project_merge_request_path(@project, @merge_request), :class => "btn grouped" do
%i.icon-download-alt
Get Patch
= link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn padded danger", :title => "Close merge request"
= link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn grouped danger", :title => "Close merge request"
= link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn padded" do
= link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn grouped" do
%i.icon-edit
Edit