diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-13 17:51:07 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-13 17:51:07 +0000 |
| commit | 4a665e3f5d98cc2dd4bc512f420c04128300081c (patch) | |
| tree | 2c6d74421aa0a7da8fa086f43ad943bda6778cbc | |
| parent | 4fdb3f69baf3acc74160201bc5621f032d7df3e6 (diff) | |
| parent | 24ecc9049f9359ef3f6a1f1259cbba1b9e2b1e0c (diff) | |
| download | gitlab-ce-4a665e3f5d98cc2dd4bc512f420c04128300081c.tar.gz | |
Merge branch 'scroll-sidebar' into 'master'
Scroll sidebar
On small screens content of sidebar does not fit. This merge request makes sidebar scrollable which makes it usable for tablets and small laptops.
This merge request has no screenshot because it brings no visual change. Its about action.
cc @darby @JobV
See merge request !972
| -rw-r--r-- | app/assets/stylesheets/generic/sidebar.scss | 15 | ||||
| -rw-r--r-- | app/assets/stylesheets/themes/gitlab-theme.scss | 1 |
2 files changed, 7 insertions, 9 deletions
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss index f3950cef6bc..4e9daa5ea34 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; @@ -39,7 +42,7 @@ } a { - padding: 7px 15px; + padding: 8px 15px; font-size: 13px; line-height: 18px; color: $gray; @@ -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 { |