diff options
| author | Nur Rony <pro.nmrony@gmail.com> | 2016-10-21 18:42:06 +0600 |
|---|---|---|
| committer | Nur Rony <pro.nmrony@gmail.com> | 2016-11-10 14:42:37 +0600 |
| commit | bf925d7814b1f5f2c38bd36bef63e2c05e33d57b (patch) | |
| tree | 5d7b6746e36b96c71fae45431d9c150d80ae8447 | |
| parent | eaa2fe215aa09b16ff577a39b72443e49255dd96 (diff) | |
| download | gitlab-ce-bf925d7814b1f5f2c38bd36bef63e2c05e33d57b.tar.gz | |
removes unnecessary css rules and adds sort dropdown project memebers
| -rw-r--r-- | app/assets/stylesheets/pages/members.scss | 18 | ||||
| -rw-r--r-- | app/views/groups/group_members/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/project_members/index.html.haml | 1 |
3 files changed, 8 insertions, 13 deletions
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss index 962aca7066c..f28511ebdcc 100644 --- a/app/assets/stylesheets/pages/members.scss +++ b/app/assets/stylesheets/pages/members.scss @@ -100,20 +100,9 @@ } } - &.group-member { - .member-search-btn { - right: 4px; - - @media (min-width: $screen-sm-min) { - right: 160px; - top: 8px; - } - } - } - .member-search-btn { position: absolute; - right: 20px; + right: 4px; top: 0; height: 35px; padding-left: 10px; @@ -122,6 +111,11 @@ background: transparent; border: 0; outline: 0; + + @media (min-width: $screen-sm-min) { + right: 160px; + top: 8px; + } } } diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml index d0e9da5af18..bc5d3c797ac 100644 --- a/app/views/groups/group_members/index.html.haml +++ b/app/views/groups/group_members/index.html.haml @@ -16,7 +16,7 @@ .append-bottom-default.clearfix %h5.member.existing-title Existing users - = form_tag group_group_members_path(@group), method: :get, class: 'form-inline group-member member-search-form' do + = form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form' do .form-group = 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" } diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index bdeb704b6da..4f1cec20f85 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -21,6 +21,7 @@ = 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") + = render 'shared/members/sort_dropdown' - if @group_links.any? = render 'groups', group_links: @group_links |