Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
78d0c11374 | ||
|
|
7a2364e507 | ||
|
|
c3dc529221 | ||
|
|
d61cbbd627 |
@@ -31,7 +31,7 @@
|
||||
"documentation"
|
||||
],
|
||||
"dependencies": {
|
||||
"bootstrap-slider": "@dev",
|
||||
"bootstrap-slider": "879a98d",
|
||||
"chart.js": "1.0.*",
|
||||
"ckeditor": "^4.7.0",
|
||||
"bootstrap-colorpicker": "^2.5.1",
|
||||
|
||||
@@ -86,11 +86,11 @@
|
||||
$(Selector.layoutBoxed + ' > ' + Selector.wrapper).css('overflow', 'hidden');
|
||||
|
||||
// Get window height and the wrapper height
|
||||
var footerHeight = $(Selector.mainFooter).outerHeight() || 0;
|
||||
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;
|
||||
var sidebarHeight = $(Selector.sidebar).outerHeight() || 0;
|
||||
|
||||
// Set the min-height of the content and sidebar based on
|
||||
// the height of the document.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*!
|
||||
* AdminLTE v2.4.13
|
||||
* AdminLTE v2.4.15
|
||||
* Without Third-Party Plugins
|
||||
*
|
||||
* Author: Colorlib
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*!
|
||||
* AdminLTE v2.4.13
|
||||
* AdminLTE v2.4.15
|
||||
*
|
||||
* Author: Colorlib
|
||||
* Support: <https://github.com/ColorlibHQ/AdminLTE/issues>
|
||||
|
||||
2
dist/css/AdminLTE.css
vendored
2
dist/css/AdminLTE.css
vendored
@@ -1,5 +1,5 @@
|
||||
/*!
|
||||
* AdminLTE v2.4.13
|
||||
* AdminLTE v2.4.15
|
||||
*
|
||||
* Author: Colorlib
|
||||
* Support: <https://github.com/ColorlibHQ/AdminLTE/issues>
|
||||
|
||||
2
dist/css/AdminLTE.min.css
vendored
2
dist/css/AdminLTE.min.css
vendored
@@ -1,5 +1,5 @@
|
||||
/*!
|
||||
* AdminLTE v2.4.13
|
||||
* AdminLTE v2.4.15
|
||||
*
|
||||
* Author: Colorlib
|
||||
* Support: <https://github.com/ColorlibHQ/AdminLTE/issues>
|
||||
|
||||
2
dist/css/alt/AdminLTE-without-plugins.css
vendored
2
dist/css/alt/AdminLTE-without-plugins.css
vendored
@@ -1,5 +1,5 @@
|
||||
/*!
|
||||
* AdminLTE v2.4.13
|
||||
* AdminLTE v2.4.15
|
||||
* Without Third-Party Plugins
|
||||
*
|
||||
* Author: Colorlib
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*!
|
||||
* AdminLTE v2.4.13
|
||||
* AdminLTE v2.4.15
|
||||
* Without Third-Party Plugins
|
||||
*
|
||||
* Author: Colorlib
|
||||
|
||||
6
dist/js/adminlte.js
vendored
6
dist/js/adminlte.js
vendored
@@ -6,7 +6,7 @@
|
||||
*
|
||||
* @author Colorlib
|
||||
* @support <https://github.com/ColorlibHQ/AdminLTE/issues>
|
||||
* @version 2.4.13
|
||||
* @version 2.4.15
|
||||
* @repository git://github.com/ColorlibHQ/AdminLTE.git
|
||||
* @license MIT <http://opensource.org/licenses/MIT>
|
||||
*/
|
||||
@@ -1053,11 +1053,11 @@ 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 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;
|
||||
var sidebarHeight = $(Selector.sidebar).outerHeight() || 0;
|
||||
|
||||
// Set the min-height of the content and sidebar based on
|
||||
// the height of the document.
|
||||
|
||||
4
dist/js/adminlte.min.js
vendored
4
dist/js/adminlte.min.js
vendored
File diff suppressed because one or more lines are too long
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "admin-lte",
|
||||
"version": "2.4.13",
|
||||
"version": "2.4.15",
|
||||
"main": "dist/js/adminlte.min.js",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
||||
Reference in New Issue
Block a user