diff options
| author | Phil Hughes <me@iamphill.com> | 2019-03-25 08:52:31 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-03-25 08:52:31 +0000 |
| commit | 66418658d08ef3fd5acdbebb149695d13fb0256c (patch) | |
| tree | f595491edec1f938f3fa409f4b135712bbaf5065 | |
| parent | 08e1ed78f71c35c3494bde9aaa96349c546b16f3 (diff) | |
| parent | e03bb5a77ba011635c6da1a1f11c60bd8d0cbecc (diff) | |
| download | gitlab-ce-66418658d08ef3fd5acdbebb149695d13fb0256c.tar.gz | |
Merge branch '10602-lists-css' into 'master'
Removes EE differences for lists.scss
Closes gitlab-ee#10602
See merge request gitlab-org/gitlab-ce!26487
| -rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index 1a74e06a75d..298610a0631 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -156,6 +156,12 @@ ul.content-list { margin-top: 3px; margin-bottom: 4px; + &.btn-ldap-override { + @include media-breakpoint-up(sm) { + margin-bottom: 0; + } + } + &.has-tooltip, &:last-child { margin-right: 0; |