BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
e60fd1f6
Commit
e60fd1f6
authored
Feb 03, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'improve-dash-icons' into 'master'
Improve project avatars for dashboard Fixes #1955 See merge request !1457
parents
6496dc3c
2bd70b6a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
7 deletions
+18
-7
dashboard.scss
app/assets/stylesheets/sections/dashboard.scss
+10
-0
_groups.html.haml
app/views/dashboard/_groups.html.haml
+2
-1
_project.html.haml
app/views/dashboard/_project.html.haml
+2
-2
_projects.html.haml
app/views/groups/_projects.html.haml
+2
-2
_groups.html.haml
app/views/users/_groups.html.haml
+2
-2
No files found.
app/assets/stylesheets/sections/dashboard.scss
View file @
e60fd1f6
...
...
@@ -97,7 +97,17 @@
.dash-project-avatar
{
float
:
left
;
.avatar
{
margin-top
:
-8px
;
margin-left
:
-15px
;
@include
border-radius
(
0px
);
}
.identicon
{
line-height
:
40px
;
}
}
.dash-project-access-icon
{
float
:
left
;
margin-right
:
5px
;
...
...
app/views/dashboard/_groups.html.haml
View file @
e60fd1f6
...
...
@@ -10,7 +10,8 @@
-
groups
.
each
do
|
group
|
%li
.group-row
=
link_to
group_path
(
id:
group
.
path
),
class:
dom_class
(
group
)
do
=
image_tag
group_icon
(
group
.
path
),
class:
"avatar s24"
.dash-project-avatar
=
image_tag
group_icon
(
group
.
path
),
class:
"avatar s40"
%span
.group-name.filter-title
=
truncate
(
group
.
name
,
length:
35
)
%span
.arrow
...
...
app/views/dashboard/_project.html.haml
View file @
e60fd1f6
=
link_to
project_path
(
project
),
class:
dom_class
(
project
)
do
.dash-project-avatar
=
project_icon
(
project
.
to_param
,
alt:
''
,
class:
'avatar s40'
)
.dash-project-access-icon
=
visibility_level_icon
(
project
.
visibility_level
)
.dash-project-avatar
=
project_icon
(
project
.
to_param
,
alt:
''
,
class:
'avatar s24'
)
%span
.str-truncated
%span
.namespace-name
-
if
project
.
namespace
...
...
app/views/groups/_projects.html.haml
View file @
e60fd1f6
...
...
@@ -12,10 +12,10 @@
-
projects
.
each
do
|
project
|
%li
.project-row
=
link_to
project_path
(
project
),
class:
dom_class
(
project
)
do
.dash-project-avatar
=
project_icon
(
project
.
to_param
,
alt:
''
,
class:
'avatar s40'
)
.dash-project-access-icon
=
visibility_level_icon
(
project
.
visibility_level
)
.dash-project-avatar
=
project_icon
(
project
.
to_param
,
alt:
''
,
class:
'avatar s24'
)
%span
.str-truncated
%span
.project-name
=
project
.
name
...
...
app/views/users/_groups.html.haml
View file @
e60fd1f6
.clearfix
-
groups
.
each
do
|
group
|
=
link_to
group
,
class:
'profile-groups-avatars'
,
title:
group
.
name
do
=
image_tag
group_icon
(
group
.
path
),
class:
'avatar avatar-
inlin
e s40'
=
link_to
group
,
class:
'profile-groups-avatars
inline
'
,
title:
group
.
name
do
=
image_tag
group_icon
(
group
.
path
),
class:
'avatar avatar-
til
e s40'
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