Add latest changes from gitlab-org/gitlab@13-4-stable-ee

4 files changed, 6 insertions, 6 deletions

diff --git a/app/views/shared/members/_group.html.haml b/app/views/shared/members/_group.html.haml
index f59e0f92c60..8e5763842d9 100644
--- a/app/views/shared/members/_group.html.haml
+++ b/app/views/shared/members/_group.html.haml
@@ -38,7 +38,7 @@
                     data: { id: role_id, el_id: dom_id }
       .clearable-input.member-form-control.d-sm-inline-block
         = text_field_tag 'group_link[expires_at]', group_link.expires_at, class: 'form-control js-access-expiration-date js-member-update-control', placeholder: _('Expiration date'), id: "member_expires_at_#{group.id}", disabled: !can_admin_member
-        %i.clear-icon.js-clear-input
+        = sprite_icon('close', size: 16, css_class: 'clear-icon js-clear-input gl-text-gray-200')
     - if can_admin_member
       = link_to group_link_path,
         method: :delete,
diff --git a/app/views/shared/members/_invite_group.html.haml b/app/views/shared/members/_invite_group.html.haml
index a2fb33aa757..a87a4c6a45c 100644
--- a/app/views/shared/members/_invite_group.html.haml
+++ b/app/views/shared/members/_invite_group.html.haml
@@ -22,5 +22,5 @@
         = label_tag :expires_at, _('Access expiration date'), class: 'label-bold'
         .clearable-input
           = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date-groups', placeholder: _('Expiration date'), id: 'expires_at_groups'
-          %i.clear-icon.js-clear-input
+          = sprite_icon('close', size: 16, css_class: 'clear-icon js-clear-input gl-text-gray-200')
       = submit_tag _("Invite"), class: "btn btn-success", data: { qa_selector: 'invite_group_button' }
diff --git a/app/views/shared/members/_invite_member.html.haml b/app/views/shared/members/_invite_member.html.haml
index 284d7fdb6da..5f9046b3dcb 100644
--- a/app/views/shared/members/_invite_member.html.haml
+++ b/app/views/shared/members/_invite_member.html.haml
@@ -19,10 +19,10 @@
           - link_start = %q{<a href="%{url}">}.html_safe % { url: permissions_docs_path }
           = _("%{link_start}Read more%{link_end} about role permissions").html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
       .form-group
+        = label_tag :expires_at, _('Access expiration date'), class: 'label-bold'
         .clearable-input
-          = label_tag :expires_at, _('Access expiration date'), class: 'label-bold'
           = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date', placeholder: 'Expiration date'
-          %i.clear-icon.js-clear-input
+          = sprite_icon('close', size: 16, css_class: 'clear-icon js-clear-input gl-text-gray-200')
       = submit_tag _("Invite"), class: "btn btn-success", data: { qa_selector: 'invite_member_button' }
       - if can_import_members
         = link_to _("Import"), import_path, class: "btn btn-default", title: _("Import members from another project")
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml
index 20473b47484..7573c2f6d56 100644
--- a/app/views/shared/members/_member.html.haml
+++ b/app/views/shared/members/_member.html.haml
@@ -33,7 +33,7 @@
 
         - if source.instance_of?(Group) && source != @group
           &middot;
-          = link_to source.full_name, source, class: "member-group-link"
+          = link_to source.full_name, source, class: "gl-display-inline-block inline-link"
 
         .cgray
           - if member.request?
@@ -97,7 +97,7 @@
                 placeholder: _('Expiration date'),
                 id: "member_expires_at_#{member.id}",
                 data: { el_id: dom_id(member) }
-              %i.clear-icon.js-clear-input
+              = sprite_icon('close', size: 16, css_class: 'clear-icon js-clear-input gl-text-gray-200')
         - else
           %span.member-access-text.user-access-role= member.human_access