diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/assets/stylesheets/components/avatar.scss | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/assets/stylesheets/components/avatar.scss')
-rw-r--r-- | app/assets/stylesheets/components/avatar.scss | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/app/assets/stylesheets/components/avatar.scss b/app/assets/stylesheets/components/avatar.scss index 312123aeef9..6bb7e9d215e 100644 --- a/app/assets/stylesheets/components/avatar.scss +++ b/app/assets/stylesheets/components/avatar.scss @@ -70,7 +70,7 @@ $avatar-sizes: ( $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $identicon-blue, $identicon-teal, $identicon-orange, $gray-darker; -.avatar-circle { +%avatar-circle { float: left; margin-right: $gl-padding; border-radius: $avatar-radius; @@ -84,7 +84,7 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i } .avatar { - @extend .avatar-circle; + @extend %avatar-circle; transition-property: none; width: 40px; @@ -100,10 +100,7 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i margin-left: 2px; flex-shrink: 0; - &.s16 { - margin-right: 4px; - } - + &.s16, &.s24 { margin-right: 4px; } @@ -154,7 +151,7 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i } .avatar-container { - @extend .avatar-circle; + @extend %avatar-circle; overflow: hidden; display: flex; |