Commit fba123a3 authored by Annabel Gray's avatar Annabel Gray

Merge branch '46702-groups-members-no-padding-between-dropdowns-input' into 'master'

Resolve "Groups > Members > No padding between dropdowns/input"

Closes #46702

See merge request gitlab-org/gitlab-ce!19724
parents b4f29f58 c0d84dcd
...@@ -121,10 +121,6 @@ ...@@ -121,10 +121,6 @@
background: transparent; background: transparent;
border: 0; border: 0;
outline: 0; outline: 0;
@include media-breakpoint-up(sm) {
right: 160px;
}
} }
.flex-project-members-panel { .flex-project-members-panel {
......
...@@ -25,9 +25,10 @@ ...@@ -25,9 +25,10 @@
%span.badge= @members.total_count %span.badge= @members.total_count
= form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form flex-project-members-form' do = form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form flex-project-members-form' do
.form-group .form-group
= search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false } .position-relative.append-right-8
%button.member-search-btn{ type: "submit", "aria-label" => "Submit search" } = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
= icon("search") %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
= icon("search")
- if can_manage_members - if can_manage_members
= render 'shared/members/filter_2fa_dropdown' = render 'shared/members/filter_2fa_dropdown'
= render 'shared/members/sort_dropdown' = render 'shared/members/sort_dropdown'
......
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
%span.badge.badge-pill= members.total_count %span.badge.badge-pill= members.total_count
= form_tag project_project_members_path(project), method: :get, class: 'form-inline member-search-form flex-project-members-form' do = form_tag project_project_members_path(project), method: :get, class: 'form-inline member-search-form flex-project-members-form' do
.form-group .form-group
= search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false } .position-relative
%button.member-search-btn{ type: "submit", "aria-label" => "Submit search" } = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
= icon("search") %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
= icon("search")
= render 'shared/members/sort_dropdown' = render 'shared/members/sort_dropdown'
%ul.content-list.members-list %ul.content-list.members-list
= render partial: 'shared/members/member', collection: members, as: :member = render partial: 'shared/members/member', collection: members, as: :member
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment