OSDN Git Service

Fix alerts
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 3 Jan 2014 21:15:13 +0000 (23:15 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 3 Jan 2014 21:15:13 +0000 (23:15 +0200)
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_ci.html.haml

index 0b9e4df..4264176 100644 (file)
@@ -12,7 +12,7 @@
   = render "projects/merge_requests/show/commits"
 
   - if @commits.present?
-    %ul.nav.nav-tabs
+    %ul.nav.nav-tabs.append-bottom-10
       %li.notes-tab{data: {action: 'notes'}}
         = link_to project_merge_request_path(@project, @merge_request) do
           %i.icon-comment
index 546bd69..2d8c744 100644 (file)
@@ -37,7 +37,7 @@
         %strong This request can't be merged with GitLab. You should do it manually
 
   .automerge_widget.unchecked
-    .alert
+    .alert.alert-warning
       %strong
         %i.icon-refresh
         Checking for ability to automatically mergeā€¦
index f18fe8c..2e923ec 100644 (file)
 
   - [:running, :pending].each do |status|
     .ci_widget{class: "ci-#{status}", style: "display:none"}
-      .alert
+      .alert.alert-warning
         %i.icon-time
         %strong CI build #{status}
         for #{@merge_request.last_commit_short_sha}.
         = link_to "Build page", ci_build_details_path(@merge_request)
 
   .ci_widget
-    .alert
+    .alert.alert-warning
       %strong
         %i.icon-refresh
         Checking for CI status for #{@merge_request.last_commit_short_sha}