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
9a3afa4d
Commit
9a3afa4d
authored
Feb 07, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'refactor-avatars' into 'master'
Refactor avatars css See merge request !1487
parents
72cf8173
f228e17d
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
9 additions
and
13 deletions
+9
-13
app/assets/stylesheets/generic/avatar.scss
app/assets/stylesheets/generic/avatar.scss
+1
-1
app/assets/stylesheets/sections/dashboard.scss
app/assets/stylesheets/sections/dashboard.scss
+0
-3
app/assets/stylesheets/sections/projects.scss
app/assets/stylesheets/sections/projects.scss
+0
-1
app/views/dashboard/_project.html.haml
app/views/dashboard/_project.html.haml
+1
-1
app/views/dashboard/projects.html.haml
app/views/dashboard/projects.html.haml
+2
-2
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+1
-1
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+1
-1
app/views/projects/_home_panel.html.haml
app/views/projects/_home_panel.html.haml
+1
-1
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+1
-1
app/views/users/_groups.html.haml
app/views/users/_groups.html.haml
+1
-1
No files found.
app/assets/stylesheets/generic/avatar.scss
View file @
9a3afa4d
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
&
.s24
{
margin-right
:
4px
;
}
&
.s24
{
margin-right
:
4px
;
}
}
}
&
.avatar-tile
{
&
.
group-avatar
,
&
.project-avatar
,
&
.
avatar-tile
{
@include
border-radius
(
0px
);
@include
border-radius
(
0px
);
}
}
...
...
app/assets/stylesheets/sections/dashboard.scss
View file @
9a3afa4d
...
@@ -75,9 +75,6 @@
...
@@ -75,9 +75,6 @@
}
}
}
}
}
}
.project-avatar
{
float
:
left
;
}
.project-description
{
.project-description
{
overflow
:
hidden
;
overflow
:
hidden
;
...
...
app/assets/stylesheets/sections/projects.scss
View file @
9a3afa4d
...
@@ -32,7 +32,6 @@
...
@@ -32,7 +32,6 @@
.avatar
{
.avatar
{
width
:
70px
;
width
:
70px
;
height
:
70px
;
height
:
70px
;
@include
border-radius
(
0px
);
}
}
.identicon
{
.identicon
{
...
...
app/views/dashboard/_project.html.haml
View file @
9a3afa4d
=
link_to
project_path
(
project
),
class:
dom_class
(
project
)
do
=
link_to
project_path
(
project
),
class:
dom_class
(
project
)
do
.dash-project-avatar
.dash-project-avatar
=
project_icon
(
project
.
to_param
,
alt:
''
,
class:
'avatar s40'
)
=
project_icon
(
project
.
to_param
,
alt:
''
,
class:
'avatar
project-avatar
s40'
)
.dash-project-access-icon
.dash-project-access-icon
=
visibility_level_icon
(
project
.
visibility_level
)
=
visibility_level_icon
(
project
.
visibility_level
)
%span
.str-truncated
%span
.str-truncated
...
...
app/views/dashboard/projects.html.haml
View file @
9a3afa4d
...
@@ -11,8 +11,8 @@
...
@@ -11,8 +11,8 @@
-
@projects
.
each
do
|
project
|
-
@projects
.
each
do
|
project
|
%li
.my-project-row
%li
.my-project-row
%h4
.project-title
%h4
.project-title
.p
roject-avatar
.p
ull-left
=
project_icon
(
project
.
to_param
,
alt:
''
,
class:
'avatar s60'
)
=
project_icon
(
project
.
to_param
,
alt:
''
,
class:
'avatar
project-avatar
s60'
)
.project-access-icon
.project-access-icon
=
visibility_level_icon
(
project
.
visibility_level
)
=
visibility_level_icon
(
project
.
visibility_level
)
=
link_to
project_path
(
project
),
class:
dom_class
(
project
)
do
=
link_to
project_path
(
project
),
class:
dom_class
(
project
)
do
...
...
app/views/groups/edit.html.haml
View file @
9a3afa4d
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
.form-group
.form-group
.col-sm-2
.col-sm-2
.col-sm-10
.col-sm-10
=
image_tag
group_icon
(
@group
.
to_param
),
alt:
''
,
class:
'avatar s160'
=
image_tag
group_icon
(
@group
.
to_param
),
alt:
''
,
class:
'avatar
group-avatar
s160'
%p
.light
%p
.light
-
if
@group
.
avatar?
-
if
@group
.
avatar?
You can change your group avatar here
You can change your group avatar here
...
...
app/views/groups/show.html.haml
View file @
9a3afa4d
.dashboard
.dashboard
%div
%div
=
image_tag
group_icon
(
@group
.
path
),
class:
"avatar
avatar-tile
s90"
=
image_tag
group_icon
(
@group
.
path
),
class:
"avatar
group-avatar
s90"
.clearfix
.clearfix
%h2
%h2
=
@group
.
name
=
@group
.
name
...
...
app/views/projects/_home_panel.html.haml
View file @
9a3afa4d
-
empty_repo
=
@project
.
empty_repo?
-
empty_repo
=
@project
.
empty_repo?
.project-home-panel
{
:class
=>
(
"empty-project"
if
empty_repo
)}
.project-home-panel
{
:class
=>
(
"empty-project"
if
empty_repo
)}
.project-identicon-holder
.project-identicon-holder
=
project_icon
(
@project
.
to_param
,
alt:
''
,
class:
'avatar'
)
=
project_icon
(
@project
.
to_param
,
alt:
''
,
class:
'avatar
project-avatar
'
)
.project-home-row
.project-home-row
.project-home-desc
.project-home-desc
-
if
@project
.
description
.
present?
-
if
@project
.
description
.
present?
...
...
app/views/projects/edit.html.haml
View file @
9a3afa4d
...
@@ -78,7 +78,7 @@
...
@@ -78,7 +78,7 @@
.col-sm-2
.col-sm-2
.col-sm-10
.col-sm-10
-
if
@project
.
avatar?
-
if
@project
.
avatar?
=
project_icon
(
@project
.
to_param
,
alt:
''
,
class:
'avatar s160'
)
=
project_icon
(
@project
.
to_param
,
alt:
''
,
class:
'avatar
project-avatar
s160'
)
%p
.light
%p
.light
-
if
@project
.
avatar_in_git
-
if
@project
.
avatar_in_git
Project avatar in repository:
#{
@project
.
avatar_in_git
}
Project avatar in repository:
#{
@project
.
avatar_in_git
}
...
...
app/views/users/_groups.html.haml
View file @
9a3afa4d
.clearfix
.clearfix
-
groups
.
each
do
|
group
|
-
groups
.
each
do
|
group
|
=
link_to
group
,
class:
'profile-groups-avatars inline'
,
title:
group
.
name
do
=
link_to
group
,
class:
'profile-groups-avatars inline'
,
title:
group
.
name
do
=
image_tag
group_icon
(
group
.
path
),
class:
'avatar
avatar-tile
s40'
=
image_tag
group_icon
(
group
.
path
),
class:
'avatar
group-avatar
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