diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-05-07 06:47:39 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-05-07 06:47:39 +0000 |
| commit | 6424a3ec7ee361b37a6ad853293bf7ecb0f1f95e (patch) | |
| tree | f314e5e3a2a775ac7f4a0a05e8e2dc77d7a8606c | |
| parent | e33a8baff5b185d7a705607f9148fb64b7f5561f (diff) | |
| parent | 6f95be7d017c7eb4c5274814931ae64aa7523d87 (diff) | |
| download | gitlab-ce-6424a3ec7ee361b37a6ad853293bf7ecb0f1f95e.tar.gz | |
Merge branch 'sh-fix-ldap-members-icon-ce' into 'master'
Backport members SCSS changes
See merge request gitlab-org/gitlab-ce!28115
| -rw-r--r-- | app/assets/stylesheets/pages/members.scss | 3 | ||||
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss index e0b84e0f92d..47ffdbae4b6 100644 --- a/app/assets/stylesheets/pages/members.scss +++ b/app/assets/stylesheets/pages/members.scss @@ -130,9 +130,6 @@ .members-ldap { align-self: center; - height: 100%; - margin-right: 10px; - margin-left: -49px; } .alert-member-ldap { diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 2db1f67a793..2e5747121b6 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -53,7 +53,7 @@ = time_ago_with_tooltip(member.created_at) - if show_roles - current_resource = @project || @group - .controls.member-controls + .controls.member-controls.row - if show_controls && member.source == current_resource - if member.can_resend_invite? |