Skip to content

G
gitlab-ce
Commit e3fa3f3a authored by Miguel Rincon's avatar Miguel Rincon
Browse files
Options

Merge branch 'psi-no-extend-avatar' into 'master' 

Remove unwanted SCSS extend from contextual sidebar

See merge request gitlab-org/gitlab!71021
parents 2b4bd317 3f6e7c39
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 45 deletions
app/assets/stylesheets/framework/contextual_sidebar.scss
View file @ e3fa3f3a
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
@include gl-border-none; @include gl-border-none;
.avatar.s32 { .avatar.s32 {
@extend .rect-avatar.s32; border-radius: $border-radius-default;
box-shadow: $avatar-box-shadow; box-shadow: $avatar-box-shadow;
} }
} }
......
app/assets/stylesheets/startup/startup-dark.scss
View file @ e3fa3f3a
...@@ -1284,6 +1284,7 @@ input { ...@@ -1284,6 +1284,7 @@ input {
a a
.avatar-container.rect-avatar .avatar-container.rect-avatar
.avatar.s32 { .avatar.s32 {
border-radius: 4px;
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08); box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08);
} }
.sidebar-top-level-items { .sidebar-top-level-items {
...@@ -1308,6 +1309,7 @@ input { ...@@ -1308,6 +1309,7 @@ input {
a a
.avatar-container.rect-avatar .avatar-container.rect-avatar
.avatar.s32 { .avatar.s32 {
border-radius: 4px;
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08); box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08);
} }
.sidebar-top-level-items > li .badge.badge-pill { .sidebar-top-level-items > li .badge.badge-pill {
...@@ -1605,17 +1607,7 @@ svg.s16 { ...@@ -1605,17 +1607,7 @@ svg.s16 {
.rect-avatar.s16 { .rect-avatar.s16 {
border-radius: 2px; border-radius: 2px;
} }
.rect-avatar.s32, .rect-avatar.s32 {
.nav-sidebar-inner-scroll
> div.context-header
a
.avatar-container.rect-avatar
.avatar.s32,
.sidebar-top-level-items
.context-header
a
.avatar-container.rect-avatar
.avatar.s32 {
border-radius: 4px; border-radius: 4px;
} }
body.gl-dark .navbar-gitlab { body.gl-dark .navbar-gitlab {
......
app/assets/stylesheets/startup/startup-general.scss
View file @ e3fa3f3a
...@@ -1264,6 +1264,7 @@ input { ...@@ -1264,6 +1264,7 @@ input {
a a
.avatar-container.rect-avatar .avatar-container.rect-avatar
.avatar.s32 { .avatar.s32 {
border-radius: 4px;
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08); box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08);
} }
.sidebar-top-level-items { .sidebar-top-level-items {
...@@ -1288,6 +1289,7 @@ input { ...@@ -1288,6 +1289,7 @@ input {
a a
.avatar-container.rect-avatar .avatar-container.rect-avatar
.avatar.s32 { .avatar.s32 {
border-radius: 4px;
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08); box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08);
} }
.sidebar-top-level-items > li .badge.badge-pill { .sidebar-top-level-items > li .badge.badge-pill {
...@@ -1585,17 +1587,7 @@ svg.s16 { ...@@ -1585,17 +1587,7 @@ svg.s16 {
.rect-avatar.s16 { .rect-avatar.s16 {
border-radius: 2px; border-radius: 2px;
} }
.rect-avatar.s32, .rect-avatar.s32 {
.nav-sidebar-inner-scroll
> div.context-header
a
.avatar-container.rect-avatar
.avatar.s32,
.sidebar-top-level-items
.context-header
a
.avatar-container.rect-avatar
.avatar.s32 {
border-radius: 4px; border-radius: 4px;
} }
......
ee/app/assets/stylesheets/startup/startup-dark.scss
View file @ e3fa3f3a
...@@ -1284,6 +1284,7 @@ input { ...@@ -1284,6 +1284,7 @@ input {
a a
.avatar-container.rect-avatar .avatar-container.rect-avatar
.avatar.s32 { .avatar.s32 {
border-radius: 4px;
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08); box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08);
} }
.sidebar-top-level-items { .sidebar-top-level-items {
...@@ -1308,6 +1309,7 @@ input { ...@@ -1308,6 +1309,7 @@ input {
a a
.avatar-container.rect-avatar .avatar-container.rect-avatar
.avatar.s32 { .avatar.s32 {
border-radius: 4px;
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08); box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08);
} }
.sidebar-top-level-items > li .badge.badge-pill { .sidebar-top-level-items > li .badge.badge-pill {
...@@ -1605,17 +1607,7 @@ svg.s16 { ...@@ -1605,17 +1607,7 @@ svg.s16 {
.rect-avatar.s16 { .rect-avatar.s16 {
border-radius: 2px; border-radius: 2px;
} }
.rect-avatar.s32, .rect-avatar.s32 {
.nav-sidebar-inner-scroll
> div.context-header
a
.avatar-container.rect-avatar
.avatar.s32,
.sidebar-top-level-items
.context-header
a
.avatar-container.rect-avatar
.avatar.s32 {
border-radius: 4px; border-radius: 4px;
} }
body.gl-dark .navbar-gitlab { body.gl-dark .navbar-gitlab {
......
ee/app/assets/stylesheets/startup/startup-general.scss
View file @ e3fa3f3a
...@@ -1264,6 +1264,7 @@ input { ...@@ -1264,6 +1264,7 @@ input {
a a
.avatar-container.rect-avatar .avatar-container.rect-avatar
.avatar.s32 { .avatar.s32 {
border-radius: 4px;
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08); box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08);
} }
.sidebar-top-level-items { .sidebar-top-level-items {
...@@ -1288,6 +1289,7 @@ input { ...@@ -1288,6 +1289,7 @@ input {
a a
.avatar-container.rect-avatar .avatar-container.rect-avatar
.avatar.s32 { .avatar.s32 {
border-radius: 4px;
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08); box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08);
} }
.sidebar-top-level-items > li .badge.badge-pill { .sidebar-top-level-items > li .badge.badge-pill {
...@@ -1585,17 +1587,7 @@ svg.s16 { ...@@ -1585,17 +1587,7 @@ svg.s16 {
.rect-avatar.s16 { .rect-avatar.s16 {
border-radius: 2px; border-radius: 2px;
} }
.rect-avatar.s32, .rect-avatar.s32 {
.nav-sidebar-inner-scroll
> div.context-header
a
.avatar-container.rect-avatar
.avatar.s32,
.sidebar-top-level-items
.context-header
a
.avatar-container.rect-avatar
.avatar.s32 {
border-radius: 4px; border-radius: 4px;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7