summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-05-10 16:52:35 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-05-10 16:52:35 +0000
commitf6d82455687541802281eb3d52f4a058854e5db6 (patch)
treebbc20f012dbf48d4a011a7e72e07aff6608e8665
parent46785604db0409f261cd07d27494f5abe4ae9ae8 (diff)
parent18ae0742bcd4481379386db72ef142cfed796da1 (diff)
downloadgitlab-ce-f6d82455687541802281eb3d52f4a058854e5db6.tar.gz
Merge branch 'center-related-merge-request-items-horizontally' into 'master'
Center related merge request items horizontally See merge request !11163
-rw-r--r--app/assets/stylesheets/pages/issues.scss10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index ad3b6e0344b..bee9b13b375 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -51,6 +51,7 @@ ul.related-merge-requests > li {
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
+ align-items: center;
.merge-request-id {
flex-shrink: 0;
@@ -59,6 +60,14 @@ ul.related-merge-requests > li {
.merge-request-info {
margin-left: 5px;
}
+
+ .row_title {
+ vertical-align: bottom;
+ }
+
+ gl-emoji {
+ font-size: 1em;
+ }
}
.merge-requests-title,
@@ -114,7 +123,6 @@ ul.related-merge-requests > li {
.related-merge-requests {
.ci-status-link {
display: block;
- margin-top: 3px;
margin-right: 5px;
}