diff options
Diffstat (limited to 'app/assets/stylesheets/framework/diffs.scss')
-rw-r--r-- | app/assets/stylesheets/framework/diffs.scss | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss index 904d041fdc9..8d1fb5eb55f 100644 --- a/app/assets/stylesheets/framework/diffs.scss +++ b/app/assets/stylesheets/framework/diffs.scss @@ -34,19 +34,28 @@ @media (min-width: map-get($grid-breakpoints, md)) { // The `+11` is to ensure the file header border shows when scrolled - // the bottom of the compare-versions header and the top of the file header - $mr-file-header-top: calc(#{$header-height} + #{$mr-tabs-height}); + --initial-top: calc(#{$header-height} + #{$mr-tabs-height}); + --top: var(--initial-top); position: -webkit-sticky; position: sticky; - top: $mr-file-header-top; + top: var(--top); z-index: 120; + &.is-sidebar-moved { + --initial-top: calc(#{$header-height} + #{$mr-tabs-height + 28px}); + } + .with-system-header & { - top: calc(#{$mr-file-header-top} + #{$system-header-height}); + --top: calc(var(--initial-top) + #{$system-header-height}); } .with-system-header.with-performance-bar & { - top: calc(#{$mr-file-header-top} + #{$system-header-height} + #{$performance-bar-height}); + --top: calc(var(--initial-top) + #{$system-header-height} + #{$performance-bar-height}); + } + + .with-performance-bar & { + top: calc(var(--initial-top) + #{$performance-bar-height}); } &::before { @@ -60,10 +69,6 @@ pointer-events: none; } - .with-performance-bar & { - top: calc(#{$mr-file-header-top} + #{$performance-bar-height}); - } - &.is-commit { top: calc(#{$header-height} + #{$commit-stat-summary-height}); @@ -788,11 +793,13 @@ table.code { } .diff-comments-more-count, -.diff-notes-collapse { +.diff-notes-collapse, +.diff-codequality-collapse { @include avatar-counter(50%); } -.diff-notes-collapse { +.diff-notes-collapse, +.diff-codequality-collapse { border: 0; border-radius: 50%; padding: 0; @@ -977,7 +984,8 @@ table.code { position: relative; } - .diff-notes-collapse { + .diff-notes-collapse, + .diff-codequality-collapse { position: absolute; left: -12px; } @@ -1107,6 +1115,7 @@ table.code { } .diff-notes-collapse, + .diff-codequality-collapse, .note, .discussion-reply-holder { display: none; |