diff options
author | Phil Hughes <me@iamphill.com> | 2018-11-27 12:15:59 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-11-27 13:14:58 +0300 |
commit | 79ce045dc4726cadaefd860b2645c6696306b335 (patch) | |
tree | 1e1094bcde90606ce4e7bcb980eab286cf7a091f /app/assets/stylesheets/pages/diff.scss | |
parent | ea8f0f3bcc02e26f6dbb7f40b3575bbaac852328 (diff) |
Fixed UI bugs with sticky diff header
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54503
Diffstat (limited to 'app/assets/stylesheets/pages/diff.scss')
-rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 715af4aa4ba..5405f20a760 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -10,22 +10,32 @@ position: -webkit-sticky; position: sticky; top: 92px; + margin-left: -1px; + border-left: 1px solid $border-color; z-index: 102; + &.is-commit { + top: $header-height + 36px; + + .with-performance-bar & { + top: $header-height + 36px + $performance-bar-height; + } + } + &::before { content: ''; position: absolute; top: -1px; - left: -10px; + left: -11px; width: 10px; height: calc(100% + 1px); background: $white-light; - border-right: 1px solid $border-color; + pointer-events: none; } - } - .with-performance-bar & { - top: 127px; + .with-performance-bar & { + top: 127px; + } } a:hover { @@ -701,15 +711,14 @@ } @include media-breakpoint-up(sm) { - top: 24px; + position: -webkit-sticky; + position: sticky; + top: $header-height; background-color: $white-light; + z-index: 200; - &.diff-files-changed-merge-request { - position: sticky; - top: 90px; - z-index: 200; - margin: $gl-padding 0; - padding: 0; + .with-performance-bar & { + top: $header-height + $performance-bar-height; } &.is-stuck { @@ -734,14 +743,6 @@ } } -@include media-breakpoint-up(sm) { - .with-performance-bar { - .diff-files-changed.diff-files-changed-merge-request { - top: 76px + $performance-bar-height; - } - } -} - .diff-file-changes { max-width: 560px; width: 100%; |