diff options
author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-07-21 15:49:37 +0200 |
---|---|---|
committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-09-01 10:21:09 +0200 |
commit | 1e668a3cfebfcf576a8c5da834bad094fd9039f6 (patch) | |
tree | 405caed1e99ae5f642c9f363d793b3a9a64c4dd1 /app/assets/stylesheets/framework/lists.scss | |
parent | bf4ec606a56238326bf4930c59d0ca82dd281cb7 (diff) | |
download | gitlab-ce-bvl-show-projects-in-group-tree.tar.gz |
Rework subgroup endpointbvl-show-projects-in-group-tree
Diffstat (limited to 'app/assets/stylesheets/framework/lists.scss')
-rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 97 |
1 files changed, 66 insertions, 31 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index 0fb19344510..8e87704b96d 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -107,7 +107,7 @@ ul.content-list { color: $list-text-color; &.no-description { - .title { + > .group-row-contents .metadata .title { line-height: $list-text-height; } } @@ -116,6 +116,22 @@ ul.content-list { font-weight: $gl-font-weight-bold; } + > .group-row-contents .metadata { + .title { + line-height: inherit; + font-weight: 600; + + .access-type { + color: $gl-text-color-secondary; + } + } + + .description { + @include str-truncated; + margin-bottom: 0; + } + } + a { color: $gl-text-color; } @@ -124,13 +140,6 @@ ul.content-list { color: $blue-600; } - .description { - p { - @include str-truncated; - margin-bottom: 0; - } - } - .controls { @include new-style-dropdown; @@ -322,7 +331,7 @@ ul.indent-list { width: 0; position: absolute; top: 5px; - bottom: 0; + bottom: 30px; left: -16px; border-left: 2px solid $border-white-normal; } @@ -331,14 +340,7 @@ ul.indent-list { position: relative; &::before { - content: ""; - display: block; - width: 10px; - height: 0; - border-top: 2px solid $border-white-normal; - position: absolute; top: 30px; - left: -16px; } &:last-child::before { @@ -353,34 +355,67 @@ ul.indent-list { .group-row { padding: 0; border: none; - - &:last-of-type { - .group-row-contents:not(:hover) { - border-bottom: 1px solid transparent; - } - } } .group-row-contents { padding: 10px 10px 8px; - border-top: solid 1px transparent; - border-bottom: solid 1px $white-normal; + + .avatar-container > a { + width: 100%; + } + } + + .group-list-tree .group-row, + .content-list li.has-more-items-link { + &::before { + content: ""; + display: block; + width: 10px; + height: 0; + border-top: 2px solid $border-white-normal; + position: absolute; + left: -16px; + } + } + + .group-row-contents, + .content-list li.has-more-items-link { + border-top: solid 1px $white-normal; + border-bottom: solid 1px transparent; &:hover { border-color: $row-hover-border; background-color: $row-hover; cursor: pointer; } + } - .avatar-container > a { - width: 100%; + .content-list li.has-more-items-link { + padding: 19px; + font-weight: normal; + color: $gl-text-color-secondary; + + &::before { + bottom: 30px; } } -} -.js-groups-list-holder { - .groups-list-loading { - font-size: 34px; - text-align: center; + .project-list.has-sibling-groups { + &::before { + top: -30px; + bottom: 30px; + } } + + .group-list-tree.has-sibling-projects { + > .group-row:last-of-type::before { + height: 0; + } + } +} + +.projects-list-holder .projects-list-loading, +.groups-list-holder .groups-list-loading { + font-size: 34px; + text-align: center; } |