From ca3f11298008cf28a75407e5b7fbbfa5765da860 Mon Sep 17 00:00:00 2001 From: Abdullah Almsaeed Date: Fri, 27 Mar 2015 19:29:28 -0400 Subject: [PATCH] Updated build --- build/less/AdminLTE.less | 3 +- build/less/control-sidebar.less | 75 +++++++++++++++++++++++++++++++++ build/less/header.less | 1 - build/less/variables.less | 6 +++ 4 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 build/less/control-sidebar.less diff --git a/build/less/AdminLTE.less b/build/less/AdminLTE.less index 21f41fd8a..81f93de97 100644 --- a/build/less/AdminLTE.less +++ b/build/less/AdminLTE.less @@ -1,5 +1,5 @@ /*! - * AdminLTE v2.0.5 + * AdminLTE v2.1.0 * Author: Almsaeed Studio * Website: Almsaeed Studio * License: Open source - MIT @@ -26,6 +26,7 @@ @import "header.less"; @import "sidebar.less"; @import "sidebar-mini.less"; +@import "control-sidebar.less"; @import "dropdown.less"; @import "forms.less"; @import "progress-bars.less"; diff --git a/build/less/control-sidebar.less b/build/less/control-sidebar.less new file mode 100644 index 000000000..5ee1e97be --- /dev/null +++ b/build/less/control-sidebar.less @@ -0,0 +1,75 @@ +/* + * Component: Control sidebar. By deafult, this is the right sidebar. + */ +.control-sidebar { + position: absolute; + top: @navbar-height; + right: 0; + width: @control-sidebar-width; + z-index: 1010; + background: @sidebar-dark-bg; + color: @sidebar-dark-color; + //Make it hide in small screens + @media (max-width: @screen-sm) { + .translate(@control-sidebar-width, 0); + } + //Tab panes + > .tab-content { + padding: 10px 15px; + } +} +//Control sidebar tabs +.control-sidebar-tabs { + border-bottom: darken(@sidebar-dark-bg, 3%); + > li { + > a { + .border-radius(0)!important; + background: darken(@sidebar-dark-bg, 5%); + color: @sidebar-dark-color; + //Hover and active states + &, + &:hover { + border-right: none; + border-left: 1px solid darken(@sidebar-dark-bg, 7%)!important; + border-bottom: 1px solid darken(@sidebar-dark-bg, 7%)!important; + } + &:hover, + &:focus, + &:active { + border-top: none; + background: darken(@sidebar-dark-bg, 3%); + } + .icon { + font-size: 16px; + } + } + //Active state + &.active { + > a { + &, + &:hover, + &:focus, + &:active { + border-top: none!important; + border-right: none!important; + border-bottom: none!important; + background: @sidebar-dark-bg; + color: #fff; + } + } + } + } +} +//Headings in the sidebar content +.control-sidebar-heading { + color: #fff; +} + +.content-wrapper, +.right-side, +.main-footer { + margin-right: @control-sidebar-width; + @media (max-width: @screen-sm) { + margin-right: 0; + } +} \ No newline at end of file diff --git a/build/less/header.less b/build/less/header.less index 4c69aa0e2..28f341abd 100644 --- a/build/less/header.less +++ b/build/less/header.less @@ -42,7 +42,6 @@ //Navbar Right Menu .navbar-custom-menu, .navbar-right { - margin-right: 5px; float: right; @media (max-width: @screen-sm-max) { a { diff --git a/build/less/variables.less b/build/less/variables.less index c9a02707c..6589ff483 100644 --- a/build/less/variables.less +++ b/build/less/variables.less @@ -51,6 +51,12 @@ @sidebar-dark-submenu-color: lighten(@sidebar-dark-submenu-bg, 40%); @sidebar-dark-submenu-hover-color: #fff; + +//CONTROL SIDEBAR +//-------------------------------------------------------- +@control-sidebar-width: @sidebar-width; + + //BOXES //-------------------------------------------------------- @box-border-color: #f4f4f4;