Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-13

app/assets/stylesheets/pages/members.scss

@@ -127,10 +127,6 @@
   background: transparent;
   border: 0;
   outline: 0;
-
-  @include media-breakpoint-up(sm) {
-    right: 160px;
-  }
 }
 
 .members-ldap {

app/views/groups/group_members/index.html.haml

@@ -27,6 +27,7 @@
       %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-group
+          .position-relative.append-right-8
             = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
             %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
               = icon("search")

app/views/projects/project_members/_team.html.haml

@@ -9,6 +9,7 @@
     %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-group
+        .position-relative
           = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
           %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
             = icon("search")