Skip to content
代码片段 群组 项目
未验证 提交 bc018fcd 编辑于 作者: Scott de Jonge's avatar Scott de Jonge 提交者: GitLab
浏览文件

Merge branch 'sdejonge-right-sidebar-design-tokens' into 'master'

Use design token utility classes for right-sidebar

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



Merged-by: default avatarScott de Jonge <sdejonge@gitlab.com>
Approved-by: default avatarSimon Knox <simon@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
} }
.right-sidebar { .right-sidebar {
border-left: 1px solid $border-color; @apply gl-border-l;
&.right-sidebar-merge-requests { &.right-sidebar-merge-requests {
@include media-breakpoint-up(lg) { @include media-breakpoint-up(lg) {
...@@ -320,7 +320,7 @@ ...@@ -320,7 +320,7 @@
position: fixed; position: fixed;
bottom: calc(#{$calc-application-footer-height} + var(--mr-review-bar-height)); bottom: calc(#{$calc-application-footer-height} + var(--mr-review-bar-height));
right: 0; right: 0;
background-color: $white; @apply gl-bg-default;
z-index: 200; z-index: 200;
overflow: hidden; overflow: hidden;
@apply gl-transition-width; @apply gl-transition-width;
......
...@@ -64,10 +64,6 @@ ...@@ -64,10 +64,6 @@
border-color: $gray-800; border-color: $gray-800;
} }
aside.right-sidebar:not(.right-sidebar-merge-requests) {
background-color: $gray-10;
}
:root.gl-dark { :root.gl-dark {
.terms { .terms {
.logo-text { .logo-text {
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册