Commit fdd95ed7 authored by Stan Hu's avatar Stan Hu

Fix placement of LDAP icon in members list

Since the upgrade to Bootstrap 4, the style of the LDAP badge in the
members page has looked off. Clean up the CSS and logic for showing this
badge.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8300
parent 16d97695
......@@ -130,9 +130,6 @@
.members-ldap {
align-self: center;
height: 100%;
margin-right: 10px;
margin-left: -49px;
}
.alert-member-ldap {
......
......@@ -53,8 +53,8 @@
= time_ago_with_tooltip(member.created_at)
- if show_roles
- current_resource = @project || @group
.controls.member-controls
= render 'shared/members/ee/ldap_tag', can_override: member.can_override?, visible: false
.controls.member-controls.row
= render 'shared/members/ee/ldap_tag', can_override: member.can_override?
- if show_controls && member.source == current_resource
- if member.can_resend_invite?
......
- can_override = local_assigns.fetch(:can_override, false)
- visible = local_assigns.fetch(:visible, false)
- if can_override
- if visible
%span.badge.badge-info.float-right.d-block.d-sm-none
LDAP
- else
%span.badge.badge-info.members-ldap.d-none.d-sm-block
LDAP
%span.badge.badge-info.members-ldap.d-sm-block.mr-md-4
LDAP
---
title: Fix placement of LDAP icon in members list
merge_request: 12304
author:
type: fixed
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