OSDN Git Service

Fix MR css for accept MR block
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Mon, 31 Dec 2012 16:35:38 +0000 (18:35 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Mon, 31 Dec 2012 16:35:38 +0000 (18:35 +0200)
app/assets/stylesheets/sections/merge_requests.scss
app/views/merge_requests/show/_mr_accept.html.haml

index 4808117..9fb1d14 100644 (file)
@@ -47,6 +47,7 @@
     }
     label {
       color: #444;
+      text-align: left
     }
   }
 
index f242288..b7e6893 100644 (file)
@@ -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