summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-13 02:19:44 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-13 02:19:56 +0100
commit179e3e5b65a460d78dc30258dd19e99d0780fe7f (patch)
tree6f49e9e90f750ba42cb4b81e9aee24108c5881e7
parent8b17fb61b61b1f9707428c2333db2de29c4d3bcf (diff)
downloadgitlab-ce-add-right-margin-to-ci-error-icon.tar.gz
Added ci-error class and applied a right margin to the ci error widget stateadd-right-margin-to-ci-error-icon
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js2
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
index 517838f92ac..c02e10128e2 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
@@ -31,7 +31,7 @@ export default {
<div class="mr-widget-heading">
<div class="ci-widget">
<template v-if="hasCIError">
- <div class="ci-status-icon ci-status-icon-failed js-ci-error">
+ <div class="ci-status-icon ci-status-icon-failed ci-error js-ci-error">
<span class="js-icon-link icon-link">
<span
v-html="svg"
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 0173a05b403..56604fb5294 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -109,6 +109,10 @@
height: 22px;
margin-right: 8px;
}
+
+ .ci-error {
+ margin-right: $btn-side-margin;
+ }
}
.mr-widget-body,