pull/362/head
Dmitri Suvorov 10 years ago
parent c546ed7062
commit 6d1efe98c7

@ -11,7 +11,7 @@
//Bootstrap Variables & Mixins //Bootstrap Variables & Mixins
//The core bootstrap code have not been modified. These files //The core bootstrap code have not been modified. These files
//are included only for refrence. //are included only for reference.
@import "../bootstrap-less/mixins.less"; @import "../bootstrap-less/mixins.less";
@import "../bootstrap-less/variables.less"; @import "../bootstrap-less/variables.less";

@ -1,7 +1,7 @@
/* /*
* Component: Control sidebar. By deafult, this is the right sidebar. * Component: Control sidebar. By default, this is the right sidebar.
*/ */
//The sidebar's backhround control class //The sidebar's background control class
//This is a hack to make the background visible while scrolling //This is a hack to make the background visible while scrolling
.control-sidebar-bg { .control-sidebar-bg {
position: fixed; position: fixed;
@ -40,7 +40,7 @@
} }
} }
} }
//Open without silde over content //Open without slide over content
.control-sidebar-open { .control-sidebar-open {
.control-sidebar-bg, .control-sidebar-bg,
.control-sidebar { .control-sidebar {
@ -92,7 +92,7 @@
} }
} }
} }
//Remove resposiveness on small screens //Remove responsiveness on small screens
@media(max-width: @screen-sm) { @media(max-width: @screen-sm) {
display: table; display: table;
>li { >li {

@ -39,7 +39,7 @@ body {
} }
/* /*
* Content Wrapper - contins main content * Content Wrapper - contains the main content
* ```.right-side has been deprecated as of v2.0.0 in favor of .content-wrapper ``` * ```.right-side has been deprecated as of v2.0.0 in favor of .content-wrapper ```
*/ */
.content-wrapper, .content-wrapper,

@ -17,7 +17,7 @@
z-index: 840; z-index: 840;
} }
//Modify the sidbar to shrink instead of disappearing //Modify the sidebar to shrink instead of disappearing
.main-sidebar { .main-sidebar {
//Don't go away! Just shrink //Don't go away! Just shrink
.translate(0, 0); .translate(0, 0);
@ -76,7 +76,7 @@
} }
} }
//Make the sidebar links, menus, labels, badeges //Make the sidebar links, menus, labels, badges
//and angle icons disappear //and angle icons disappear
.main-sidebar .user-panel > .info, .main-sidebar .user-panel > .info,
.sidebar-form, .sidebar-form,
@ -88,7 +88,7 @@
} }
.main-header { .main-header {
//Lets make the logo also shrink and the mini logo to appear //Let's make the logo also shrink and the mini logo to appear
.logo { .logo {
width: 50px; width: 50px;
> .logo-mini { > .logo-mini {

@ -31,7 +31,7 @@
//Side bar and logo width //Side bar and logo width
@sidebar-width: 230px; @sidebar-width: 230px;
//Bosex layout maximum width //Boxed layout maximum width
@boxed-layout-max-width: 1024px; @boxed-layout-max-width: 1024px;
//When the logo should go to the top of the screen //When the logo should go to the top of the screen
@screen-header-collapse: @screen-xs-max; @screen-header-collapse: @screen-xs-max;

12
dist/js/app.js vendored

@ -279,7 +279,7 @@ function _init() {
//Enable slimscroll for fixed layout //Enable slimscroll for fixed layout
if ($.AdminLTE.options.sidebarSlimScroll) { if ($.AdminLTE.options.sidebarSlimScroll) {
if (typeof $.fn.slimScroll != 'undefined') { if (typeof $.fn.slimScroll != 'undefined') {
//Distroy if it exists //Destroy if it exists
$(".sidebar").slimScroll({destroy: true}).height("auto"); $(".sidebar").slimScroll({destroy: true}).height("auto");
//Add slimscroll //Add slimscroll
$(".sidebar").slimscroll({ $(".sidebar").slimscroll({
@ -460,7 +460,7 @@ function _init() {
if ($('body').hasClass('fixed')) { if ($('body').hasClass('fixed')) {
_this._fixForFixed(sidebar); _this._fixForFixed(sidebar);
} else { } else {
//If the content height is less the sidebar's height, force max height //If the content height is less than the sidebar's height, force max height
if ($('.content-wrapper, .right-side').height() < sidebar.height()) { if ($('.content-wrapper, .right-side').height() < sidebar.height()) {
_this._fixForContent(sidebar); _this._fixForContent(sidebar);
} }
@ -519,12 +519,12 @@ function _init() {
/* BoxWidget /* BoxWidget
* ========= * =========
* BoxWidget is plugin to handle collapsing and * BoxWidget is a plugin to handle collapsing and
* removing boxes from the screen. * removing boxes from the screen.
* *
* @type Object * @type Object
* @usage $.AdminLTE.boxWidget.activate() * @usage $.AdminLTE.boxWidget.activate()
* Set all of your option in the main $.AdminLTE.options object * Set all your options in the main $.AdminLTE.options object
*/ */
$.AdminLTE.boxWidget = { $.AdminLTE.boxWidget = {
selectors: $.AdminLTE.options.boxWidgetOptions.boxWidgetSelectors, selectors: $.AdminLTE.options.boxWidgetOptions.boxWidgetSelectors,
@ -586,7 +586,7 @@ function _init() {
/* /*
* BOX REFRESH BUTTON * BOX REFRESH BUTTON
* ------------------ * ------------------
* This is a custom plugin to use with the compenet BOX. It allows you to add * This is a custom plugin to use with the component BOX. It allows you to add
* a refresh button to the box. It converts the box's state to a loading state. * a refresh button to the box. It converts the box's state to a loading state.
* *
* @type plugin * @type plugin
@ -598,7 +598,7 @@ function _init() {
// Render options // Render options
var settings = $.extend({ var settings = $.extend({
//Refressh button selector //Refresh button selector
trigger: ".refresh-btn", trigger: ".refresh-btn",
//File source to be loaded (e.g: ajax/src.php) //File source to be loaded (e.g: ajax/src.php)
source: "", source: "",

Loading…
Cancel
Save