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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
99736d45
Commit
99736d45
authored
Jan 23, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make all avatars rounded for consistency
parent
c6e24850
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
16 deletions
+11
-16
app/assets/stylesheets/generic/avatar.scss
app/assets/stylesheets/generic/avatar.scss
+3
-2
app/assets/stylesheets/generic/timeline.scss
app/assets/stylesheets/generic/timeline.scss
+1
-1
app/assets/stylesheets/main/variables.scss
app/assets/stylesheets/main/variables.scss
+2
-0
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/header.scss
+1
-1
app/assets/stylesheets/sections/profile.scss
app/assets/stylesheets/sections/profile.scss
+0
-9
app/views/users/_groups.html.haml
app/views/users/_groups.html.haml
+4
-3
No files found.
app/assets/stylesheets/generic/avatar.scss
View file @
99736d45
...
@@ -2,8 +2,9 @@
...
@@ -2,8 +2,9 @@
float
:
left
;
float
:
left
;
margin-right
:
12px
;
margin-right
:
12px
;
width
:
40px
;
width
:
40px
;
padding
:
1px
;
height
:
40px
;
@include
border-radius
(
4px
);
padding
:
0
;
@include
border-radius
(
$avatar_radius
);
&
.avatar-inline
{
&
.avatar-inline
{
float
:
none
;
float
:
none
;
...
...
app/assets/stylesheets/generic/timeline.scss
View file @
99736d45
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
background
:
#fff
;
background
:
#fff
;
color
:
#737881
;
color
:
#737881
;
float
:
left
;
float
:
left
;
@include
border-radius
(
40px
);
@include
border-radius
(
$avatar_radius
);
@include
box-shadow
(
0
0
0
3px
#EEE
);
@include
box-shadow
(
0
0
0
3px
#EEE
);
overflow
:
hidden
;
overflow
:
hidden
;
...
...
app/assets/stylesheets/main/variables.scss
View file @
99736d45
...
@@ -57,3 +57,5 @@ $list-font-size: 15px;
...
@@ -57,3 +57,5 @@ $list-font-size: 15px;
* Sidebar navigation width
* Sidebar navigation width
*/
*/
$sidebar_width
:
230px
;
$sidebar_width
:
230px
;
$avatar_radius
:
50%
;
app/assets/stylesheets/sections/header.scss
View file @
99736d45
...
@@ -140,7 +140,7 @@ header {
...
@@ -140,7 +140,7 @@ header {
img
{
img
{
width
:
26px
;
width
:
26px
;
height
:
26px
;
height
:
26px
;
@include
border-radius
(
4px
);
@include
border-radius
(
$avatar_radius
);
}
}
}
}
...
...
app/assets/stylesheets/sections/profile.scss
View file @
99736d45
...
@@ -102,12 +102,3 @@
...
@@ -102,12 +102,3 @@
}
}
}
}
}
}
.profile-groups-avatars
{
margin
:
0
5px
10px
0
;
img
{
width
:
50px
;
height
:
50px
;
}
}
app/views/users/_groups.html.haml
View file @
99736d45
-
groups
.
each
do
|
group
|
.clearfix
=
link_to
group
,
class:
'profile-groups-avatars'
,
:title
=>
group
.
name
do
-
groups
.
each
do
|
group
|
-
image_tag
group_icon
(
group
.
path
)
=
link_to
group
,
class:
'profile-groups-avatars'
,
title:
group
.
name
do
=
image_tag
group_icon
(
group
.
path
),
class:
'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