MR -> remove source branch -> UI pollished

This commit is contained in:
randx 2012-06-05 19:45:18 +03:00
parent d6ed9920d6
commit 2d68e7f4cd
3 changed files with 67 additions and 14 deletions

View file

@ -714,6 +714,19 @@ p.time {
text-align:center; text-align:center;
float:left; float:left;
margin-right:20px; margin-right:20px;
&.success {
background: #5BB75B;
color: white;
text-shadow: 0 1px #111;
border-color: #9A9;
}
&.error {
background: #DA4E49;
border-color: #BD362F;
color: white;
text-shadow: 0 1px #111;
}
} }
.arrow{ .arrow{
@ -864,15 +877,36 @@ li.note {
background: #DFF0D8; background: #DFF0D8;
} }
form {
margin-bottom:0;
.clearfix {
margin-bottom:0;
}
}
.accept_group {
float:left;
border: 1px solid #ADA;
padding: 2px;
@include border-radius(5px);
border-radius: 5px;
background: #CEB;
.accept_merge_request { .accept_merge_request {
color: #fff; float:left;
text-shadow: 0 1px 1px #222; }
background: #5bb75b;; .remove_branch_holder {
&:hover { margin-left:20px;
background-color: #51a351; margin-right:10px;
color: #fff; float:left;
}
label {
color:#444;
} }
} }
.how_to_merge_link { .how_to_merge_link {
@extend .primary; @extend .primary;
} }

View file

@ -127,6 +127,18 @@ table {
@extend .btn-primary; @extend .btn-primary;
} }
&.success {
color: #fff;
text-shadow: 0 0 1px #111;
background: #5bb75b;;
font-weight: bold;
&:hover {
background-color: #51a351;
color: #fff;
}
}
&.danger, &.danger,
&.btn-danger { &.btn-danger {
color:#fff; color:#fff;

View file

@ -8,7 +8,7 @@
%span.right %span.right
- if can?(current_user, :modify_merge_request, @merge_request) - if can?(current_user, :modify_merge_request, @merge_request)
- if @merge_request.open? - if @merge_request.open?
= link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded", :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 small padded danger", :title => "Close merge request"
= link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do
%i.icon-edit %i.icon-edit
Edit Edit
@ -63,13 +63,20 @@
.alert.alert-success .alert.alert-success
%span %span
= form_for [:automerge, @project, @merge_request], :remote => true, :method => :get do |f| = form_for [:automerge, @project, @merge_request], :remote => true, :method => :get do |f|
You can accept this request automatically. If you still want to do it manually - #{link_to "click here", "#", :class => "how_to_merge_link vlink", :title => "How To Merge"} for instructions %p
%br You can accept this request automatically.
If you still want to do it manually -
%strong= link_to "click here", "#", :class => "how_to_merge_link vlink", :title => "How To Merge"
for instructions
.accept_group
= f.submit "Accept Merge Request", :class => "btn small success accept_merge_request"
- unless @project.root_ref? @merge_request.source_branch - unless @project.root_ref? @merge_request.source_branch
.remove_branch_holder
= label_tag :should_remove_source_branch, :class => "checkbox" do
= check_box_tag :should_remove_source_branch = check_box_tag :should_remove_source_branch
= label_tag :should_remove_source_branch, "Remove source-branch" Remove source-branch
.clearfix
= f.submit "Accept Merge Request", :class => "btn small info accept_merge_request"
.automerge_widget.cannot_be_merged{:style => "display:none"} .automerge_widget.cannot_be_merged{:style => "display:none"}
.alert.alert-info .alert.alert-info