Fix group projects styles
Makes new project button visible when no projects are available. Fixes #13193
This commit is contained in:
parent
9f80118e05
commit
0267954403
3 changed files with 25 additions and 9 deletions
|
@ -398,3 +398,19 @@ table {
|
|||
margin-right: -$gl-padding;
|
||||
border-top: 1px solid $border-color;
|
||||
}
|
||||
|
||||
.search-area {
|
||||
display: block;
|
||||
border-bottom: 1px solid $table-border-color;
|
||||
height: 50px;
|
||||
|
||||
.search-controls {
|
||||
float: right;
|
||||
|
||||
input[type='search'] {
|
||||
float: left;
|
||||
width: auto;
|
||||
margin-right: 10px;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,11 +1,12 @@
|
|||
.top-area
|
||||
.nav-controls
|
||||
= form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
|
||||
= search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'input-short project-filter-form-field form-control projects-list-filter', spellcheck: false, id: 'project-filter-form-field'
|
||||
- if current_user && current_user.can_create_project?
|
||||
= link_to new_project_path, class: 'btn btn-new' do
|
||||
= icon('plus')
|
||||
New Project
|
||||
- if @projects.present?
|
||||
= 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
|
||||
= link_to new_project_path(namespace_id: @group.id), class: 'btn btn-new pull-right' do
|
||||
= icon('plus')
|
||||
New Project
|
||||
|
||||
.projects-list-holder
|
||||
= render 'shared/projects/list', projects: @projects, projects_limit: 20, stars: false, skip_namespace: true
|
||||
|
|
|
@ -32,10 +32,9 @@
|
|||
%li.active
|
||||
= link_to "#activity", 'data-toggle' => 'tab' do
|
||||
Activity
|
||||
- if @projects.present?
|
||||
%li
|
||||
= link_to "#projects", 'data-toggle' => 'tab' do
|
||||
Projects
|
||||
%li
|
||||
= link_to "#projects", 'data-toggle' => 'tab' do
|
||||
Projects
|
||||
|
||||
- if can?(current_user, :read_group, @group)
|
||||
%div{ class: container_class }
|
||||
|
|
Loading…
Reference in a new issue