summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-30 13:57:20 +0000
committerTimothy Andrew <mail@timothyandrew.net>2017-06-08 11:38:50 +0000
commit53bb645d79eb0ca2b24b93b0bfb20138fbb4914b (patch)
treedd7fd86fafec6a68558c88a2bab48f816ba930b5
parentda1ed066cfb2328598a9765794dfa71f2f8a786b (diff)
downloadgitlab-ce-53bb645d79eb0ca2b24b93b0bfb20138fbb4914b.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
-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 f747e7b1660..737aa00f773 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -510,17 +510,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;
- }
}
}
@@ -529,7 +525,7 @@
width: 2px;
background: $border-color;
position: absolute;
- top: -5px;
+ top: -9px;
}
}