Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
02679544
Commit
02679544
authored
Feb 04, 2016
by
Jacob Schatz
Committed by
Alfredo Sumaran
Feb 23, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix group projects styles
Makes new project button visible when no projects are available. Fixes #13193
parent
9f80118e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
9 deletions
+25
-9
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+16
-0
app/views/groups/_projects.html.haml
app/views/groups/_projects.html.haml
+6
-5
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+3
-4
No files found.
app/assets/stylesheets/framework/common.scss
View file @
02679544
...
@@ -398,3 +398,19 @@ table {
...
@@ -398,3 +398,19 @@ table {
margin-right
:
-
$gl-padding
;
margin-right
:
-
$gl-padding
;
border-top
:
1px
solid
$border-color
;
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
;
}
}
}
\ No newline at end of file
app/views/groups/_projects.html.haml
View file @
02679544
.top-area
.top-area
.nav-controls
.nav-controls
=
form_tag
request
.
original_url
,
method: :get
,
class:
'project-filter-form'
,
id:
'project-filter-form'
do
|
f
|
=
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
@projects
.
present?
-
if
current_user
&&
current_user
.
can_create_project?
=
search_field_tag
:filter_projects
,
nil
,
placeholder:
'Filter by name'
,
class:
'projects-list-filter form-control'
,
spellcheck:
false
=
link_to
new_project_path
,
class:
'btn btn-new'
do
-
if
can?
current_user
,
:create_projects
,
@group
=
icon
(
'plus'
)
=
link_to
new_project_path
(
namespace_id:
@group
.
id
),
class:
'btn btn-new pull-right'
do
New Project
=
icon
(
'plus'
)
New Project
.projects-list-holder
.projects-list-holder
=
render
'shared/projects/list'
,
projects:
@projects
,
projects_limit:
20
,
stars:
false
,
skip_namespace:
true
=
render
'shared/projects/list'
,
projects:
@projects
,
projects_limit:
20
,
stars:
false
,
skip_namespace:
true
app/views/groups/show.html.haml
View file @
02679544
...
@@ -32,10 +32,9 @@
...
@@ -32,10 +32,9 @@
%li
.active
%li
.active
=
link_to
"#activity"
,
'data-toggle'
=>
'tab'
do
=
link_to
"#activity"
,
'data-toggle'
=>
'tab'
do
Activity
Activity
-
if
@projects
.
present?
%li
%li
=
link_to
"#projects"
,
'data-toggle'
=>
'tab'
do
=
link_to
"#projects"
,
'data-toggle'
=>
'tab'
do
Projects
Projects
-
if
can?
(
current_user
,
:read_group
,
@group
)
-
if
can?
(
current_user
,
:read_group
,
@group
)
%div
{
class:
container_class
}
%div
{
class:
container_class
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment