diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-06 09:14:59 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-06 09:59:39 -0700 |
| commit | c6d95b7bc8df0288ff09d0cd9ed352e677134af2 (patch) | |
| tree | cff77ebfb7c3ad7358fb3ac5dca31031cf654ad9 | |
| parent | 06270f52fcc9d1ade5f4b1bd9ac901194bfaebd4 (diff) | |
| download | gitlab-ce-fix-mr-tabs-position.tar.gz | |
Make sure fixed elements are visible with performance bar visiblefix-mr-tabs-position
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 12 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 8cbf0ec6180..a7acaf6c728 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -578,12 +578,12 @@ @media (min-width: $screen-sm-min) { position: -webkit-sticky; position: sticky; - top: 34px; + top: 24px; background-color: $white-light; z-index: 190; &.diff-files-changed-merge-request { - top: 84px; + top: 76px; } + .files, @@ -614,6 +614,14 @@ } } +@media (min-width: $screen-sm-min) { + .with-performance-bar { + .diff-files-changed.diff-files-changed-merge-request { + top: 76px + $performance-bar-height; + } + } +} + .diff-file-changes { width: 450px; z-index: 150; diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index bc3618e4745..439636fe026 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -675,7 +675,7 @@ } .with-performance-bar .merge-request-tabs-holder { - top: $header-height + $performance-bar-height; + top: $new-navbar-height + $performance-bar-height; } .merge-request-tabs { |