Skip to content

Commit 3043b46

Browse files
committed
refactor: improve avatar's styles
1 parent 5aa3b72 commit 3043b46

File tree

4 files changed

+26
-212
lines changed

4 files changed

+26
-212
lines changed

scss/_avatars.scss

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,44 @@
1-
.img-avatar {
2-
border-radius: 50em;
3-
}
4-
51
.avatar {
6-
$width: 36px;
7-
$status-width: 10px;
8-
@include avatar($width,$status-width);
2+
@include avatar($avatar-width,$avatar-status-width);
3+
4+
> img {
5+
@extend .img-avatar;
6+
vertical-align: initial;
7+
}
98
}
109

11-
.avatar.avatar-xs {
12-
$width: 20px;
13-
$status-width: 8px;
14-
@include avatar($width,$status-width);
10+
.avatar-lg {
11+
@include avatar($avatar-lg-width,$avatar-lg-status-width);
1512
}
1613

17-
.avatar.avatar-sm {
18-
$width: 24px;
19-
$status-width: 8px;
20-
@include avatar($width,$status-width);
14+
.avatar-sm {
15+
@include avatar($avatar-sm-width,$avatar-sm-status-width);
2116
}
2217

23-
.avatar.avatar-lg {
24-
$width: 72px;
25-
$status-width: 12px;
26-
@include avatar($width,$status-width);
18+
.avatar-xs {
19+
@include avatar($avatar-xs-width,$avatar-xs-status-width);
2720
}
2821

2922
.avatars-stack {
30-
.avatar.avatar-xs {
31-
margin-right: -10px;
32-
}
33-
34-
// .avatar.avatar-sm {
35-
//
36-
// }
3723

3824
.avatar {
39-
margin-right: -15px;
40-
transition: margin-left $layout-transition-speed, margin-right $layout-transition-speed;
25+
margin-right: - ($avatar-width / 2);
26+
transition: margin-right $layout-transition-speed;
4127

4228
&:hover {
4329
margin-right: 0;
4430
}
4531
}
4632

47-
// .avatar.avatar-lg {
48-
//
49-
// }
33+
.avatar-lg {
34+
margin-right: - ($avatar-lg-width / 2);
35+
}
5036

37+
.avatar-sm {
38+
margin-right: - ($avatar-sm-width / 2);
39+
}
40+
41+
.avatar-xs {
42+
margin-right: - ($avatar-xs-width / 2);
43+
}
5144
}

scss/_deprecated.scss

Lines changed: 0 additions & 175 deletions
This file was deleted.

scss/_mixins.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "mixins/avatar";
1+
@import "mixins/avatars";
22
@import "mixins/buttons";
33
@import "mixins/borders";
44
@import "mixins/card-accent";

scss/mixins/_avatar.scss renamed to scss/mixins/_avatars.scss

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
position: relative;
33
display: inline-block;
44
width: $width;
5-
6-
.img-avatar {
7-
width: $width;
8-
height: $width;
9-
}
5+
height: $width;
106

117
.avatar-status {
128
position: absolute;

0 commit comments

Comments
 (0)