diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-06-07 12:37:44 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-06-07 12:37:44 -0500 |
| commit | 1558876ac0c7e521dabfc2b1efe3418d34fe531f (patch) | |
| tree | 2edb3386783f90bd70e7f1c161aee431f60998c8 | |
| parent | 7d315aecfbd807bcdb9131151e86e37c90603f70 (diff) | |
| download | gitlab-ce-1558876ac0c7e521dabfc2b1efe3418d34fe531f.tar.gz | |
Side nav scrolls if content height taller than screennav-scroll-bug
| -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 46d46368d25..83d64679686 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; @@ -167,6 +173,7 @@ .header-logo { width: 0; + padding: 8px 0; a { padding-left: ($sidebar_collapsed_width - 36) / 2; |