Commit e4760e77 authored by Phil Hughes's avatar Phil Hughes

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
parents 8980b0f3 35144326
...@@ -14,6 +14,12 @@ ...@@ -14,6 +14,12 @@
} }
.member { .member {
&.is-overriden {
.btn-ldap-override {
display: none !important;
}
}
.list-item-name { .list-item-name {
@include media-breakpoint-up(sm) { @include media-breakpoint-up(sm) {
float: left; float: left;
...@@ -122,6 +128,49 @@ ...@@ -122,6 +128,49 @@
outline: 0; 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 { .flex-project-members-panel {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment