diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-05 15:14:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-05 15:14:09 +0000 |
| commit | d4e0452ed946ca0cf4dd0537675abeda7a4c0ffa (patch) | |
| tree | 1f719aa86ade289adefa247ba93a8f0f90528608 /app/assets/stylesheets/startup | |
| parent | cd17aa65132de074aab9ae50ab7bbf7f16428546 (diff) | |
| download | gitlab-ce-d4e0452ed946ca0cf4dd0537675abeda7a4c0ffa.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets/startup')
| -rw-r--r-- | app/assets/stylesheets/startup/startup-dark.scss | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/startup/startup-general.scss | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app/assets/stylesheets/startup/startup-dark.scss b/app/assets/stylesheets/startup/startup-dark.scss index c59a4820b79..de2a2ddcf32 100644 --- a/app/assets/stylesheets/startup/startup-dark.scss +++ b/app/assets/stylesheets/startup/startup-dark.scss @@ -1032,11 +1032,14 @@ kbd { } .nav-sidebar { position: fixed; - bottom: 0; + bottom: var(--system-footer-height); left: 0; z-index: 600; width: 256px; - top: var(--header-height, 48px); + top: calc( + var(--header-height, 48px) + + calc(var(--system-header-height) + var(--performance-bar-height)) + ); background-color: #1f1e24; border-right: 1px solid #e9e9e9; transform: translate3d(0, 0, 0); diff --git a/app/assets/stylesheets/startup/startup-general.scss b/app/assets/stylesheets/startup/startup-general.scss index 1771afc0150..e0a71a1c306 100644 --- a/app/assets/stylesheets/startup/startup-general.scss +++ b/app/assets/stylesheets/startup/startup-general.scss @@ -1032,11 +1032,14 @@ kbd { } .nav-sidebar { position: fixed; - bottom: 0; + bottom: var(--system-footer-height); left: 0; z-index: 600; width: 256px; - top: var(--header-height, 48px); + top: calc( + var(--header-height, 48px) + + calc(var(--system-header-height) + var(--performance-bar-height)) + ); background-color: #fbfafd; border-right: 1px solid #e9e9e9; transform: translate3d(0, 0, 0); |