Skip to content
代码片段 群组 项目
提交 4a665e3f 编辑于 作者: Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
浏览文件

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
No related branches found
No related tags found
无相关合并请求
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
.sidebar-wrapper { .sidebar-wrapper {
position: fixed; position: fixed;
top: 0; top: 0;
bottom: 0;
overflow-y: scroll;
left: 0; left: 0;
height: 100%; height: 100%;
transition-duration: .3s; transition-duration: .3s;
...@@ -21,8 +23,9 @@ ...@@ -21,8 +23,9 @@
} }
.nav-sidebar { .nav-sidebar {
margin-top: 29 + $header-height;
margin-bottom: 50px;
transition-duration: .3s; transition-duration: .3s;
margin: 0;
list-style: none; list-style: none;
overflow: hidden; overflow: hidden;
...@@ -39,7 +42,7 @@ ...@@ -39,7 +42,7 @@
} }
a { a {
padding: 7px 15px; padding: 8px 15px;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
color: $gray; color: $gray;
...@@ -88,9 +91,6 @@ ...@@ -88,9 +91,6 @@
width: $sidebar_width; width: $sidebar_width;
.nav-sidebar { .nav-sidebar {
margin-top: 29px;
position: fixed;
top: $header-height;
width: $sidebar_width; width: $sidebar_width;
} }
...@@ -114,9 +114,6 @@ ...@@ -114,9 +114,6 @@
width: $sidebar_collapsed_width; width: $sidebar_collapsed_width;
.nav-sidebar { .nav-sidebar {
margin-top: 29px;
position: fixed;
top: $header-height;
width: $sidebar_collapsed_width; width: $sidebar_collapsed_width;
li a { li a {
...@@ -178,7 +175,7 @@ ...@@ -178,7 +175,7 @@
} }
.sidebar-user { .sidebar-user {
position: absolute; position: fixed;
bottom: 0; bottom: 0;
width: $sidebar_width; width: $sidebar_width;
padding: 10px; padding: 10px;
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
border-right: 1px solid $color-darker; border-right: 1px solid $color-darker;
.sidebar-user { .sidebar-user {
background: $color-darker;
color: $color-light; color: $color-light;
&:hover { &:hover {
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册