MR -> remove source branch -> UI pollished

randx
1 parent d6ed9920
Showing 3 changed files with 67 additions and 14 deletions Show diff stats
app/assets/stylesheets/common.scss
app/assets/stylesheets/gitlab_bootstrap.scss
app/views/merge_requests/show.html.haml
@@ -714,6 +714,19 @@ p.time {
   text-align:center;
   float:left;
   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{ 
@@ -864,15 +877,36 @@ li.note {
     background: #DFF0D8;
   }
-  .accept_merge_request { 
-    color: #fff;
-    text-shadow: 0 1px 1px #222;
-    background: #5bb75b;;
-    &:hover { 
-      background-color: #51a351;
-      color: #fff;
+
+  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 { 
+      float:left;
+    }
+    .remove_branch_holder { 
+      margin-left:20px;
+      margin-right:10px;
+      float:left;
+    }
+    label { 
+      color:#444;
+    }
+  }
+
+
   .how_to_merge_link { 
     @extend .primary;
   }
@@ -127,6 +127,18 @@ table {
     @extend .btn-primary;
   }
+  &.success { 
+    color: #fff;
+    text-shadow: 0 0 1px #111;
+    background: #5bb75b;;
+    font-weight: bold;
+
+    &:hover { 
+      background-color: #51a351;
+      color: #fff;
+    }
+  }
+
   &.danger,
   &.btn-danger { 
     color:#fff;
@@ -8,7 +8,7 @@
   %span.right
     - if can?(current_user, :modify_merge_request, @merge_request)
       - 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
           %i.icon-edit
           Edit
@@ -63,13 +63,20 @@
     .alert.alert-success
       %span
         = 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
-          %br
-          -unless @project.root_ref? @merge_request.source_branch 
-            = check_box_tag :should_remove_source_branch
-            = label_tag :should_remove_source_branch, "Remove source-branch"
+          %p
+            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 
+              .remove_branch_holder
+                = label_tag :should_remove_source_branch, :class => "checkbox" do 
+                  = check_box_tag :should_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"}
     .alert.alert-info
	@@ -714,6 +714,19 @@ p.time {		@@ -714,6 +714,19 @@ p.time {
714	text-align:center;	714	text-align:center;
715	float:left;	715	float:left;
716	margin-right:20px;	716	margin-right:20px;
		717	+
		718	+ &.success {
		719	+ background: #5BB75B;
		720	+ color: white;
		721	+ text-shadow: 0 1px #111;
		722	+ border-color: #9A9;
		723	+ }
		724	+ &.error {
		725	+ background: #DA4E49;
		726	+ border-color: #BD362F;
		727	+ color: white;
		728	+ text-shadow: 0 1px #111;
		729	+ }
717	}	730	}
718		731
719	.arrow{	732	.arrow{
	@@ -864,15 +877,36 @@ li.note {		@@ -864,15 +877,36 @@ li.note {
864	background: #DFF0D8;	877	background: #DFF0D8;
865	}	878	}
866		879
867	- .accept_merge_request {
868	- color: #fff;
869	- text-shadow: 0 1px 1px #222;
870	- background: #5bb75b;;
871	- &:hover {
872	- background-color: #51a351;
873	- color: #fff;	880	+
		881	+ form {
		882	+ margin-bottom:0;
		883	+ .clearfix {
		884	+ margin-bottom:0;
874	}	885	}
875	}	886	}
		887	+
		888	+ .accept_group {
		889	+ float:left;
		890	+ border: 1px solid #ADA;
		891	+ padding: 2px;
		892	+ @include border-radius(5px);
		893	+ border-radius: 5px;
		894	+ background: #CEB;
		895	+
		896	+ .accept_merge_request {
		897	+ float:left;
		898	+ }
		899	+ .remove_branch_holder {
		900	+ margin-left:20px;
		901	+ margin-right:10px;
		902	+ float:left;
		903	+ }
		904	+ label {
		905	+ color:#444;
		906	+ }
		907	+ }
		908	+
		909	+
876	.how_to_merge_link {	910	.how_to_merge_link {
877	@extend .primary;	911	@extend .primary;
878	}	912	}
	@@ -127,6 +127,18 @@ table {		@@ -127,6 +127,18 @@ table {
127	@extend .btn-primary;	127	@extend .btn-primary;
128	}	128	}
129		129
		130	+ &.success {
		131	+ color: #fff;
		132	+ text-shadow: 0 0 1px #111;
		133	+ background: #5bb75b;;
		134	+ font-weight: bold;
		135	+
		136	+ &:hover {
		137	+ background-color: #51a351;
		138	+ color: #fff;
		139	+ }
		140	+ }
		141	+
130	&.danger,	142	&.danger,
131	&.btn-danger {	143	&.btn-danger {
132	color:#fff;	144	color:#fff;