Browse Source

Removed unused selectors from prepare layout function

Abdullah Almsaeed 10 years ago
parent
commit
3c0552ab73

+ 4 - 2
build/less/sidebar.less

@@ -33,8 +33,10 @@
 
 .sidebar {
   padding-bottom: 10px;
-  overflow: auto;
-  height: 100%;
+  .fixed & {
+    overflow: auto;
+    height: 100%;
+  }
 }
 // remove border from form
 .sidebar-form {

+ 4 - 1
build/less/skins/skin-blue.less

@@ -36,7 +36,7 @@
       }
     }
     //Logo
-    .logo {
+    .logo {      
       .logo-variant(darken(@light-blue, 5%));      
     }
     
@@ -132,4 +132,7 @@
       .border-radius(0, 2px, 0, 2px)!important;
     }
   }
+}
+.skin-blue.layout-top-nav .main-header > .logo {
+  .logo-variant(@light-blue);
 }

+ 2 - 0
dist/css/AdminLTE.css

@@ -434,6 +434,8 @@ a:focus {
 }
 .sidebar {
   padding-bottom: 10px;
+}
+.fixed .sidebar {
   overflow: auto;
   height: 100%;
 }

File diff suppressed because it is too large
+ 0 - 0
dist/css/AdminLTE.min.css


+ 11 - 0
dist/css/skins/_all-skins.css

@@ -138,6 +138,17 @@
   border-bottom-right-radius: 2px !important;
   border-bottom-left-radius: 0 !important;
 }
+.skin-blue.layout-top-nav .main-header > .logo {
+  background-color: #3c8dbc;
+  color: #ffffff;
+  border-bottom: 1px solid transparent;
+}
+.skin-blue.layout-top-nav .main-header > .logo > a {
+  color: #ffffff;
+}
+.skin-blue.layout-top-nav .main-header > .logo:hover {
+  background: #3b8ab8;
+}
 /*
  * Skin: Black
  * -----------

File diff suppressed because it is too large
+ 0 - 0
dist/css/skins/_all-skins.min.css


+ 11 - 0
dist/css/skins/skin-blue.css

@@ -138,3 +138,14 @@
   border-bottom-right-radius: 2px !important;
   border-bottom-left-radius: 0 !important;
 }
+.skin-blue.layout-top-nav .main-header > .logo {
+  background-color: #3c8dbc;
+  color: #ffffff;
+  border-bottom: 1px solid transparent;
+}
+.skin-blue.layout-top-nav .main-header > .logo > a {
+  color: #ffffff;
+}
+.skin-blue.layout-top-nav .main-header > .logo:hover {
+  background: #3b8ab8;
+}

File diff suppressed because it is too large
+ 0 - 0
dist/css/skins/skin-blue.min.css


+ 4 - 4
dist/js/app.js

@@ -46,7 +46,7 @@ $.AdminLTE.options = {
   //Activate sidebar push menu
   sidebarPushMenu: true,
   //Activate sidebar slimscroll if the fixed layout is set (requires SlimScroll Plugin)
-  sidebarSlimScroll: false,
+  sidebarSlimScroll: true,
   //BoxRefresh Plugin
   enableBoxRefresh: true,
   //Bootstrap.js tooltip
@@ -187,16 +187,16 @@ $.AdminLTE.layout = {
     //Get window height and the wrapper height
     var neg = $('.main-header').outerHeight() + $('.main-footer').outerHeight();
     var window_height = $(window).height();
-    var sidebar_height = $(".main-sidebar, .left-side").height();
+    var sidebar_height = $(".sidebar").height();
     //Set the min-height of the content and sidebar based on the
     //the height of the document.
     if ($("body").hasClass("fixed")) {
       $(".content-wrapper, .right-side").css('min-height', window_height - $('.main-footer').outerHeight());
     } else {
       if (window_height >= sidebar_height) {
-        $(".content-wrapper, .main-sidebar, .left-side, .right-side").css('min-height', window_height - neg);
+        $(".content-wrapper, .right-side").css('min-height', window_height - neg);
       } else {
-        $(".content-wrapper, .main-sidebar, .left-side, .right-side").css('min-height', sidebar_height);
+        $(".content-wrapper, .right-side").css('min-height', sidebar_height);
       }
     }
   },

File diff suppressed because it is too large
+ 0 - 0
dist/js/app.min.js


Some files were not shown because too many files changed in this diff