diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-02-03 16:43:09 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-02-03 16:43:09 +0000 |
| commit | d506b3f958654534de93f443b9a81ba4434c0b71 (patch) | |
| tree | 24456de662b0f6aa3ad368475730f70404bc4faa /app/views/groups | |
| parent | 259c0d022f9ad810949a4f7724cb07590531984c (diff) | |
| parent | 754538b99206a778ddf87e0d362fccb0ff2f6c15 (diff) | |
| download | gitlab-ce-d506b3f958654534de93f443b9a81ba4434c0b71.tar.gz | |
Merge branch 'improve-groups-list' into 'master'
Improve UI consistency between projects and groups lists
* add group description to the list
* move new group button to top nav
* move projects/users count icons to the right
Fixes #3939
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !2677
Diffstat (limited to 'app/views/groups')
| -rw-r--r-- | app/views/groups/_projects.html.haml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml index bbafc08435a..a829479bb38 100644 --- a/app/views/groups/_projects.html.haml +++ b/app/views/groups/_projects.html.haml @@ -1,11 +1,10 @@ -.projects-list-holder - .projects-search-form - .input-group - = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control', spellcheck: false - - if can? current_user, :create_projects, @group - %span.input-group-btn - = link_to new_project_path(namespace_id: @group.id), class: 'btn btn-green' do - %i.fa.fa-plus - New Project +.projects-list-holder.prepend-top-default + .input-group + = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control', spellcheck: false + - if can? current_user, :create_projects, @group + %span.input-group-btn + = link_to new_project_path(namespace_id: @group.id), class: 'btn btn-new' do + = icon('plus') + New Project = render 'shared/projects/list', projects: @projects, projects_limit: 20, stars: false, skip_namespace: true |