diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-06 03:27:38 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-06 04:07:02 -0700 |
| commit | 6f95be7d017c7eb4c5274814931ae64aa7523d87 (patch) | |
| tree | 63d69ceae97b4cb57eb7bdddc21ff4ef551301ec | |
| parent | 8dd238ada2cad2926693bc88d4db0b96d40d4611 (diff) | |
| download | gitlab-ce-6f95be7d017c7eb4c5274814931ae64aa7523d87.tar.gz | |
Backport members SCSS changessh-fix-ldap-members-icon-ce
This commit backports the changes in
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12304.
| -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? |