diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-16 12:18:49 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-05-16 12:18:49 +0000 |
| commit | e407279fd021d1da9dcb3a05a04579bcc0550299 (patch) | |
| tree | 9945251828fb1145f842b279332465d428ebe0fe | |
| parent | dc68a1ce34a4b23ff663b95b93d533aa1714e044 (diff) | |
| parent | 179e3e5b65a460d78dc30258dd19e99d0780fe7f (diff) | |
| download | gitlab-ce-e407279fd021d1da9dcb3a05a04579bcc0550299.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 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 d208e54207e..fa9d05ee8fd 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, |