diff options
Diffstat (limited to 'app/assets/stylesheets/framework/sidebar.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index dd9581c4692..13201d43fd0 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -24,15 +24,11 @@ &:not(.wiki-sidebar):not(.build-sidebar):not(.issuable-bulk-update-sidebar) .content-wrapper { padding-right: $gutter-collapsed-width; } - - .merge-request-tabs-holder.affix { - right: $gutter-collapsed-width; - } } } &.is-merge-request { - @include media-breakpoint-up(md) { + @include media-breakpoint-up(lg) { .content-wrapper { padding-right: $gutter-collapsed-width; } @@ -60,7 +56,7 @@ z-index: $zindex-dropdown-menu; &.right-sidebar-merge-requests { - width: 270px; + width: 300px; @include media-breakpoint-up(md) { z-index: auto; @@ -77,17 +73,11 @@ } } - @include media-breakpoint-up(md) { - .content-wrapper { - padding-right: $gutter-width; - } - - &:not(.with-overlay) .merge-request-tabs-holder.affix { - right: $gutter-width; - } - - &.with-overlay .merge-request-tabs-holder.affix { - right: $gutter-collapsed-width; + &:not(.is-merge-request) { + @include media-breakpoint-up(md) { + .content-wrapper { + padding-right: $gutter-width; + } } } } @@ -96,7 +86,7 @@ border-left: 1px solid $gray-100; &.right-sidebar-merge-requests { - @include media-breakpoint-up(md) { + @include media-breakpoint-up(lg) { border-left: 0; } } @@ -110,10 +100,6 @@ } } -.with-performance-bar .right-sidebar.affix { - top: calc(#{$header-height} + #{$performance-bar-height}); -} - @mixin maintain-sidebar-dimensions { display: block; width: $gutter-width; @@ -284,6 +270,10 @@ .reviewer-grid { [data-css-area='attention'] { grid-area: attention; + + button.selected svg { + fill: $orange-500; + } } [data-css-area='user'] { |