👽 升级AdminLte到v2.4.5

pull/33/merge
ruibaby 2018-07-30 23:26:27 +08:00
parent e26566bb50
commit 4e0326e2db
6 changed files with 17 additions and 16 deletions

View File

@ -1,5 +1,5 @@
/*!
* AdminLTE v2.4.2
* AdminLTE v2.4.5
* Author: Almsaeed Studio
* Website: Almsaeed Studio <https://adminlte.io>
* License: Open source - MIT
@ -46,7 +46,7 @@ body {
position: relative;
}
.layout-boxed {
background: url('../img/boxed-bg.jpg') repeat fixed;
background-color: #f9fafc;
}
/*
* Content Wrapper - contains the main content
@ -692,7 +692,7 @@ a:focus {
padding-top: 50px;
z-index: 1010;
}
@media (max-width: 768px) {
@media (max-width: 767px) {
.control-sidebar {
padding-top: 100px;
}

File diff suppressed because one or more lines are too long

View File

@ -46,7 +46,7 @@ body {
position: relative;
}
.layout-boxed {
background: url('../img/boxed-bg.jpg') repeat fixed;
background-color: #f9fafc;
}
/*
* Content Wrapper - contains the main content
@ -692,7 +692,7 @@ a:focus {
padding-top: 50px;
z-index: 1010;
}
@media (max-width: 768px) {
@media (max-width: 767px) {
.control-sidebar {
padding-top: 100px;
}

File diff suppressed because one or more lines are too long

View File

@ -7,7 +7,7 @@
* @Author Almsaeed Studio
* @Support <https://www.almsaeedstudio.com>
* @Email <abdullah@almsaeedstudio.com>
* @version 2.4.2
* @version 2.4.5
* @repository git://github.com/almasaeed2010/AdminLTE.git
* @license MIT <http://opensource.org/licenses/MIT>
*/
@ -601,8 +601,9 @@ throw new Error('AdminLTE requires jQuery')
$(Selector.layoutBoxed + ' > ' + Selector.wrapper).css('overflow', 'hidden');
// Get window height and the wrapper height
var footerHeight = $(Selector.mainFooter).outerHeight() || 0;
var neg = $(Selector.mainHeader).outerHeight() + footerHeight;
var footerHeight = $(Selector.mainFooter).outerHeight() || 0;
var headerHeight = $(Selector.mainHeader).outerHeight() || 0;
var neg = headerHeight + footerHeight;
var windowHeight = $(window).height();
var sidebarHeight = $(Selector.sidebar).height() || 0;
@ -1074,16 +1075,16 @@ throw new Error('AdminLTE requires jQuery')
Tree.prototype.collapse = function (tree, parentLi) {
var collapsedEvent = $.Event(Event.collapsed);
tree.find(Selector.open).removeClass(ClassName.open);
//tree.find(Selector.open).removeClass(ClassName.open);
parentLi.removeClass(ClassName.open);
tree.slideUp(this.options.animationSpeed, function () {
tree.find(Selector.open + ' > ' + Selector.treeview).slideUp();
//tree.find(Selector.open + ' > ' + Selector.treeview).slideUp();
$(this.element).trigger(collapsedEvent);
}.bind(this));
};
// Private
Tree.prototype._setUpListeners = function () {
var that = this;

File diff suppressed because one or more lines are too long