diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-16 12:18:49 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-18 14:17:46 +0000 |
| commit | 8f4bea8bcc8146099620995b278fe8be31f8fd17 (patch) | |
| tree | e04a721453e7ebcf384db1e47b527d111ff0568e | |
| parent | 0ec452994464590032d3601b99be4ff976cea5dc (diff) | |
| download | gitlab-ce-8f4bea8bcc8146099620995b278fe8be31f8fd17.tar.gz | |
Merge branch 'add-right-margin-to-ci-error-icon' into 'master'
Added ci-error class and applied a right margin to the ci error widget state
See merge request !11353
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 4 |
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 801b9fb1ba1..c622e8ba2f6 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 @@ -28,7 +28,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 97019b19667..89cf57ee215 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -113,6 +113,10 @@ width: 22px; height: 22px; } + + .ci-error { + margin-right: $btn-side-margin; + } } .mr-widget-body, |