bump version

fixed content-wrapper height calculation if footer isn't there
2019-07-16 14:48:50 +02:00 · 2019-07-16 14:45:30 +02:00
10 changed files with 14 additions and 14 deletions
--- a/build/js/Layout.js
+++ b/build/js/Layout.js
@@ -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.
--- a/build/less/AdminLTE-without-plugins.less
+++ b/build/less/AdminLTE-without-plugins.less
@@ -1,5 +1,5 @@
 /*!
- * AdminLTE v2.4.13
+ * AdminLTE v2.4.14
 * Without Third-Party Plugins
 * 
 *   Author:  Colorlib
--- a/build/less/AdminLTE.less
+++ b/build/less/AdminLTE.less
@@ -1,5 +1,5 @@
 /*!
- * AdminLTE v2.4.13
+ * AdminLTE v2.4.14
 * 
 *   Author:  Colorlib
 *   Support: <https://github.com/ColorlibHQ/AdminLTE/issues>
--- a/dist/css/AdminLTE.css
+++ b/dist/css/AdminLTE.css
@@ -1,5 +1,5 @@
 /*!
- * AdminLTE v2.4.13
+ * AdminLTE v2.4.14
 * 
 *   Author:  Colorlib
 *   Support: <https://github.com/ColorlibHQ/AdminLTE/issues>
--- a/dist/css/AdminLTE.min.css
+++ b/dist/css/AdminLTE.min.css
@@ -1,5 +1,5 @@
 /*!
- * AdminLTE v2.4.13
+ * AdminLTE v2.4.14
 * 
 *   Author:  Colorlib
 *   Support: <https://github.com/ColorlibHQ/AdminLTE/issues>
--- a/dist/css/alt/AdminLTE-without-plugins.css
+++ b/dist/css/alt/AdminLTE-without-plugins.css
@@ -1,5 +1,5 @@
 /*!
- * AdminLTE v2.4.13
+ * AdminLTE v2.4.14
 * Without Third-Party Plugins
 * 
 *   Author:  Colorlib
--- a/dist/css/alt/AdminLTE-without-plugins.min.css
+++ b/dist/css/alt/AdminLTE-without-plugins.min.css
@@ -1,5 +1,5 @@
 /*!
- * AdminLTE v2.4.13
+ * AdminLTE v2.4.14
 * Without Third-Party Plugins
 * 
 *   Author:  Colorlib
--- a/dist/js/adminlte.js
+++ b/dist/js/adminlte.js
@@ -6,7 +6,7 @@
 *
 * @author Colorlib
 * @support <https://github.com/ColorlibHQ/AdminLTE/issues>
-* @version 2.4.13
+* @version 2.4.14
 * @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.
--- a/dist/js/adminlte.min.js
+++ b/dist/js/adminlte.min.js
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "admin-lte",
-  "version": "2.4.13",
+  "version": "2.4.14",
  "main": "dist/js/adminlte.min.js",
  "repository": {
    "type": "git",
Author	SHA1	Message	Date
REJack	c3dc529221	bump version	2019-07-16 14:48:50 +02:00
REJack	d61cbbd627	fixed content-wrapper height calculation if footer isn't there	2019-07-16 14:45:30 +02:00