From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 31 Dec 2012 16:35:38 +0000 (+0200)
Subject: Fix MR css for accept MR block
X-Git-Tag: v4.1.0~170
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=22ec3fa14cb87fec3655d2666783d439618890c5;p=wvm%2Fgitlab.git

Fix MR css for accept MR block
---

diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss
index 4808117d0..9fb1d1496 100644
--- a/app/assets/stylesheets/sections/merge_requests.scss
+++ b/app/assets/stylesheets/sections/merge_requests.scss
@@ -47,6 +47,7 @@
     }
     label {
       color: #444;
+      text-align: left
     }
   }
 
diff --git a/app/views/merge_requests/show/_mr_accept.html.haml b/app/views/merge_requests/show/_mr_accept.html.haml
index f24228856..b7e689371 100644
--- a/app/views/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/merge_requests/show/_mr_accept.html.haml
@@ -9,19 +9,19 @@
       %span
         = form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f|
           %p
-            You can accept this request automatically. 
-            If you still want to do it manually - 
+            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 
+            = f.submit "Accept Merge Request", class: "btn success accept_merge_request"
+            - unless @project.root_ref? @merge_request.source_branch
               .remove_branch_holder
-                = label_tag :should_remove_source_branch, class: "checkbox" do 
+                = label_tag :should_remove_source_branch, class: "checkbox" do
                   = check_box_tag :should_remove_source_branch
                   Remove source-branch
           .clearfix
-             
+
 
   .automerge_widget.cannot_be_merged{style: "display:none"}
     .alert.alert-info