github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

Updates

pull/387/head
Abdullah Almsaeed 2015-04-30 20:17:35 -04:00
parent c51c10f236
commit 01c0071459
5 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/less/control-sidebar.less
View File

@ -20,13 +20,14 @@
//The sidebar //The sidebar
.control-sidebar { .control-sidebar {
position: absolute; position: absolute;
top: @navbar-height; top: 0;
padding-top: @navbar-height;
right: 0; right: 0;
width: @control-sidebar-width; width: @control-sidebar-width;
z-index: 1010; z-index: 1010;
//Fix position after header collapse //Fix position after header collapse
@media (max-width: @screen-sm) { @media (max-width: @screen-sm) {
top: @navbar-height + 50; padding-top: @navbar-height + 50;
} }
//Tab panes //Tab panes
> .tab-content { > .tab-content {
@ -151,8 +152,9 @@
} }
//Dark skin //Dark skin
.control-sidebar-dark { .control-sidebar-dark {
color: @sidebar-dark-color; color: @sidebar-dark-color;
// Background // Background
&,
+ .control-sidebar-bg { + .control-sidebar-bg {
background: @sidebar-dark-bg; background: @sidebar-dark-bg;
} }
@ -212,8 +214,9 @@
} }
//Light skin //Light skin
.control-sidebar-light { .control-sidebar-light {
color: lighten(@sidebar-light-color, 10%); color: lighten(@sidebar-light-color, 10%);
// Background // Background
&,
+ .control-sidebar-bg { + .control-sidebar-bg {
background: @sidebar-light-bg; background: @sidebar-light-bg;
border-left: 1px solid @gray; border-left: 1px solid @gray;

4
build/less/core.less
View File

@ -24,7 +24,7 @@ body {
.clearfix(); .clearfix();
min-height: 100%; min-height: 100%;
position: static; position: static;
overflow: hidden; overflow: hidden!important;
.layout-boxed & { .layout-boxed & {
max-width: 1250px; max-width: 1250px;
margin: 0 auto; margin: 0 auto;
@ -50,7 +50,7 @@ body {
margin @transition-speed @transition-fn; margin @transition-speed @transition-fn;
.transition-transform(@transition-rule); .transition-transform(@transition-rule);
margin-left: @sidebar-width; margin-left: @sidebar-width;
z-index: 820; z-index: 820;
//Top nav layout //Top nav layout
.layout-top-nav & { .layout-top-nav & {
margin-left: 0; margin-left: 0;

9
dist/css/AdminLTE.css vendored
View File

@ -30,7 +30,7 @@ body {
.wrapper { .wrapper {
min-height: 100%; min-height: 100%;
position: static; position: static;
overflow: hidden; overflow: hidden!important;
} }
.wrapper:before, .wrapper:before,
.wrapper:after { .wrapper:after {
@ -687,14 +687,15 @@ a:focus {
} }
.control-sidebar { .control-sidebar {
position: absolute; position: absolute;
top: 50px; top: 0;
padding-top: 50px;
right: 0; right: 0;
width: 230px; width: 230px;
z-index: 1010; z-index: 1010;
} }
@media (max-width: 768px) { @media (max-width: 768px) {
.control-sidebar { .control-sidebar {
top: 100px; padding-top: 100px;
} }
} }
.control-sidebar > .tab-content { .control-sidebar > .tab-content {
@ -813,6 +814,7 @@ a:focus {
.control-sidebar-dark { .control-sidebar-dark {
color: #b8c7ce; color: #b8c7ce;
} }
.control-sidebar-dark,
.control-sidebar-dark + .control-sidebar-bg { .control-sidebar-dark + .control-sidebar-bg {
background: #222d32; background: #222d32;
} }
@ -853,6 +855,7 @@ a:focus {
.control-sidebar-light { .control-sidebar-light {
color: #5e5e5e; color: #5e5e5e;
} }
.control-sidebar-light,
.control-sidebar-light + .control-sidebar-bg { .control-sidebar-light + .control-sidebar-bg {
background: #f9fafc; background: #f9fafc;
border-left: 1px solid #d2d6de; border-left: 1px solid #d2d6de;

2
dist/css/AdminLTE.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
pages/layout/collapsed-sidebar.html
View File

@ -11,7 +11,7 @@
<!-- Ionicons --> <!-- Ionicons -->
<link href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css" rel="stylesheet" type="text/css" /> <link href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css" rel="stylesheet" type="text/css" />
<!-- Theme style --> <!-- Theme style -->
<link href="../../dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css" /> <link href="../../dist/css/AdminLTE.css" rel="stylesheet" type="text/css" />
<!-- AdminLTE Skins. Choose a skin from the css/skins <!-- AdminLTE Skins. Choose a skin from the css/skins
folder instead of downloading all of them to reduce the load. --> folder instead of downloading all of them to reduce the load. -->
<link href="../../dist/css/skins/_all-skins.min.css" rel="stylesheet" type="text/css" /> <link href="../../dist/css/skins/_all-skins.min.css" rel="stylesheet" type="text/css" />