Commit e3a9b2c9 authored by Phil Hughes's avatar Phil Hughes

Merge branch '10951-3-style-lint-projects_scss' into 'master'

Fixed `selector-max-compound-selectors` lint error

See merge request gitlab-org/gitlab-ee!14777
parents a694ba79 783d8001
...@@ -91,10 +91,6 @@ ...@@ -91,10 +91,6 @@
.user-avatar-link { .user-avatar-link {
color: $gl-text-color; color: $gl-text-color;
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-bold;
.avatar {
margin-right: $gl-padding-4;
}
} }
svg { svg {
...@@ -103,6 +99,7 @@ ...@@ -103,6 +99,7 @@
.avatar { .avatar {
float: none; float: none;
margin-right: $gl-padding-4;
} }
} }
...@@ -150,15 +147,6 @@ ...@@ -150,15 +147,6 @@
display: none; display: none;
} }
.template-option {
display: none;
background: $gray-light;
.avatar-container {
margin-left: 34px;
}
}
&.expanded { &.expanded {
.template-option { .template-option {
display: flex; display: flex;
...@@ -174,15 +162,22 @@ ...@@ -174,15 +162,22 @@
} }
} }
.template-option {
display: none;
background: $gray-light;
.avatar-container {
margin-left: 34px;
}
}
.template-input-group { .template-input-group {
.selected-icon { .avatar {
.avatar { width: 20px;
width: 20px; height: 20px;
height: 20px; line-height: 20px;
line-height: 20px; font-size: $gl-font-size;
font-size: $gl-font-size; margin-right: 0;
margin-right: 0;
}
} }
} }
} }
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