summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/show
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-07 15:11:18 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-07 15:11:18 +0300
commit593a1b3b3ec41ef78465e1dc2078d7d6dbae186f (patch)
tree7e0001d6fec55c7e9d4abea484ceafcb619dfe11 /app/views/projects/merge_requests/show
parent70004f4ef6160e788e6a600b9da06608c8559aa2 (diff)
downloadgitlab-ce-593a1b3b3ec41ef78465e1dc2078d7d6dbae186f.tar.gz
Style merge request CI widget to match MR/Issue box
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects/merge_requests/show')
-rw-r--r--app/views/projects/merge_requests/show/_mr_ci.html.haml5
-rw-r--r--app/views/projects/merge_requests/show/_state_widget.html.haml10
2 files changed, 7 insertions, 8 deletions
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 dc64c096edc..941b15d3b32 100644
--- a/app/views/projects/merge_requests/show/_mr_ci.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_ci.html.haml
@@ -20,9 +20,8 @@
= link_to "Build page", ci_build_details_path(@merge_request)
.ci_widget
- %strong
- %i.fa.fa-spinner
- Checking for CI status for #{@merge_request.last_commit_short_sha}
+ %i.fa.fa-spinner
+ Checking for CI status for #{@merge_request.last_commit_short_sha}
.ci_widget.ci-error{style: "display:none"}
%i.fa.fa-times
diff --git a/app/views/projects/merge_requests/show/_state_widget.html.haml b/app/views/projects/merge_requests/show/_state_widget.html.haml
index 5db77ab2754..2b58c865b2e 100644
--- a/app/views/projects/merge_requests/show/_state_widget.html.haml
+++ b/app/views/projects/merge_requests/show/_state_widget.html.haml
@@ -1,8 +1,8 @@
-.panel.mr-state-widget.panel-default
+.mr-state-widget
- if @merge_request.source_project.ci_service && @commits.any?
- .panel-heading
+ .mr-widget-heading
= render "projects/merge_requests/show/mr_ci"
- .panel-body
+ .mr-widget-body
- if @merge_request.open?
- if @merge_request.source_branch_exists? && @merge_request.target_branch_exists?
= render "projects/merge_requests/show/mr_accept"
@@ -31,8 +31,8 @@
%br
Try to use different branches or push new code.
- - if !@closes_issues.empty? && @merge_request.open?
- .panel-footer
+ - if @closes_issues.present? && @merge_request.open?
+ .mr-widget-footer
%span
%i.fa.fa-check
Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}