summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstance Okoghenun <constanceokoghenun@gmail.com>2019-01-21 17:10:33 +0100
committerConstance Okoghenun <constanceokoghenun@gmail.com>2019-01-21 17:10:33 +0100
commit0943eeeaf788ccad236364dc6ad2c5f01675c6be (patch)
tree86e6b62637911fcd88f8bc40192910e4197b9165
parent311b0cd658c44e01539365fbef2960fb2099d936 (diff)
downloadgitlab-ce-0943eeeaf788ccad236364dc6ad2c5f01675c6be.tar.gz
Removed related MR pipeline status icon margin
-rw-r--r--app/assets/stylesheets/components/related_items_list.scss4
-rw-r--r--app/views/projects/issues/_merge_requests.html.haml2
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/stylesheets/components/related_items_list.scss b/app/assets/stylesheets/components/related_items_list.scss
index 68b55d42073..048a5c0300c 100644
--- a/app/assets/stylesheets/components/related_items_list.scss
+++ b/app/assets/stylesheets/components/related_items_list.scss
@@ -194,7 +194,9 @@ $item-weight-max-width: 48px;
}
}
-.mr-status-wrapper {
+.mr-status-wrapper,
+.mr-ci-status
+ {
line-height: 0;
}
diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml
index 8b74bd0c839..eb46bf5c6a3 100644
--- a/app/views/projects/issues/_merge_requests.html.haml
+++ b/app/views/projects/issues/_merge_requests.html.haml
@@ -24,7 +24,7 @@
%span.path-id-text.bold.text-truncate{ data: { toggle: 'tooltip'}, title: merge_request.target_project.full_path }
= merge_request.target_project.full_path
= merge_request.to_reference
- %span.merge-request-ci-status.flex-md-grow-1.justify-content-end.d-flex.ml-md-2
+ %span.mr-ci-status.flex-md-grow-1.justify-content-end.d-flex.ml-md-2
- if merge_request.head_pipeline
= render_pipeline_status(merge_request.head_pipeline, tooltip_placement: 'bottom')
- elsif has_any_head_pipeline