summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-03-07 18:22:44 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-03-07 18:22:44 +0000
commit85d76095e222cce2402ea5dcc64ea9526aedb110 (patch)
tree8c6d5bfa68bed5fefba66b9c1bdc775f33de7cef
parent278fb4572cd2ffab8536ee78b8d6a5f4e4669b06 (diff)
parent07a317ffc4cab69e88d3459949cdb87aa7812683 (diff)
downloadgitlab-ce-85d76095e222cce2402ea5dcc64ea9526aedb110.tar.gz
Merge branch '8845-epic-sidebar-list' into 'master'
Display Ancestors in Issuable Sidebar See merge request gitlab-org/gitlab-ce!25886
-rw-r--r--app/assets/stylesheets/framework/sidebar.scss52
1 files changed, 52 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index c4dbcf2ddc9..43d0e51e4c9 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -157,3 +157,55 @@
.sidebar-collapsed-icon .sidebar-collapsed-value {
font-size: 12px;
}
+
+.ancestor-tree {
+ .vertical-timeline {
+ position: relative;
+ list-style: none;
+ margin: 0;
+ padding: 0;
+
+ &::before {
+ content: '';
+ border-left: 1px solid $gray-500;
+ position: absolute;
+ top: $gl-padding;
+ bottom: $gl-padding;
+ left: map-get($spacers, 2) - 1px;
+ }
+
+ &-row {
+ margin-top: map-get($spacers, 3);
+
+ &:nth-child(1) {
+ margin-top: 0;
+ }
+ }
+
+ &-icon {
+ /**
+ * 2px extra is to give a little more height than needed
+ * to hide timeline line before/after the element starts/ends
+ */
+ height: map-get($spacers, 4) + 2px;
+ z-index: 1;
+ position: relative;
+ top: -3px;
+ padding: $gl-padding-4 0;
+ background-color: $gray-light;
+
+ &.opened {
+ color: $green-500;
+ }
+
+ &.closed {
+ color: $blue-500;
+ }
+ }
+
+ &-content {
+ line-height: initial;
+ margin-left: $gl-padding-8;
+ }
+ }
+}