diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-05-17 22:15:03 +0300 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-05-17 22:15:03 +0300 |
| commit | 3a402fc7fc1dd0b0397f8cdd8ed73336ac409281 (patch) | |
| tree | b5c5b163bc36854a10199c26c2f8b18a66bf9509 | |
| parent | 399996ca2e5e475df297c1ba7890cc6a8c2d63c5 (diff) | |
| parent | 88fa0ecdd9a2982795bb9ddd56873e6ac5c23815 (diff) | |
Merge branch 'dz-fix-list-bottom-margin' into 'master'
Fix group lists visual
See merge request gitlab-org/gitlab-ce!19010
| -rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 11 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/groups.scss | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index f1a8a46dda4..4110d7f15a8 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -279,7 +279,6 @@ ul.indent-list { padding: 10px 0 0 30px; } - // Specific styles for tree list @keyframes spin-avatar { from { transform: rotate(0deg); } @@ -424,18 +423,10 @@ ul.indent-list { &:first-child { border-top: 1px solid $white-normal; } - - &: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; + padding: $gl-padding-top; &:hover { border-color: $row-hover-border; diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss index 6ee8b33bd39..c378ad50836 100644 --- a/app/assets/stylesheets/pages/groups.scss +++ b/app/assets/stylesheets/pages/groups.scss @@ -18,6 +18,10 @@ .group-row { @include basic-list-stats; + + .description p { + margin-bottom: 0; + } } .ldap-group-links { |