diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-13 19:23:15 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-13 19:23:15 +0200 |
| commit | a839b2afc40d09d1867fea4ff8cd00b0a4d88f9e (patch) | |
| tree | e1350cbc3ae9ea89c20b2463b4f18e4a85aa485a /app/assets | |
| parent | 4f0455c96bc918040de25e03f1a0ff39d9517dc6 (diff) | |
| download | gitlab-ce-a839b2afc40d09d1867fea4ff8cd00b0a4d88f9e.tar.gz | |
Make sidebar scrollable. It prevents content overflow for small screens
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/generic/sidebar.scss | 13 | ||||
| -rw-r--r-- | app/assets/stylesheets/themes/gitlab-theme.scss | 1 |
2 files changed, 6 insertions, 8 deletions
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss index f3950cef6bc..116428fbdbe 100644 --- a/app/assets/stylesheets/generic/sidebar.scss +++ b/app/assets/stylesheets/generic/sidebar.scss @@ -2,6 +2,8 @@ .sidebar-wrapper { position: fixed; top: 0; + bottom: 0; + overflow-y: scroll; left: 0; height: 100%; transition-duration: .3s; @@ -21,8 +23,9 @@ } .nav-sidebar { + margin-top: 29 + $header-height; + margin-bottom: 50px; transition-duration: .3s; - margin: 0; list-style: none; overflow: hidden; @@ -88,9 +91,6 @@ width: $sidebar_width; .nav-sidebar { - margin-top: 29px; - position: fixed; - top: $header-height; width: $sidebar_width; } @@ -114,9 +114,6 @@ width: $sidebar_collapsed_width; .nav-sidebar { - margin-top: 29px; - position: fixed; - top: $header-height; width: $sidebar_collapsed_width; li a { @@ -178,7 +175,7 @@ } .sidebar-user { - position: absolute; + position: fixed; bottom: 0; width: $sidebar_width; padding: 10px; diff --git a/app/assets/stylesheets/themes/gitlab-theme.scss b/app/assets/stylesheets/themes/gitlab-theme.scss index dc47b108100..e5325bbdc74 100644 --- a/app/assets/stylesheets/themes/gitlab-theme.scss +++ b/app/assets/stylesheets/themes/gitlab-theme.scss @@ -38,6 +38,7 @@ border-right: 1px solid $color-darker; .sidebar-user { + background: $color-darker; color: $color-light; &:hover { |