Updates to control sidebar

This commit is contained in:
Abdullah Almsaeed
2015-03-28 20:39:26 -04:00
parent 4dacac85ec
commit 5e888faa31
23 changed files with 622 additions and 443 deletions

View File

@@ -23,9 +23,20 @@
//Open state
&.control-sidebar-open {
.translate(0, 0);
.box-shadow(-1px 0 3px rgba(0,0,0,.2));
}
}
//Open without silde over content
.control-sidebar-open {
.control-sidebar {
.translate(0,0);
}
.content-wrapper,
.right-side,
.main-footer {
margin-right: @control-sidebar-width;
}
}
//Control sidebar tabs
.control-sidebar-tabs {
border-bottom: darken(@sidebar-dark-bg, 3%);
@@ -37,6 +48,7 @@
//Hover and active states
&,
&:hover {
border-top: none;
border-right: none;
border-left: 1px solid darken(@sidebar-dark-bg, 7%)!important;
border-bottom: 1px solid darken(@sidebar-dark-bg, 7%)!important;
@@ -44,7 +56,6 @@
&:hover,
&:focus,
&:active {
border-top: none;
background: darken(@sidebar-dark-bg, 3%);
}
.icon {
@@ -83,10 +94,50 @@
padding: 10px 0;
margin-bottom: 10px;
}
//Subheadings
.control-sidebar-subheading {
display: block;
color: #fff;
font-weight: 400;
font-size: 14px;
}
//Control Sidebar Menu
.control-sidebar-menu {
list-style: none;
padding: 0;
margin: 0 -15px;
> li > a {
.clearfix();
display: block;
padding: 10px 15px;
&:hover {
background: @sidebar-dark-hover-bg;
}
> .control-sidebar-subheading {
margin-top: 0;
}
}
.menu-icon {
float: left;
width: 35px;
height: 35px;
border-radius: 50%;
text-align: center;
line-height: 35px;
}
.menu-info {
margin-left: 45px;
margin-top: 3px;
> .control-sidebar-subheading {
margin: 0;
}
> p {
margin: 0;
color: @sidebar-dark-color;
font-size: 11px;
}
}
.progress {
margin: 0;
}
}

View File

@@ -47,7 +47,7 @@ body {
.main-footer {
//Using disposable variable to join statements with a comma
@transition-rule: @transition-speed @transition-fn,
margin-left @transition-speed @transition-fn;
margin @transition-speed @transition-fn;
.transition-transform(@transition-rule);
margin-left: @sidebar-width;
z-index: 820;

View File

@@ -109,7 +109,7 @@
.transition(width @transition-speed @transition-fn);
display: block;
float: left;
height: 50px;
height: @navbar-height;
font-size: 20px;
line-height: 50px;
text-align: center;

View File

@@ -112,4 +112,4 @@
//Transition global options
@transition-speed: .3s;
@transition-fn: cubic-bezier(0.32,1.25,0.375,1.15);
@transition-fn: ease-in-out;//cubic-bezier(0.32,1.25,0.375,1.15);