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
87a5d712
Commit
87a5d712
authored
Jul 22, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add light border to rounded avatars
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
033e5423
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
15 deletions
+13
-15
app/assets/stylesheets/framework/avatar.scss
app/assets/stylesheets/framework/avatar.scss
+11
-9
app/assets/stylesheets/pages/dashboard.scss
app/assets/stylesheets/pages/dashboard.scss
+0
-4
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
No files found.
app/assets/stylesheets/framework/avatar.scss
View file @
87a5d712
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
height
:
40px
;
height
:
40px
;
padding
:
0
;
padding
:
0
;
@include
border-radius
(
$avatar_radius
);
@include
border-radius
(
$avatar_radius
);
border
:
1px
solid
rgba
(
0
,
0
,
0
,
.1
);
&
.avatar-inline
{
&
.avatar-inline
{
float
:
none
;
float
:
none
;
...
@@ -15,8 +16,9 @@
...
@@ -15,8 +16,9 @@
&
.s24
{
margin-right
:
4px
;
}
&
.s24
{
margin-right
:
4px
;
}
}
}
&
.
group-avatar
,
&
.project-avatar
,
&
.
avatar-tile
{
&
.avatar-tile
{
@include
border-radius
(
0
);
@include
border-radius
(
0
);
border
:
none
;
}
}
&
.s16
{
width
:
16px
;
height
:
16px
;
margin-right
:
6px
;
}
&
.s16
{
width
:
16px
;
height
:
16px
;
margin-right
:
6px
;
}
...
@@ -43,12 +45,12 @@
...
@@ -43,12 +45,12 @@
&
.s16
{
font-size
:
12px
;
line-height
:
1
.33
;
}
&
.s16
{
font-size
:
12px
;
line-height
:
1
.33
;
}
&
.s24
{
font-size
:
14px
;
line-height
:
1
.8
;
}
&
.s24
{
font-size
:
14px
;
line-height
:
1
.8
;
}
&
.s26
{
font-size
:
20px
;
line-height
:
1
.33
;
}
&
.s26
{
font-size
:
20px
;
line-height
:
1
.33
;
}
&
.s32
{
font-size
:
20px
;
line-height
:
3
2
px
;
}
&
.s32
{
font-size
:
20px
;
line-height
:
3
0
px
;
}
&
.s40
{
font-size
:
16px
;
line-height
:
40
px
;
}
&
.s40
{
font-size
:
16px
;
line-height
:
38
px
;
}
&
.s60
{
font-size
:
32px
;
line-height
:
60
px
;
}
&
.s60
{
font-size
:
32px
;
line-height
:
58
px
;
}
&
.s70
{
font-size
:
34px
;
line-height
:
70
px
;
}
&
.s70
{
font-size
:
34px
;
line-height
:
68
px
;
}
&
.s90
{
font-size
:
36px
;
line-height
:
90
px
;
}
&
.s90
{
font-size
:
36px
;
line-height
:
88
px
;
}
&
.s110
{
font-size
:
40px
;
line-height
:
1
12
px
;
font-weight
:
300
;
}
&
.s110
{
font-size
:
40px
;
line-height
:
1
08
px
;
font-weight
:
300
;
}
&
.s140
{
font-size
:
72px
;
line-height
:
1
40
px
;
}
&
.s140
{
font-size
:
72px
;
line-height
:
1
38
px
;
}
&
.s160
{
font-size
:
96px
;
line-height
:
1
60
px
;
}
&
.s160
{
font-size
:
96px
;
line-height
:
1
58
px
;
}
}
}
app/assets/stylesheets/pages/dashboard.scss
View file @
87a5d712
...
@@ -36,10 +36,6 @@
...
@@ -36,10 +36,6 @@
.dash-project-avatar
{
.dash-project-avatar
{
float
:
left
;
float
:
left
;
.avatar
{
@include
border-radius
(
50%
);
}
}
}
.dash-project-access-icon
{
.dash-project-access-icon
{
...
...
app/views/groups/show.html.haml
View file @
87a5d712
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
.cover-block.groups-cover-block
.cover-block.groups-cover-block
%div
{
class:
container_class
}
%div
{
class:
container_class
}
=
image_tag
group_icon
(
@group
),
class:
"avatar group-avatar s70"
=
image_tag
group_icon
(
@group
),
class:
"avatar group-avatar s70
avatar-tile
"
.group-info
.group-info
.cover-title
.cover-title
%h1
%h1
...
...
app/views/projects/_home_panel.html.haml
View file @
87a5d712
-
empty_repo
=
@project
.
empty_repo?
-
empty_repo
=
@project
.
empty_repo?
.project-home-panel.text-center
{
class:
(
"empty-project"
if
empty_repo
)
}
.project-home-panel.text-center
{
class:
(
"empty-project"
if
empty_repo
)
}
%div
{
class:
container_class
}
%div
{
class:
container_class
}
=
project_icon
(
@project
,
alt:
@project
.
name
,
class:
'project-avatar avatar s70'
)
=
project_icon
(
@project
,
alt:
@project
.
name
,
class:
'project-avatar avatar s70
avatar-tile
'
)
%h1
.project-title
%h1
.project-title
=
@project
.
name
=
@project
.
name
%span
.visibility-icon.has-tooltip
{
data:
{
container:
'body'
},
title:
visibility_icon_description
(
@project
)}
%span
.visibility-icon.has-tooltip
{
data:
{
container:
'body'
},
title:
visibility_icon_description
(
@project
)}
...
...
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