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
Tatuya Kamada
gitlab-ce
Commits
5d3adcf2
Commit
5d3adcf2
authored
Mar 29, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-admin-projects' into 'master'
Fix admin projects page in admin area See merge request !10277
parents
79275ca0
fd167f22
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
17 deletions
+36
-17
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+12
-0
app/assets/stylesheets/pages/groups.scss
app/assets/stylesheets/pages/groups.scss
+1
-9
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+10
-0
app/views/admin/projects/_projects.html.haml
app/views/admin/projects/_projects.html.haml
+8
-7
app/views/shared/projects/_project.html.haml
app/views/shared/projects/_project.html.haml
+1
-1
changelogs/unreleased/fix-admin-projects.yml
changelogs/unreleased/fix-admin-projects.yml
+4
-0
No files found.
app/assets/stylesheets/framework/mixins.scss
View file @
5d3adcf2
...
...
@@ -52,6 +52,18 @@
}
}
@mixin
basic-list-stats
{
.stats
{
float
:
right
;
line-height
:
$list-text-height
;
color
:
$gl-text-color
;
span
{
margin-right
:
15px
;
}
}
}
@mixin
bulleted-list
{
>
ul
{
list-style-type
:
disc
;
...
...
app/assets/stylesheets/pages/groups.scss
View file @
5d3adcf2
...
...
@@ -17,15 +17,7 @@
}
.group-row
{
.stats
{
float
:
right
;
line-height
:
$list-text-height
;
color
:
$gl-text-color
;
span
{
margin-right
:
15px
;
}
}
@include
basic-list-stats
;
}
.ldap-group-links
{
...
...
app/assets/stylesheets/pages/projects.scss
View file @
5d3adcf2
...
...
@@ -573,9 +573,19 @@ pre.light-well {
display
:
flex
;
flex-direction
:
column
;
// Disable Flexbox for admin page
&
.admin-projects
{
display
:
block
;
.project-row
{
display
:
block
;
}
}
.project-row
{
display
:
flex
;
align-items
:
center
;
@include
basic-list-stats
;
}
h3
{
...
...
app/views/admin/projects/_projects.html.haml
View file @
5d3adcf2
.js-projects-list-holder
-
if
@projects
.
any?
%ul
.projects-list.content-list
%ul
.projects-list.content-list
.admin-projects
-
@projects
.
each_with_index
do
|
project
|
%li
.project-row
%li
.project-row
{
class:
(
'no-description'
if
project
.
description
.
blank?
)
}
.controls
-
if
project
.
archived
%span
.label.label-warning
archived
%span
.badge
=
storage_counter
(
project
.
statistics
.
storage_size
)
=
link_to
'Edit'
,
edit_namespace_project_path
(
project
.
namespace
,
project
),
id:
"edit_
#{
dom_id
(
project
)
}
"
,
class:
"btn"
=
link_to
'Delete'
,
[
project
.
namespace
.
becomes
(
Namespace
),
project
],
data:
{
confirm:
remove_project_message
(
project
)
},
method: :delete
,
class:
"btn btn-remove"
.stats
%span
.badge
=
storage_counter
(
project
.
statistics
.
storage_size
)
-
if
project
.
archived
%span
.label.label-warning
archived
.title
=
link_to
[
:admin
,
project
.
namespace
.
becomes
(
Namespace
),
project
]
do
.dash-project-avatar
...
...
@@ -20,7 +21,7 @@
-
if
project
.
namespace
=
project
.
namespace
.
human_name
\/
%span
.project-name
.filter-title
%span
.project-name
=
project
.
name
-
if
project
.
description
.
present?
...
...
app/views/shared/projects/_project.html.haml
View file @
5d3adcf2
...
...
@@ -24,7 +24,7 @@
-
if
project
.
namespace
&&
!
skip_namespace
=
project
.
namespace
.
human_name
\/
%span
.project-name
.filter-title
%span
.project-name
=
project
.
name
-
if
show_last_commit_as_description
...
...
changelogs/unreleased/fix-admin-projects.yml
0 → 100644
View file @
5d3adcf2
---
title
:
Fix layout of projects page on admin area
merge_request
:
author
:
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