summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-30 13:57:20 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-30 13:57:20 +0000
commite89d23ff6113c3ed71792d435bdaac08b2b9d57b (patch)
tree728d6a24726be922fc5441f7ebd0e9292d7c83d2 /app/assets
parent52a3d4372c6e45e4ffb792a9fe7bfca84f3573a3 (diff)
parentd3698271aa61656310aa8c6de8b9d7f1a691757b (diff)
downloadgitlab-ce-e89d23ff6113c3ed71792d435bdaac08b2b9d57b.tar.gz
Merge branch 'winh-merge-request-tree-symbols' into 'master'
Fix alignment of tree symbols in merge requests Closes #29590 See merge request !11761
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 183be86f650..2dc7f73a295 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -520,17 +520,13 @@
position: absolute;
border-top: 2px solid $border-color;
height: 1px;
- top: 8px;
+ top: 9px;
width: 8px;
left: 0;
}
&:last-child {
margin-bottom: 0;
-
- &::before {
- top: 14px;
- }
}
}
@@ -539,7 +535,7 @@
width: 2px;
background: $border-color;
position: absolute;
- top: -5px;
+ top: -9px;
}
}