From 423ffe29d549d72a603e0d3a529ec59c035a0934 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 3 Jan 2014 23:15:13 +0200 Subject: [PATCH] Fix alerts Signed-off-by: Dmitriy Zaporozhets --- app/views/projects/merge_requests/_show.html.haml | 2 +- app/views/projects/merge_requests/show/_mr_accept.html.haml | 2 +- app/views/projects/merge_requests/show/_mr_ci.html.haml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 0b9e4df3fd3..42641765c5c 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -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 diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml index 546bd697fbe..2d8c7449fd2 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -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… diff --git a/app/views/projects/merge_requests/show/_mr_ci.html.haml b/app/views/projects/merge_requests/show/_mr_ci.html.haml index f18fe8c80c4..2e923ec5f35 100644 --- a/app/views/projects/merge_requests/show/_mr_ci.html.haml +++ b/app/views/projects/merge_requests/show/_mr_ci.html.haml @@ -16,14 +16,14 @@ - [: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} -- GitLab