diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-08 23:32:47 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-08 23:32:47 +0000 |
| commit | cc54b74a3cffc366ad67bd2c4d645f35d1b04e52 (patch) | |
| tree | defae19b3d1b3d4e1bc41b32e4696fc747139bc9 | |
| parent | 5d66e0e0e33d0a4c0627dda60008bf889dfa9137 (diff) | |
| parent | 1558876ac0c7e521dabfc2b1efe3418d34fe531f (diff) | |
| download | gitlab-ce-cc54b74a3cffc366ad67bd2c4d645f35d1b04e52.tar.gz | |
Merge branch 'nav-scroll-bug' into 'master'
Side nav scrolls if content height taller than screen
## What does this MR do?
Header logo is now fixed at top; put back scrolling functionality in side nav
## Screenshots (if relevant)
<img src="/uploads/e1d1b60c296c39c61d7fe7da22b6c52d/scroll.gif" width="600px">
See merge request !4513
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index a1202374a09..94985413746 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -38,6 +38,11 @@ .header-logo { height: $header-height; padding: 8px 26px; + width: $sidebar_width; + position: fixed; + z-index: 999; + overflow: hidden; + transition-duration: .3s; &:hover { background-color: #eee; @@ -73,7 +78,8 @@ .nav-sidebar { - margin: 22px 0; + margin-top: 22 + $header-height; + margin-bottom: 116px; transition-duration: .3s; list-style: none; overflow: hidden; @@ -166,6 +172,7 @@ .header-logo { width: 0; + padding: 8px 0; a { padding-left: ($sidebar_collapsed_width - 36) / 2; |