Commit 3b7f86f9 authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch...

Merge branch '27732-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-framework-avatar' into 'master'

Fix stylelint warnings on app/assets/stylesheets/components/avatar.scss

Closes #27732

See merge request gitlab-org/gitlab!33572
parents add59c76 cc2a0f27
...@@ -70,7 +70,7 @@ $avatar-sizes: ( ...@@ -70,7 +70,7 @@ $avatar-sizes: (
$identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $identicon-blue, $identicon-teal, $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $identicon-blue, $identicon-teal,
$identicon-orange, $gray-darker; $identicon-orange, $gray-darker;
.avatar-circle { %avatar-circle {
float: left; float: left;
margin-right: $gl-padding; margin-right: $gl-padding;
border-radius: $avatar-radius; border-radius: $avatar-radius;
...@@ -84,7 +84,7 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i ...@@ -84,7 +84,7 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i
} }
.avatar { .avatar {
@extend .avatar-circle; @extend %avatar-circle;
transition-property: none; transition-property: none;
width: 40px; width: 40px;
...@@ -100,10 +100,7 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i ...@@ -100,10 +100,7 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i
margin-left: 2px; margin-left: 2px;
flex-shrink: 0; flex-shrink: 0;
&.s16 { &.s16,
margin-right: 4px;
}
&.s24 { &.s24 {
margin-right: 4px; margin-right: 4px;
} }
...@@ -154,7 +151,7 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i ...@@ -154,7 +151,7 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i
} }
.avatar-container { .avatar-container {
@extend .avatar-circle; @extend %avatar-circle;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
......
...@@ -93,7 +93,6 @@ ...@@ -93,7 +93,6 @@
} }
.dropdown-menu-toggle, .dropdown-menu-toggle,
.avatar-circle,
.header-user-avatar { .header-user-avatar {
@include transition(border-color); @include transition(border-color);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment