Commit 6424a3ec authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'sh-fix-ldap-members-icon-ce' into 'master'

Backport members SCSS changes

See merge request gitlab-org/gitlab-ce!28115
parents e33a8baf 6f95be7d
...@@ -130,9 +130,6 @@ ...@@ -130,9 +130,6 @@
.members-ldap { .members-ldap {
align-self: center; align-self: center;
height: 100%;
margin-right: 10px;
margin-left: -49px;
} }
.alert-member-ldap { .alert-member-ldap {
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
= time_ago_with_tooltip(member.created_at) = time_ago_with_tooltip(member.created_at)
- if show_roles - if show_roles
- current_resource = @project || @group - current_resource = @project || @group
.controls.member-controls .controls.member-controls.row
- if show_controls && member.source == current_resource - if show_controls && member.source == current_resource
- if member.can_resend_invite? - if member.can_resend_invite?
......
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