Commit 28830c0d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'sidebar-animation' into 'master'

Have sidebar labels disappear behind content instead of hide immediately when collapsing.

I'm not sure how to make a gif out of it, but I promise it looks pretty :)

See merge request !888
parents 9c022973 7b804e23
...@@ -69,6 +69,7 @@ header { ...@@ -69,6 +69,7 @@ header {
float: left; float: left;
height: $header-height; height: $header-height;
width: $sidebar_width; width: $sidebar_width;
overflow: hidden;
transition-duration: .3s; transition-duration: .3s;
a { a {
...@@ -169,10 +170,6 @@ header { ...@@ -169,10 +170,6 @@ header {
@mixin collapsed-header { @mixin collapsed-header {
.header-logo { .header-logo {
width: $sidebar_collapsed_width; width: $sidebar_collapsed_width;
h3 {
display: none;
}
} }
.header-content { .header-content {
......
...@@ -29,42 +29,44 @@ ...@@ -29,42 +29,44 @@
&.navbar-collapse { &.navbar-collapse {
padding: 0px !important; padding: 0px !important;
} }
}
.nav-sidebar li a .count {
float: right;
background: #eee;
padding: 0px 8px;
@include border-radius(6px);
}
.nav-sidebar li { li {
&.separate-item { width: $sidebar_width;
padding-top: 10px;
margin-top: 10px;
}
a {
color: $gray;
display: block;
text-decoration: none;
padding: 8px 15px;
font-size: 14px;
line-height: 20px;
padding-left: 16px;
&:hover { &.separate-item {
text-decoration: none; padding-top: 10px;
margin-top: 10px;
} }
&:active, &:focus { a {
color: $gray;
display: block;
text-decoration: none; text-decoration: none;
} padding: 8px 15px;
font-size: 14px;
line-height: 20px;
padding-left: 16px;
&:hover {
text-decoration: none;
}
i { &:active, &:focus {
width: 20px; text-decoration: none;
color: $gray-light; }
margin-right: 23px;
i {
width: 20px;
color: $gray-light;
margin-right: 23px;
}
.count {
float: right;
background: #eee;
padding: 0px 8px;
@include border-radius(6px);
}
} }
} }
} }
...@@ -116,11 +118,6 @@ ...@@ -116,11 +118,6 @@
padding: 8px 15px; padding: 8px 15px;
text-align: left; text-align: left;
padding-left: 16px; padding-left: 16px;
& > span {
display: none;
}
} }
} }
...@@ -130,9 +127,7 @@ ...@@ -130,9 +127,7 @@
} }
.sidebar-user { .sidebar-user {
.username { width: $sidebar_collapsed_width;
display: none;
}
} }
} }
} }
...@@ -182,12 +177,13 @@ ...@@ -182,12 +177,13 @@
.sidebar-user { .sidebar-user {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: $sidebar_width;
padding: 10px; padding: 10px;
overflow: hidden; overflow: hidden;
transition-duration: .3s;
.username { .username {
margin-top: 5px; margin-top: 5px;
width: 230px; width: $sidebar_width - 2 * 10px;
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment