summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2017-03-23 03:30:50 +0000
committerAlfredo Sumaran <alfredo@gitlab.com>2017-03-23 03:30:50 +0000
commitbcbd03257aa52641ee165405b90efd6f53cf8f38 (patch)
tree8c6c43d29a33fd53728b6985505a9daaad68a5b4
parentf83d79d0bc600547b6aa3a349c8cccb91a352bba (diff)
parentbfb28ecccac038b43f65a79dad41ca1d4c774bab (diff)
downloadgitlab-ce-bcbd03257aa52641ee165405b90efd6f53cf8f38.tar.gz
Merge branch 'mr-list-alignment' into 'master'
Move merge-request-info style to only apply to related MRs See merge request !10119
-rw-r--r--app/assets/stylesheets/pages/issues.scss8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index cb7ebd61504..b27741a928d 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -46,6 +46,10 @@ ul.related-merge-requests > li {
.merge-request-id {
flex-shrink: 0;
}
+
+ .merge-request-info {
+ margin-left: 5px;
+ }
}
.merge-requests-title,
@@ -58,10 +62,6 @@ ul.related-merge-requests > li {
display: inline-block;
}
-.merge-request-info {
- margin-left: 5px;
-}
-
.merge-request-status {
font-size: 13px;
padding: 0 5px;