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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
81852a37
Commit
81852a37
authored
May 24, 2019
by
Jacques Erasmus
Committed by
Kushal Pandya
May 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move avatar related styles to components directory
Moved all avatar related styles to the components directory
parent
83d80bc9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
38 deletions
+41
-38
app/assets/stylesheets/components/avatar.scss
app/assets/stylesheets/components/avatar.scss
+31
-37
app/assets/stylesheets/framework.scss
app/assets/stylesheets/framework.scss
+0
-1
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+9
-0
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
No files found.
app/assets/stylesheets/
framework
/avatar.scss
→
app/assets/stylesheets/
components
/avatar.scss
View file @
81852a37
@mixin
avatar-size
(
$size
,
$margin-right
)
{
width
:
$size
;
height
:
$size
;
margin-right
:
$margin-right
;
}
.avatar-circle
{
float
:
left
;
margin-right
:
15px
;
border-radius
:
$avatar-radius
;
border
:
1px
solid
$gray-normal
;
&
.s16
{
@include
avatar-size
(
16px
,
6
px
);
}
&
.s18
{
@include
avatar-size
(
18px
,
6
px
);
}
&
.s19
{
@include
avatar-size
(
19px
,
6
px
);
}
&
.s20
{
@include
avatar-size
(
20px
,
7
px
);
}
&
.s16
{
@include
avatar-size
(
16px
,
8
px
);
}
&
.s18
{
@include
avatar-size
(
18px
,
8
px
);
}
&
.s19
{
@include
avatar-size
(
19px
,
8
px
);
}
&
.s20
{
@include
avatar-size
(
20px
,
8
px
);
}
&
.s24
{
@include
avatar-size
(
24px
,
8px
);
}
&
.s26
{
@include
avatar-size
(
26px
,
8px
);
}
&
.s32
{
@include
avatar-size
(
32px
,
10px
);
}
&
.s36
{
@include
avatar-size
(
36px
,
10px
);
}
&
.s40
{
@include
avatar-size
(
40px
,
10px
);
}
&
.s46
{
@include
avatar-size
(
46px
,
15px
);
}
&
.s48
{
@include
avatar-size
(
48px
,
10px
);
}
&
.s60
{
@include
avatar-size
(
60px
,
12px
);
}
&
.s64
{
@include
avatar-size
(
64px
,
14px
);
}
&
.s70
{
@include
avatar-size
(
70px
,
14px
);
}
&
.s90
{
@include
avatar-size
(
90px
,
15px
);
}
&
.s100
{
@include
avatar-size
(
100px
,
15px
);
}
&
.s110
{
@include
avatar-size
(
110px
,
15px
);
}
&
.s140
{
@include
avatar-size
(
140px
,
15px
);
}
&
.s160
{
@include
avatar-size
(
160px
,
20px
);
}
&
.s32
{
@include
avatar-size
(
32px
,
8px
);
}
&
.s36
{
@include
avatar-size
(
36px
,
16px
);
}
&
.s40
{
@include
avatar-size
(
40px
,
16px
);
}
&
.s46
{
@include
avatar-size
(
46px
,
16px
);
}
&
.s48
{
@include
avatar-size
(
48px
,
16px
);
}
&
.s60
{
@include
avatar-size
(
60px
,
16px
);
}
&
.s64
{
@include
avatar-size
(
64px
,
16px
);
}
&
.s70
{
@include
avatar-size
(
70px
,
16px
);
}
&
.s90
{
@include
avatar-size
(
90px
,
16px
);
}
&
.s96
{
@include
avatar-size
(
96px
,
16px
);
}
&
.s100
{
@include
avatar-size
(
100px
,
16px
);
}
&
.s110
{
@include
avatar-size
(
110px
,
16px
);
}
&
.s140
{
@include
avatar-size
(
140px
,
16px
);
}
&
.s160
{
@include
avatar-size
(
160px
,
16px
);
}
}
.avatar
{
...
...
@@ -39,6 +34,7 @@
padding
:
0
;
background
:
$gray-lightest
;
overflow
:
hidden
;
border-color
:
rgba
(
$black
,
$gl-avatar-border-opacity
);
&
.avatar-inline
{
float
:
none
;
...
...
@@ -64,41 +60,37 @@
&
.avatar-placeholder
{
border
:
0
;
}
&
:not
([
href
])
:hover
{
border-color
:
darken
(
$gray-normal
,
10%
);
}
}
.identicon
{
text-align
:
center
;
vertical-align
:
top
;
color
:
$g
l-gray-7
00
;
color
:
$g
ray-8
00
;
background-color
:
$gray-darker
;
// Sizes
&
.s16
{
font-size
:
1
2
px
;
line-height
:
1
.33
;
}
&
.s16
{
font-size
:
1
0
px
;
line-height
:
1
6px
;
}
&
.s24
{
font-size
:
1
3
px
;
line-height
:
1
.8
;
}
&
.s24
{
font-size
:
1
2
px
;
line-height
:
24px
;
}
&
.s26
{
font-size
:
20px
;
line-height
:
1
.33
;
}
&
.s32
{
font-size
:
20
px
;
line-height
:
3
0
px
;
}
&
.s32
{
font-size
:
14
px
;
line-height
:
3
2
px
;
}
&
.s40
{
font-size
:
16px
;
line-height
:
38px
;
}
&
.s48
{
font-size
:
20px
;
line-height
:
4
6
px
;
}
line-height
:
4
8
px
;
}
&
.s60
{
font-size
:
32px
;
line-height
:
58px
;
}
&
.s64
{
font-size
:
32
px
;
&
.s64
{
font-size
:
28
px
;
line-height
:
64px
;
}
&
.s70
{
font-size
:
34px
;
...
...
@@ -107,6 +99,9 @@
&
.s90
{
font-size
:
36px
;
line-height
:
88px
;
}
&
.s96
{
font-size
:
48px
;
line-height
:
96px
;
}
&
.s100
{
font-size
:
36px
;
line-height
:
98px
;
}
...
...
@@ -144,7 +139,6 @@
.avatar
{
border-radius
:
0
;
border
:
0
;
height
:
auto
;
width
:
100%
;
margin
:
0
;
...
...
app/assets/stylesheets/framework.scss
View file @
81852a37
...
...
@@ -8,7 +8,6 @@
@import
'framework/animations'
;
@import
'framework/vue_transitions'
;
@import
'framework/avatar'
;
@import
'framework/asciidoctor'
;
@import
'framework/banner'
;
@import
'framework/blocks'
;
...
...
app/assets/stylesheets/framework/mixins.scss
View file @
81852a37
...
...
@@ -376,3 +376,12 @@
}
}
}
/*
* Mixin that handles the size and right margin of avatars.
*/
@mixin
avatar-size
(
$size
,
$margin-right
)
{
width
:
$size
;
height
:
$size
;
margin-right
:
$margin-right
;
}
app/assets/stylesheets/framework/variables.scss
View file @
81852a37
...
...
@@ -589,6 +589,7 @@ $issue-board-list-difference-md: $issue-board-list-difference-sm + $issue-boards
*/
$avatar-radius
:
50%
;
$gl-avatar-size
:
40px
;
$gl-avatar-border-opacity
:
0
.1
;
/*
* Blame
...
...
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