diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-08 10:12:52 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-08 10:12:52 +0300 |
| commit | 8623be034c3e5d0d64f3f64c6c8313386b942ee9 (patch) | |
| tree | acd5bcc52349abaf04449164ddb5196d85340a75 | |
| parent | 5fb412d733051b878921db0901e7432882b3ce2a (diff) | |
Make resend/trash buttons the same height as dropdownjohann.sonntagbauer/gitlab-ce-55869-Resend-invite-button-not-aligned-well-in-group-members-page
| -rw-r--r-- | app/assets/stylesheets/pages/members.scss | 2 | ||||
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss index 26a8948f15b..193435e43ac 100644 --- a/app/assets/stylesheets/pages/members.scss +++ b/app/assets/stylesheets/pages/members.scss @@ -240,7 +240,7 @@ } .member-controls { - .member-resend-btn { + .control-btn { line-height: inherit; } } diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 64ffadedda0..2b2a36a3f7b 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -64,7 +64,7 @@ %span{ class: ('d-block d-sm-none' unless force_mobile_view) } = _('Resend invite') - unless force_mobile_view - = icon('paper-plane', class: 'd-none d-sm-block') + = icon('paper-plane', class: 'control-btn d-none d-sm-block') - if user != current_user && member.can_update? = form_for member, remote: true, html: { class: 'js-edit-member-form form-group append-right-5 d-flex flex-column flex-md-row' } do |f| @@ -119,6 +119,6 @@ %span{ class: ('d-block d-sm-none' unless force_mobile_view) } = _("Delete") - unless force_mobile_view - = icon('trash', class: 'd-none d-sm-block') + = icon('trash', class: 'control-btn d-none d-sm-block') - else %span.member-access-text= member.human_access |