Skip to content
代码片段 群组 项目
未验证 提交 10861bef 编辑于 作者: Tristan Read's avatar Tristan Read 提交者: GitLab
浏览文件

Merge branch...

Merge branch '472683-use-semantic-tokens-in-app-assets-stylesheets-components-avatar-scss' into 'master' 

Resolve "Use semantic tokens in app/assets/stylesheets/components/avatar.scss"

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/159587



Merged-by: default avatarTristan Read <tread@gitlab.com>
Approved-by: default avatarDan MH <dmizzi-harris@gitlab.com>
Approved-by: default avatarTristan Read <tread@gitlab.com>
Reviewed-by: default avatarChad Lavimoniere <clavimoniere@gitlab.com>
Co-authored-by: default avatarChad Lavimoniere <clavimoniere@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -85,9 +85,9 @@ $avatar-sizes: ( ...@@ -85,9 +85,9 @@ $avatar-sizes: (
width: 40px; width: 40px;
height: 40px; height: 40px;
padding: 0; padding: 0;
background: $gray-10; background: var(--gl-background-color-subtle);
overflow: hidden; overflow: hidden;
box-shadow: inset 0 0 0 1px rgba($gray-950, $gl-avatar-border-opacity); box-shadow: inset 0 0 0 1px var(--gl-avatar-border-color-default);
&.avatar-inline { &.avatar-inline {
float: none; float: none;
...@@ -116,8 +116,8 @@ $avatar-sizes: ( ...@@ -116,8 +116,8 @@ $avatar-sizes: (
.identicon { .identicon {
text-align: center; text-align: center;
vertical-align: top; vertical-align: top;
color: $gray-900; color: var(--gl-text-color-strong);
background-color: $gray-50; background-color: var(--gl-avatar-fallback-background-color-neutral);
// Sizes // Sizes
@each $size, $size-config in $avatar-sizes { @each $size, $size-config in $avatar-sizes {
...@@ -208,7 +208,7 @@ $avatar-sizes: ( ...@@ -208,7 +208,7 @@ $avatar-sizes: (
&.user-popover-cannot-merge { &.user-popover-cannot-merge {
.popover-header { .popover-header {
background-color: $orange-50; background-color: var(--gl-feedback-warning-background-color);
} }
} }
} }
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册