Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-05-10 19:52:35 +0300
committerFelipe Artur <felipefac@gmail.com>2017-05-11 00:20:44 +0300
commit78c1018dcbf2ebe5f5bff237e8c131ae4b21a207 (patch)
treebceb3e6d128764cc171ed7b05e14f295fcd9519c
parent85d5ca3766cec94c4f6e00bb7bc62e3cb814c677 (diff)
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.scss17
1 files changed, 16 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index b2f45625a2a..4eeb52c096b 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -42,6 +42,7 @@ ul.related-merge-requests > li {
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
+ align-items: center;
.merge-request-id {
flex-shrink: 0;
@@ -50,6 +51,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,
@@ -101,7 +110,13 @@ ul.related-merge-requests > li {
}
}
-.merge-request-ci-status {
+.merge-request-ci-status,
+.related-merge-requests {
+ .ci-status-link {
+ display: block;
+ margin-right: 5px;
+ }
+
svg {
margin-right: 4px;
position: relative;