github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

👽 升级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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/static/css/AdminLTE.css
View File

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

4
src/main/resources/static/css/AdminLTE.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
src/main/resources/static/css/alt/AdminLTE-without-plugins.css
View File

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

2
src/main/resources/static/css/alt/AdminLTE-without-plugins.min.css vendored
View File

File diff suppressed because one or more lines are too long

9
src/main/resources/static/js/adminlte.js
View File

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

4
src/main/resources/static/js/adminlte.min.js vendored
View File

File diff suppressed because one or more lines are too long