diff options
Diffstat (limited to 'app/views/shared/members')
-rw-r--r-- | app/views/shared/members/_filter_2fa_dropdown.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/members/_group.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/members/_invite_group.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/members/_invite_member.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/members/_member.html.haml | 15 | ||||
-rw-r--r-- | app/views/shared/members/_search_field.html.haml | 6 | ||||
-rw-r--r-- | app/views/shared/members/_sort_dropdown.html.haml | 1 |
7 files changed, 17 insertions, 13 deletions
diff --git a/app/views/shared/members/_filter_2fa_dropdown.html.haml b/app/views/shared/members/_filter_2fa_dropdown.html.haml index 44ea844028e..a2bc5e9ecdf 100644 --- a/app/views/shared/members/_filter_2fa_dropdown.html.haml +++ b/app/views/shared/members/_filter_2fa_dropdown.html.haml @@ -1,6 +1,6 @@ - filter = params[:two_factor] || 'everyone' - filter_options = { 'everyone' => _('Everyone'), 'enabled' => _('Enabled'), 'disabled' => _('Disabled') } -.dropdown.inline.member-filter-2fa-dropdown.pr-md-2 +.dropdown.inline.member-filter-2fa-dropdown = dropdown_toggle(filter_options[filter], { toggle: 'dropdown' }) %ul.dropdown-menu.dropdown-menu-align-right.dropdown-menu-selectable %li.dropdown-header diff --git a/app/views/shared/members/_group.html.haml b/app/views/shared/members/_group.html.haml index 1d7d18d2ab6..f59e0f92c60 100644 --- a/app/views/shared/members/_group.html.haml +++ b/app/views/shared/members/_group.html.haml @@ -46,4 +46,4 @@ class: 'btn btn-remove m-0 ml-sm-2 align-self-center' do %span.d-block.d-sm-none = _("Delete") - = icon('trash', class: 'd-none d-sm-block') + = sprite_icon('remove', css_class: 'd-none d-sm-block') diff --git a/app/views/shared/members/_invite_group.html.haml b/app/views/shared/members/_invite_group.html.haml index 27c930bcbb5..a2fb33aa757 100644 --- a/app/views/shared/members/_invite_group.html.haml +++ b/app/views/shared/members/_invite_group.html.haml @@ -14,7 +14,7 @@ .select-wrapper = select_tag group_access_field, options_for_select(access_levels, default_access_level), data: { qa_selector: 'group_access_field' }, class: "form-control select-control" = icon('chevron-down') - .form-text.text-muted.append-bottom-10 + .form-text.text-muted.gl-mb-3 - permissions_docs_path = help_page_path('user/permissions') - 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 } diff --git a/app/views/shared/members/_invite_member.html.haml b/app/views/shared/members/_invite_member.html.haml index d3a1c85e285..284d7fdb6da 100644 --- a/app/views/shared/members/_invite_member.html.haml +++ b/app/views/shared/members/_invite_member.html.haml @@ -14,7 +14,7 @@ .select-wrapper = select_tag :access_level, options_for_select(access_levels, default_access_level), class: "form-control project-access-select select-control" = icon('chevron-down') - .form-text.text-muted.append-bottom-10 + .form-text.text-muted.gl-mb-3 - permissions_docs_path = help_page_path('user/permissions') - 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 } diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 79dc3043e8d..fa71f4dc9b9 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 · - = 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? @@ -62,7 +62,7 @@ - if show_controls && member.source == current_resource - if member.can_resend_invite? - = link_to sprite_icon('paper-airplane', size: 16), polymorphic_path([:resend_invite, member]), + = link_to sprite_icon('paper-airplane'), polymorphic_path([:resend_invite, member]), method: :post, class: 'btn btn-default align-self-center mr-sm-2', title: _('Resend invite') @@ -113,18 +113,17 @@ - if member.can_remove? - if current_user == user - = link_to icon('sign-out', text: _('Leave')), polymorphic_path([:leave, member.source, :members]), - method: :delete, - data: { confirm: leave_confirmation_message(member.source) }, - class: "btn btn-remove align-self-center m-0 #{'ml-sm-2' unless force_mobile_view}" + = link_to polymorphic_path([:leave, member.source, :members]), method: :delete, data: { confirm: leave_confirmation_message(member.source) }, class: "btn gl-button btn-svg btn-danger align-self-center m-0 #{'ml-sm-2' unless force_mobile_view}" do + = sprite_icon('leave', css_class: 'gl-icon') + = _('Leave') - else %button{ data: { member_path: member_path(member.member), message: remove_member_message(member), is_access_request: member.request?.to_s, qa_selector: 'delete_member_button' }, - class: "js-remove-member-button btn btn-remove align-self-center m-0 #{'ml-sm-2' unless force_mobile_view}", + class: "js-remove-member-button btn gl-button btn-danger align-self-center m-0 #{'ml-sm-2 btn-icon' unless force_mobile_view}", title: remove_member_title(member) } %span{ class: ('d-block d-sm-none' unless force_mobile_view) } = _("Delete") - unless force_mobile_view - = icon('trash', class: 'd-none d-sm-block') + = sprite_icon('remove', css_class: 'd-none d-sm-block gl-icon') = render_if_exists 'shared/members/ee/override_member_buttons', group: @group, member: member, user: user, action: :edit, can_override: member.can_override? - else %span.member-access-text.user-access-role= member.human_access diff --git a/app/views/shared/members/_search_field.html.haml b/app/views/shared/members/_search_field.html.haml new file mode 100644 index 00000000000..e70cb063324 --- /dev/null +++ b/app/views/shared/members/_search_field.html.haml @@ -0,0 +1,6 @@ +- name = local_assigns.fetch(:name, :search) + +.search-control-wrap.gl-relative + = search_field_tag name, params[name], { placeholder: _('Search'), class: 'form-control', spellcheck: false } + %button.user-search-btn.border-left.gl-display-flex.gl-align-items-center.gl-justify-content-center{ type: 'submit', 'aria': { label: _('Submit search') } } + = sprite_icon('search') diff --git a/app/views/shared/members/_sort_dropdown.html.haml b/app/views/shared/members/_sort_dropdown.html.haml index 50a55565c3c..606d3bcdfa8 100644 --- a/app/views/shared/members/_sort_dropdown.html.haml +++ b/app/views/shared/members/_sort_dropdown.html.haml @@ -1,4 +1,3 @@ -= label_tag :sort_by, 'Sort by', class: 'col-form-label label-bold px-2' .dropdown.inline.qa-user-sort-dropdown = dropdown_toggle(member_sort_options_hash[@sort], { toggle: 'dropdown' }) %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable |