diff options
author | Phil Hughes <me@iamphill.com> | 2019-03-26 15:44:33 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-03-26 15:44:33 +0300 |
commit | e4760e770d5fbd04084ede92db4d80c86bc28aca (patch) | |
tree | 24a20af606d66e1e09642acecde21c92db1a02a4 /app | |
parent | 8980b0f3d54ea2f00ef6edde6823f72d6356c128 (diff) | |
parent | 35144326bb83f7a2922da5ee126287a959b04bc4 (diff) |
Merge branch '10676-members-css' into 'master'
Removes EE differences for members.scss
Closes gitlab-ee#10676
See merge request gitlab-org/gitlab-ce!26587
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/pages/members.scss | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss index eb32beb0972..e0b84e0f92d 100644 --- a/app/assets/stylesheets/pages/members.scss +++ b/app/assets/stylesheets/pages/members.scss @@ -14,6 +14,12 @@ } .member { + &.is-overriden { + .btn-ldap-override { + display: none !important; + } + } + .list-item-name { @include media-breakpoint-up(sm) { float: left; @@ -122,6 +128,49 @@ outline: 0; } +.members-ldap { + align-self: center; + height: 100%; + margin-right: 10px; + margin-left: -49px; +} + +.alert-member-ldap { + background-color: $orange-50; + + @include media-breakpoint-up(sm) { + line-height: 40px; + } + + > p { + float: left; + margin-bottom: 10px; + color: $orange-600; + + @include media-breakpoint-up(sm) { + padding-left: 55px; + margin-bottom: 0; + } + } + + .controls { + width: 100%; + + @include media-breakpoint-up(sm) { + width: auto; + } + } +} + +.btn-ldap-override { + width: 100%; + + @include media-breakpoint-up(sm) { + margin-left: 10px; + width: auto; + } +} + .flex-project-members-panel { display: flex; flex-direction: row; |