bump version

added height auto to .login-page & .register-page
bump version to v2.4.12-pre
2019-06-11 13:52:23 +02:00 · 2019-06-11 12:14:18 +02:00 · 2019-06-11 12:13:34 +02:00 · 2019-06-11 11:59:05 +02:00 · 2019-06-11 11:53:48 +02:00 · 2019-06-06 13:50:39 +02:00
29 changed files with 333 additions and 280 deletions
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -132,9 +132,8 @@ module.exports = function (grunt) { // jshint ignore:line
        + '* should be included in all pages. It controls some layout\n'
        + '* options and implements exclusive AdminLTE plugins.\n'
        + '*\n'
-        + '* @Author  Almsaeed Studio\n'
-        + '* @Support <https://www.almsaeedstudio.com>\n'
-        + '* @Email   <abdullah@almsaeedstudio.com>\n'
+        + '* @author Colorlib\n'
+        + '* @support <https://github.com/ColorlibHQ/AdminLTE/issues>\n'
        + '* @version <%= pkg.version %>\n'
        + '* @repository <%= pkg.repository.url %>\n'
        + '* @license MIT <http://opensource.org/licenses/MIT>\n'
@@ -150,10 +149,10 @@ module.exports = function (grunt) { // jshint ignore:line
          'build/js/BoxWidget.js',
          'build/js/ControlSidebar.js',
          'build/js/DirectChat.js',
-          'build/js/Layout.js',
          'build/js/PushMenu.js',
          'build/js/TodoList.js',
-          'build/js/Tree.js'
+          'build/js/Tree.js',
+          'build/js/Layout.js',
        ],
        dest: 'dist/js/adminlte.js'
      }
--- a/README.md
+++ b/README.md
@@ -39,10 +39,10 @@ AdminLTE is an open source project by [AdminLTE.IO](https://adminlte.io) that is
 reserves the right to change the license of future releases. Wondering what you can or can't do? View the [license guide](https://adminlte.io/docs/license).

 ### Legacy Releases
-AdminLTE 1.x can be easily upgraded to 2.x using [this guide](https://adminlte.io/themes/AdminLTE/documentation/index.html#upgrade), but if you intend to keep using AdminLTE 1.x, you can download the latest release from the [releases](https://github.com/almasaeed2010/AdminLTE/releases) section above.
+AdminLTE 1.x can be easily upgraded to 2.x using [this guide](https://adminlte.io/themes/AdminLTE/documentation/index.html#upgrade), but if you intend to keep using AdminLTE 1.x, you can download the latest release from the [releases](https://github.com/ColorlibHQ/AdminLTE/releases) section above.

 ### Change log
-**For the most recent change log, visit the [releases page](https://github.com/almasaeed2010/AdminLTE/releases) or the [changelog file](https://github.com/almasaeed2010/AdminLTE/blob/master/changelog.md).** We will add detailed release notes to each new release. 
+**For the most recent change log, visit the [releases page](https://github.com/ColorlibHQ/AdminLTE/releases) or the [changelog file](https://github.com/ColorlibHQ/AdminLTE/blob/master/changelog.md).** We will add detailed release notes to each new release. 

 ### Image Credits
 - [Pixeden](http://www.pixeden.com/psd-web-elements/flat-responsive-showcase-psd)
@@ -50,8 +50,3 @@ AdminLTE 1.x can be easily upgraded to 2.x using [this guide](https://adminlte.i
 - [Pickaface](http://pickaface.net/)
 - [Unsplash](https://unsplash.com/)
 - [Uifaces](http://uifaces.com/)
-
-### Donations
-Donations are **greatly appreciated!**
-
-[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif "AdminLTE Presentation")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=629XCUSXBHCBC "Donate")
--- a/build/js/BoxWidget.js
+++ b/build/js/BoxWidget.js
@@ -101,7 +101,7 @@
        $(this.element).addClass(ClassName.collapsed);
        $(this.element).trigger(collapsedEvent);
      }.bind(this))
-      .trigger(expandingEvent);
+      .trigger(collapsingEvent);
  };

  BoxWidget.prototype.remove = function () {
--- a/build/js/ControlSidebar.js
+++ b/build/js/ControlSidebar.js
@@ -71,17 +71,20 @@
  };

  ControlSidebar.prototype.expand = function () {
+    $(Selector.sidebar).show();
    if (!this.options.slide) {
      $('body').addClass(ClassName.open);
    } else {
      $(Selector.sidebar).addClass(ClassName.open);
    }

+
    $(this.element).trigger($.Event(Event.expanded));
  };

  ControlSidebar.prototype.collapse = function () {
    $('body, ' + Selector.sidebar).removeClass(ClassName.open);
+    $(Selector.sidebar).fadeOut();
    $(this.element).trigger($.Event(Event.collapsed));
  };

--- a/build/less/AdminLTE-without-plugins.less
+++ b/build/less/AdminLTE-without-plugins.less
@@ -1,10 +1,13 @@
 /*!
- *   AdminLTE v2.4.0 Without Third-Party Plugins
- *   Author: Almsaeed Studio
- *	 Website: Almsaeed Studio <https://adminlte.io>
- *   License: Open source - MIT
- *           Please visit http://opensource.org/licenses/MIT for more information
-!*/
+ * AdminLTE v2.4.12
+ * Without Third-Party Plugins
+ * 
+ *   Author:  Colorlib
+ *   Support: <https://github.com/ColorlibHQ/AdminLTE/issues>
+ *   Repository: git://github.com/ColorlibHQ/AdminLTE.git
+ *   License: MIT <http://opensource.org/licenses/MIT>
+ */
+
 //Bootstrap Variables & Mixins
 //The core bootstrap code have not been modified. These files
 //are included only for reference.
--- a/build/less/AdminLTE.less
+++ b/build/less/AdminLTE.less
@@ -1,10 +1,12 @@
 /*!
- *   AdminLTE v2.4.8
- *   Author: Almsaeed Studio
- *	 Website: Almsaeed Studio <https://adminlte.io>
- *   License: Open source - MIT
- *           Please visit http://opensource.org/licenses/MIT for more information
+ * AdminLTE v2.4.12
+ * 
+ *   Author:  Colorlib
+ *   Support: <https://github.com/ColorlibHQ/AdminLTE/issues>
+ *   Repository: git://github.com/ColorlibHQ/AdminLTE.git
+ *   License: MIT <http://opensource.org/licenses/MIT>
 */
+
 // Bootstrap
 //--------------------------------------------------------
@import (reference) "../bootstrap-less/mixins";
--- a/build/less/core.less
+++ b/build/less/core.less
@@ -70,7 +70,7 @@ body {
 }

 .content-wrapper  {
-  min-height: 100%;
+  min-height: ~"calc(100% - 102px)";
  background-color: @content-bg;
  z-index: 800;
 }
--- a/build/less/login_and_register.less
+++ b/build/less/login_and_register.less
@@ -16,6 +16,7 @@

 .login-page,
 .register-page {
+  height: auto;
  background: @gray-lte;
 }

--- a/build/less/miscellaneous.less
+++ b/build/less/miscellaneous.less
@@ -604,3 +604,8 @@
    width: 100% !important;
  }
 }
+
+// Horizontal rules
+hr {
+  border-top: 1px solid @hr-border;
+}
--- a/build/less/skins/skin-black-light.less
+++ b/build/less/skins/skin-black-light.less
@@ -11,8 +11,8 @@
 .skin-black-light {
  //Navbar & Logo
  .main-header {
-    //.box-shadow(0px 1px 1px rgba(0, 0, 0, 0.05));
-    border-bottom: 1px solid @gray-lte;
+    .box-shadow(0px 1px 1px rgba(0, 0, 0, 0.05));
+    // border-bottom: 1px solid @gray-lte;
    .navbar-toggle {
      color: #333;
    }
--- a/build/less/treeview.less
+++ b/build/less/treeview.less
@@ -1,4 +1,4 @@
-// Tree view menu
+	// Tree view menu
 .treeview-menu {
 	display: none;
 	list-style: none;
@@ -27,4 +27,19 @@
 	    }
 	  }
 	}
+}
+
+.treeview {
+	> ul.treeview-menu {
+		overflow: hidden;
+		height:auto;
+		padding-top:0px !important;
+		padding-bottom: 0px !important;
+	}
+}
+.treeview.menu-open {
+	> ul.treeview-menu {
+		 overflow: visible;
+  		height:auto;
+	}
 }
--- a/build/less/variables.less
+++ b/build/less/variables.less
@@ -102,6 +102,11 @@
 // Border radius for non flat buttons
@btn-border-radius: 3px;

+// HR
+// --------------------------------------------------------
+// Horizontal line color.
+@hr-border: @gray;
+
 // DIRECT CHAT
 // --------------------------------------------------------
@direct-chat-height: 250px;
--- a/dist/css/AdminLTE.css
+++ b/dist/css/AdminLTE.css
@@ -1,9 +1,10 @@
 /*!
- *   AdminLTE v2.4.8
- *   Author: Almsaeed Studio
- *	 Website: Almsaeed Studio <https://adminlte.io>
- *   License: Open source - MIT
- *           Please visit http://opensource.org/licenses/MIT for more information
+ * AdminLTE v2.4.12
+ * 
+ *   Author:  Colorlib
+ *   Support: <https://github.com/ColorlibHQ/AdminLTE/issues>
+ *   Repository: git://github.com/ColorlibHQ/AdminLTE.git
+ *   License: MIT <http://opensource.org/licenses/MIT>
 */
 /*
 * Core: General Layout Style
@@ -86,7 +87,7 @@ body {
  }
 }
 .content-wrapper {
-  min-height: 100%;
+  min-height: calc(100% - 102px);
  background-color: #ecf0f5;
  z-index: 800;
 }
@@ -3096,6 +3097,16 @@ table.text-center th {
 .treeview-menu > li > a > .fa-angle-down {
  width: auto;
 }
+.treeview > ul.treeview-menu {
+  overflow: hidden;
+  height: auto;
+  padding-top: 0px !important;
+  padding-bottom: 0px !important;
+}
+.treeview.menu-open > ul.treeview-menu {
+  overflow: visible;
+  height: auto;
+}
 /*
 * Page: Mailbox
 * -------------
@@ -3248,6 +3259,7 @@ table.text-center th {
 }
 .login-page,
 .register-page {
+  height: auto;
  background: #d2d6de;
 }
 .login-box,
@@ -4933,6 +4945,9 @@ table.text-center th {
 .chart canvas {
  width: 100% !important;
 }
+hr {
+  border-top: 1px solid #555555;
+}
 /*
 * Misc: print
 * -----------
--- a/dist/css/AdminLTE.min.css
+++ b/dist/css/AdminLTE.min.css
--- a/dist/css/alt/AdminLTE-without-plugins.css
+++ b/dist/css/alt/AdminLTE-without-plugins.css
@@ -1,10 +1,12 @@
 /*!
- *   AdminLTE v2.4.0 Without Third-Party Plugins
- *   Author: Almsaeed Studio
- *	 Website: Almsaeed Studio <https://adminlte.io>
- *   License: Open source - MIT
- *           Please visit http://opensource.org/licenses/MIT for more information
-!*/
+ * AdminLTE v2.4.12
+ * Without Third-Party Plugins
+ * 
+ *   Author:  Colorlib
+ *   Support: <https://github.com/ColorlibHQ/AdminLTE/issues>
+ *   Repository: git://github.com/ColorlibHQ/AdminLTE.git
+ *   License: MIT <http://opensource.org/licenses/MIT>
+ */
 /*
 * Core: General Layout Style
 * -------------------------
@@ -86,7 +88,7 @@ body {
  }
 }
 .content-wrapper {
-  min-height: 100%;
+  min-height: calc(100% - 102px);
  background-color: #ecf0f5;
  z-index: 800;
 }
@@ -3096,6 +3098,16 @@ table.text-center th {
 .treeview-menu > li > a > .fa-angle-down {
  width: auto;
 }
+.treeview > ul.treeview-menu {
+  overflow: hidden;
+  height: auto;
+  padding-top: 0px !important;
+  padding-bottom: 0px !important;
+}
+.treeview.menu-open > ul.treeview-menu {
+  overflow: visible;
+  height: auto;
+}
 /*
 * Page: Mailbox
 * -------------
@@ -3248,6 +3260,7 @@ table.text-center th {
 }
 .login-page,
 .register-page {
+  height: auto;
  background: #d2d6de;
 }
 .login-box,
@@ -3958,6 +3971,9 @@ table.text-center th {
 .chart canvas {
  width: 100% !important;
 }
+hr {
+  border-top: 1px solid #555555;
+}
 /*
 * Misc: print
 * -----------
--- a/dist/css/alt/AdminLTE-without-plugins.min.css
+++ b/dist/css/alt/AdminLTE-without-plugins.min.css
--- a/dist/css/skins/_all-skins.css
+++ b/dist/css/skins/_all-skins.css
@@ -470,7 +470,8 @@
 */
 /* skin-black navbar */
 .skin-black-light .main-header {
-  border-bottom: 1px solid #d2d6de;
+  -webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05);
+  box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05);
 }
 .skin-black-light .main-header .navbar-toggle {
  color: #333;
--- a/dist/css/skins/_all-skins.min.css
+++ b/dist/css/skins/_all-skins.min.css
--- a/dist/css/skins/skin-black-light.css
+++ b/dist/css/skins/skin-black-light.css
@@ -4,7 +4,8 @@
 */
 /* skin-black navbar */
 .skin-black-light .main-header {
-  border-bottom: 1px solid #d2d6de;
+  -webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05);
+  box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05);
 }
 .skin-black-light .main-header .navbar-toggle {
  color: #333;
--- a/dist/css/skins/skin-black-light.min.css
+++ b/dist/css/skins/skin-black-light.min.css
@@ -1 +1 @@
-.skin-black-light .main-header{border-bottom:1px solid #d2d6de}.skin-black-light .main-header .navbar-toggle{color:#333}.skin-black-light .main-header .navbar-brand{color:#333;border-right:1px solid #d2d6de}.skin-black-light .main-header .navbar{background-color:#fff}.skin-black-light .main-header .navbar .nav>li>a{color:#333}.skin-black-light .main-header .navbar .nav>li>a:hover,.skin-black-light .main-header .navbar .nav>li>a:active,.skin-black-light .main-header .navbar .nav>li>a:focus,.skin-black-light .main-header .navbar .nav .open>a,.skin-black-light .main-header .navbar .nav .open>a:hover,.skin-black-light .main-header .navbar .nav .open>a:focus,.skin-black-light .main-header .navbar .nav>.active>a{background:#fff;color:#999}.skin-black-light .main-header .navbar .sidebar-toggle{color:#333}.skin-black-light .main-header .navbar .sidebar-toggle:hover{color:#999;background:#fff}.skin-black-light .main-header .navbar>.sidebar-toggle{color:#333;border-right:1px solid #d2d6de}.skin-black-light .main-header .navbar .navbar-nav>li>a{border-right:1px solid #d2d6de}.skin-black-light .main-header .navbar .navbar-custom-menu .navbar-nav>li>a,.skin-black-light .main-header .navbar .navbar-right>li>a{border-left:1px solid #d2d6de;border-right-width:0}.skin-black-light .main-header .logo{background-color:#fff;color:#333;border-bottom:0 solid transparent;border-right:1px solid #d2d6de}.skin-black-light .main-header .logo:hover{background-color:#fcfcfc}@media (max-width:767px){.skin-black-light .main-header .logo{background-color:#222;color:#fff;border-bottom:0 solid transparent;border-right:none}.skin-black-light .main-header .logo:hover{background-color:#1f1f1f}}.skin-black-light .main-header li.user-header{background-color:#222}.skin-black-light .content-header{background:transparent;box-shadow:none}.skin-black-light .wrapper,.skin-black-light .main-sidebar,.skin-black-light .left-side{background-color:#f9fafc}.skin-black-light .main-sidebar{border-right:1px solid #d2d6de}.skin-black-light .user-panel>.info,.skin-black-light .user-panel>.info>a{color:#444}.skin-black-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-black-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-black-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-black-light .sidebar-menu>li:hover>a,.skin-black-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-black-light .sidebar-menu>li.active{border-left-color:#fff}.skin-black-light .sidebar-menu>li.active>a{font-weight:600}.skin-black-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-black-light .sidebar a{color:#444}.skin-black-light .sidebar a:hover{text-decoration:none}.skin-black-light .sidebar-menu .treeview-menu>li>a{color:#777}.skin-black-light .sidebar-menu .treeview-menu>li.active>a,.skin-black-light .sidebar-menu .treeview-menu>li>a:hover{color:#000}.skin-black-light .sidebar-menu .treeview-menu>li.active>a{font-weight:600}.skin-black-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-black-light .sidebar-form input[type="text"],.skin-black-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px}.skin-black-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-black-light .sidebar-form input[type="text"]:focus,.skin-black-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-black-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-black-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-black-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}
+.skin-black-light .main-header{-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.skin-black-light .main-header .navbar-toggle{color:#333}.skin-black-light .main-header .navbar-brand{color:#333;border-right:1px solid #d2d6de}.skin-black-light .main-header .navbar{background-color:#fff}.skin-black-light .main-header .navbar .nav>li>a{color:#333}.skin-black-light .main-header .navbar .nav>li>a:hover,.skin-black-light .main-header .navbar .nav>li>a:active,.skin-black-light .main-header .navbar .nav>li>a:focus,.skin-black-light .main-header .navbar .nav .open>a,.skin-black-light .main-header .navbar .nav .open>a:hover,.skin-black-light .main-header .navbar .nav .open>a:focus,.skin-black-light .main-header .navbar .nav>.active>a{background:#fff;color:#999}.skin-black-light .main-header .navbar .sidebar-toggle{color:#333}.skin-black-light .main-header .navbar .sidebar-toggle:hover{color:#999;background:#fff}.skin-black-light .main-header .navbar>.sidebar-toggle{color:#333;border-right:1px solid #d2d6de}.skin-black-light .main-header .navbar .navbar-nav>li>a{border-right:1px solid #d2d6de}.skin-black-light .main-header .navbar .navbar-custom-menu .navbar-nav>li>a,.skin-black-light .main-header .navbar .navbar-right>li>a{border-left:1px solid #d2d6de;border-right-width:0}.skin-black-light .main-header .logo{background-color:#fff;color:#333;border-bottom:0 solid transparent;border-right:1px solid #d2d6de}.skin-black-light .main-header .logo:hover{background-color:#fcfcfc}@media (max-width:767px){.skin-black-light .main-header .logo{background-color:#222;color:#fff;border-bottom:0 solid transparent;border-right:none}.skin-black-light .main-header .logo:hover{background-color:#1f1f1f}}.skin-black-light .main-header li.user-header{background-color:#222}.skin-black-light .content-header{background:transparent;box-shadow:none}.skin-black-light .wrapper,.skin-black-light .main-sidebar,.skin-black-light .left-side{background-color:#f9fafc}.skin-black-light .main-sidebar{border-right:1px solid #d2d6de}.skin-black-light .user-panel>.info,.skin-black-light .user-panel>.info>a{color:#444}.skin-black-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-black-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-black-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-black-light .sidebar-menu>li:hover>a,.skin-black-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-black-light .sidebar-menu>li.active{border-left-color:#fff}.skin-black-light .sidebar-menu>li.active>a{font-weight:600}.skin-black-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-black-light .sidebar a{color:#444}.skin-black-light .sidebar a:hover{text-decoration:none}.skin-black-light .sidebar-menu .treeview-menu>li>a{color:#777}.skin-black-light .sidebar-menu .treeview-menu>li.active>a,.skin-black-light .sidebar-menu .treeview-menu>li>a:hover{color:#000}.skin-black-light .sidebar-menu .treeview-menu>li.active>a{font-weight:600}.skin-black-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-black-light .sidebar-form input[type="text"],.skin-black-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px}.skin-black-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-black-light .sidebar-form input[type="text"]:focus,.skin-black-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-black-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-black-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-black-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}
--- a/dist/js/adminlte.js
+++ b/dist/js/adminlte.js
@@ -4,11 +4,10 @@
 * should be included in all pages. It controls some layout
 * options and implements exclusive AdminLTE plugins.
 *
-* @Author  Almsaeed Studio
-* @Support <https://www.almsaeedstudio.com>
-* @Email   <abdullah@almsaeedstudio.com>
-* @version 2.4.8
-* @repository git://github.com/almasaeed2010/AdminLTE.git
+* @author Colorlib
+* @support <https://github.com/ColorlibHQ/AdminLTE/issues>
+* @version 2.4.12
+* @repository git://github.com/ColorlibHQ/AdminLTE.git
 * @license MIT <http://opensource.org/licenses/MIT>
 */

@@ -241,7 +240,7 @@ throw new Error('AdminLTE requires jQuery')
        $(this.element).addClass(ClassName.collapsed);
        $(this.element).trigger(collapsedEvent);
      }.bind(this))
-      .trigger(expandingEvent);
+      .trigger(collapsingEvent);
  };

  BoxWidget.prototype.remove = function () {
@@ -389,17 +388,20 @@ throw new Error('AdminLTE requires jQuery')
  };

  ControlSidebar.prototype.expand = function () {
+    $(Selector.sidebar).show();
    if (!this.options.slide) {
      $('body').addClass(ClassName.open);
    } else {
      $(Selector.sidebar).addClass(ClassName.open);
    }

+
    $(this.element).trigger($.Event(Event.expanded));
  };

  ControlSidebar.prototype.collapse = function () {
    $('body, ' + Selector.sidebar).removeClass(ClassName.open);
+    $(Selector.sidebar).fadeOut();
    $(this.element).trigger($.Event(Event.collapsed));
  };

@@ -524,186 +526,6 @@ throw new Error('AdminLTE requires jQuery')
 }(jQuery);


-/* Layout()
- * ========
- * Implements AdminLTE layout.
- * Fixes the layout height in case min-height fails.
- *
- * @usage activated automatically upon window load.
- *        Configure any options by passing data-option="value"
- *        to the body tag.
- */
-+function ($) {
-  'use strict';
-
-  var DataKey = 'lte.layout';
-
-  var Default = {
-    slimscroll : true,
-    resetHeight: true
-  };
-
-  var Selector = {
-    wrapper       : '.wrapper',
-    contentWrapper: '.content-wrapper',
-    layoutBoxed   : '.layout-boxed',
-    mainFooter    : '.main-footer',
-    mainHeader    : '.main-header',
-    sidebar       : '.sidebar',
-    controlSidebar: '.control-sidebar',
-    fixed         : '.fixed',
-    sidebarMenu   : '.sidebar-menu',
-    logo          : '.main-header .logo'
-  };
-
-  var ClassName = {
-    fixed         : 'fixed',
-    holdTransition: 'hold-transition'
-  };
-
-  var Layout = function (options) {
-    this.options      = options;
-    this.bindedResize = false;
-    this.activate();
-  };
-
-  Layout.prototype.activate = function () {
-    this.fix();
-    this.fixSidebar();
-
-    $('body').removeClass(ClassName.holdTransition);
-
-    if (this.options.resetHeight) {
-      $('body, html, ' + Selector.wrapper).css({
-        'height'    : 'auto',
-        'min-height': '100%'
-      });
-    }
-
-    if (!this.bindedResize) {
-      $(window).resize(function () {
-        this.fix();
-        this.fixSidebar();
-
-        $(Selector.logo + ', ' + Selector.sidebar).one('webkitTransitionEnd otransitionend oTransitionEnd msTransitionEnd transitionend', function () {
-          this.fix();
-          this.fixSidebar();
-        }.bind(this));
-      }.bind(this));
-
-      this.bindedResize = true;
-    }
-
-    $(Selector.sidebarMenu).on('expanded.tree', function () {
-      this.fix();
-      this.fixSidebar();
-    }.bind(this));
-
-    $(Selector.sidebarMenu).on('collapsed.tree', function () {
-      this.fix();
-      this.fixSidebar();
-    }.bind(this));
-  };
-
-  Layout.prototype.fix = function () {
-    // Remove overflow from .wrapper if layout-boxed exists
-    $(Selector.layoutBoxed + ' > ' + Selector.wrapper).css('overflow', 'hidden');
-
-    // Get window height and the wrapper height
-    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;
-
-    // Set the min-height of the content and sidebar based on
-    // the height of the document.
-    if ($('body').hasClass(ClassName.fixed)) {
-      $(Selector.contentWrapper).css('min-height', windowHeight - footerHeight);
-    } else {
-      var postSetHeight;
-
-      if (windowHeight >= sidebarHeight + headerHeight) {
-        $(Selector.contentWrapper).css('min-height', windowHeight - neg);
-        postSetHeight = windowHeight - neg;
-      } else {
-        $(Selector.contentWrapper).css('min-height', sidebarHeight);
-        postSetHeight = sidebarHeight;
-      }
-
-      // Fix for the control sidebar height
-      var $controlSidebar = $(Selector.controlSidebar);
-      if (typeof $controlSidebar !== 'undefined') {
-        if ($controlSidebar.height() > postSetHeight)
-          $(Selector.contentWrapper).css('min-height', $controlSidebar.height());
-      }
-    }
-  };
-
-  Layout.prototype.fixSidebar = function () {
-    // Make sure the body tag has the .fixed class
-    if (!$('body').hasClass(ClassName.fixed)) {
-      if (typeof $.fn.slimScroll !== 'undefined') {
-        $(Selector.sidebar).slimScroll({ destroy: true }).height('auto');
-      }
-      return;
-    }
-
-    // Enable slimscroll for fixed layout
-    if (this.options.slimscroll) {
-      if (typeof $.fn.slimScroll !== 'undefined') {
-        // Destroy if it exists
-        // $(Selector.sidebar).slimScroll({ destroy: true }).height('auto')
-
-        // Add slimscroll
-        $(Selector.sidebar).slimScroll({
-          height: ($(window).height() - $(Selector.mainHeader).height()) + 'px'
-        });
-      }
-    }
-  };
-
-  // Plugin Definition
-  // =================
-  function Plugin(option) {
-    return this.each(function () {
-      var $this = $(this);
-      var data  = $this.data(DataKey);
-
-      if (!data) {
-        var options = $.extend({}, Default, $this.data(), typeof option === 'object' && option);
-        $this.data(DataKey, (data = new Layout(options)));
-      }
-
-      if (typeof option === 'string') {
-        if (typeof data[option] === 'undefined') {
-          throw new Error('No method named ' + option);
-        }
-        data[option]();
-      }
-    });
-  }
-
-  var old = $.fn.layout;
-
-  $.fn.layout            = Plugin;
-  $.fn.layout.Constuctor = Layout;
-
-  // No conflict mode
-  // ================
-  $.fn.layout.noConflict = function () {
-    $.fn.layout = old;
-    return this;
-  };
-
-  // Layout DATA-API
-  // ===============
-  $(window).on('load', function () {
-    Plugin.call($('body'));
-  });
-}(jQuery);
-
-
 /* PushMenu()
 * ==========
 * Adds the push menu functionality to the sidebar.
@@ -1137,3 +959,183 @@ throw new Error('AdminLTE requires jQuery')
  });

 }(jQuery);
+
+
+/* Layout()
+ * ========
+ * Implements AdminLTE layout.
+ * Fixes the layout height in case min-height fails.
+ *
+ * @usage activated automatically upon window load.
+ *        Configure any options by passing data-option="value"
+ *        to the body tag.
+ */
+function ($) {
+  'use strict';
+
+  var DataKey = 'lte.layout';
+
+  var Default = {
+    slimscroll : true,
+    resetHeight: true
+  };
+
+  var Selector = {
+    wrapper       : '.wrapper',
+    contentWrapper: '.content-wrapper',
+    layoutBoxed   : '.layout-boxed',
+    mainFooter    : '.main-footer',
+    mainHeader    : '.main-header',
+    sidebar       : '.sidebar',
+    controlSidebar: '.control-sidebar',
+    fixed         : '.fixed',
+    sidebarMenu   : '.sidebar-menu',
+    logo          : '.main-header .logo'
+  };
+
+  var ClassName = {
+    fixed         : 'fixed',
+    holdTransition: 'hold-transition'
+  };
+
+  var Layout = function (options) {
+    this.options      = options;
+    this.bindedResize = false;
+    this.activate();
+  };
+
+  Layout.prototype.activate = function () {
+    this.fix();
+    this.fixSidebar();
+
+    $('body').removeClass(ClassName.holdTransition);
+
+    if (this.options.resetHeight) {
+      $('body, html, ' + Selector.wrapper).css({
+        'height'    : 'auto',
+        'min-height': '100%'
+      });
+    }
+
+    if (!this.bindedResize) {
+      $(window).resize(function () {
+        this.fix();
+        this.fixSidebar();
+
+        $(Selector.logo + ', ' + Selector.sidebar).one('webkitTransitionEnd otransitionend oTransitionEnd msTransitionEnd transitionend', function () {
+          this.fix();
+          this.fixSidebar();
+        }.bind(this));
+      }.bind(this));
+
+      this.bindedResize = true;
+    }
+
+    $(Selector.sidebarMenu).on('expanded.tree', function () {
+      this.fix();
+      this.fixSidebar();
+    }.bind(this));
+
+    $(Selector.sidebarMenu).on('collapsed.tree', function () {
+      this.fix();
+      this.fixSidebar();
+    }.bind(this));
+  };
+
+  Layout.prototype.fix = function () {
+    // Remove overflow from .wrapper if layout-boxed exists
+    $(Selector.layoutBoxed + ' > ' + Selector.wrapper).css('overflow', 'hidden');
+
+    // Get window height and the wrapper height
+    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;
+
+    // Set the min-height of the content and sidebar based on
+    // the height of the document.
+    if ($('body').hasClass(ClassName.fixed)) {
+      $(Selector.contentWrapper).css('min-height', windowHeight - footerHeight);
+    } else {
+      var postSetHeight;
+
+      if (windowHeight >= sidebarHeight + headerHeight) {
+        $(Selector.contentWrapper).css('min-height', windowHeight - neg);
+        postSetHeight = windowHeight - neg;
+      } else {
+        $(Selector.contentWrapper).css('min-height', sidebarHeight);
+        postSetHeight = sidebarHeight;
+      }
+
+      // Fix for the control sidebar height
+      var $controlSidebar = $(Selector.controlSidebar);
+      if (typeof $controlSidebar !== 'undefined') {
+        if ($controlSidebar.height() > postSetHeight)
+          $(Selector.contentWrapper).css('min-height', $controlSidebar.height());
+      }
+    }
+  };
+
+  Layout.prototype.fixSidebar = function () {
+    // Make sure the body tag has the .fixed class
+    if (!$('body').hasClass(ClassName.fixed)) {
+      if (typeof $.fn.slimScroll !== 'undefined') {
+        $(Selector.sidebar).slimScroll({ destroy: true }).height('auto');
+      }
+      return;
+    }
+
+    // Enable slimscroll for fixed layout
+    if (this.options.slimscroll) {
+      if (typeof $.fn.slimScroll !== 'undefined') {
+        // Destroy if it exists
+        // $(Selector.sidebar).slimScroll({ destroy: true }).height('auto')
+
+        // Add slimscroll
+        $(Selector.sidebar).slimScroll({
+          height: ($(window).height() - $(Selector.mainHeader).height()) + 'px'
+        });
+      }
+    }
+  };
+
+  // Plugin Definition
+  // =================
+  function Plugin(option) {
+    return this.each(function () {
+      var $this = $(this);
+      var data  = $this.data(DataKey);
+
+      if (!data) {
+        var options = $.extend({}, Default, $this.data(), typeof option === 'object' && option);
+        $this.data(DataKey, (data = new Layout(options)));
+      }
+
+      if (typeof option === 'string') {
+        if (typeof data[option] === 'undefined') {
+          throw new Error('No method named ' + option);
+        }
+        data[option]();
+      }
+    });
+  }
+
+  var old = $.fn.layout;
+
+  $.fn.layout            = Plugin;
+  $.fn.layout.Constuctor = Layout;
+
+  // No conflict mode
+  // ================
+  $.fn.layout.noConflict = function () {
+    $.fn.layout = old;
+    return this;
+  };
+
+  // Layout DATA-API
+  // ===============
+  $(window).on('load', function () {
+    Plugin.call($('body'));
+  });
+}(jQuery);
--- a/dist/js/adminlte.min.js
+++ b/dist/js/adminlte.min.js
--- a/dist/js/pages/dashboard.js
+++ b/dist/js/pages/dashboard.js
@@ -11,6 +11,7 @@ $(function () {

  // Make the dashboard widgets sortable Using jquery UI
  $('.connectedSortable').sortable({
+    containment         : $('section.content'),
    placeholder         : 'sort-highlight',
    connectWith         : '.connectedSortable',
    handle              : '.box-header, .nav-tabs',
--- a/documentation/build/index.html
+++ b/documentation/build/index.html
@@ -10,7 +10,7 @@
  <!-- Font Awesome -->
  <link rel="stylesheet" href="../bower_components/font-awesome/css/font-awesome.min.css">
  <!-- Ionicons -->
-  <link rel="stylesheet" href="../bower_components/Ionicons/c/css/ionicons.min.css">
+  <link rel="stylesheet" href="../bower_components/Ionicons/css/ionicons.min.css">
  <!-- Theme style -->
  <link rel="stylesheet" href="../dist/css/AdminLTE.min.css">
  <link rel="stylesheet" href="../dist/css/skins/_all-skins.min.css">
--- a/documentation/index.html
+++ b/documentation/index.html
@@ -10,7 +10,7 @@
  <!-- Font Awesome -->
  <link rel="stylesheet" href="../bower_components/font-awesome/css/font-awesome.min.css">
  <!-- Ionicons -->
-  <link rel="stylesheet" href="../bower_components/Ionicons/c/css/ionicons.min.css">
+  <link rel="stylesheet" href="../bower_components/Ionicons/css/ionicons.min.css">
  <!-- Theme style -->
  <link rel="stylesheet" href="../dist/css/AdminLTE.min.css">
  <link rel="stylesheet" href="../dist/css/skins/_all-skins.min.css">
--- a/index.html
+++ b/index.html
@@ -1035,7 +1035,7 @@
  </footer>

  <!-- Control Sidebar -->
-  <aside class="control-sidebar control-sidebar-dark">
+  <aside class="control-sidebar control-sidebar-dark" style="display: none;">
    <!-- Create the tabs -->
    <ul class="nav nav-tabs nav-justified control-sidebar-tabs">
      <li><a href="#control-sidebar-home-tab" data-toggle="tab"><i class="fa fa-home"></i></a></li>
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "admin-lte",
-  "version": "2.4.8",
+  "version": "2.4.11",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -529,7 +529,6 @@
      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
      "integrity": "sha1-emNune1O/O+xnO9JR6PGffrukRs=",
      "dev": true,
-      "optional": true,
      "requires": {
        "hoek": "0.9.x"
      }
@@ -2288,8 +2287,7 @@
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true,
-      "optional": true
+      "dev": true
    },
    "fancy-log": {
      "version": "1.3.0",
@@ -4391,8 +4389,7 @@
      "version": "0.9.1",
      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
      "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU=",
-      "dev": true,
-      "optional": true
+      "dev": true
    },
    "hooker": {
      "version": "0.2.3",
@@ -4905,8 +4902,7 @@
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true,
-      "optional": true
+      "dev": true
    },
    "jshint": {
      "version": "2.8.0",
@@ -5085,7 +5081,6 @@
          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
          "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
          "dev": true,
-          "optional": true,
          "requires": {
            "hoek": "2.x.x"
          }
@@ -5095,7 +5090,6 @@
          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
          "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
          "dev": true,
-          "optional": true,
          "requires": {
            "delayed-stream": "~1.0.0"
          }
@@ -5114,8 +5108,7 @@
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "forever-agent": {
          "version": "0.6.1",
@@ -5160,8 +5153,7 @@
          "version": "2.16.3",
          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "http-signature": {
          "version": "1.1.1",
@@ -5179,15 +5171,13 @@
          "version": "1.38.0",
          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
          "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "mime-types": {
          "version": "2.1.22",
          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
          "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
          "dev": true,
-          "optional": true,
          "requires": {
            "mime-db": "~1.38.0"
          }
@@ -5766,9 +5756,8 @@
      }
    },
    "morris.js": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/morris.js/-/morris.js-0.5.0.tgz",
-      "integrity": "sha1-cldnE1z64Fmq51mZuyzmocXRtEs="
+      "version": "github:morrisjs/morris.js#14530d0733801d5bef1264cf3d062ecace7e326b",
+      "from": "github:morrisjs/morris.js"
    },
    "mozjpeg": {
      "version": "4.1.1",
@@ -6600,8 +6589,7 @@
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true,
-      "optional": true
+      "dev": true
    },
    "sax": {
      "version": "1.2.4",
@@ -7471,8 +7459,7 @@
      "version": "0.14.5",
      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true,
-      "optional": true
+      "dev": true
    },
    "type-is": {
      "version": "1.6.15",
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
  "name": "admin-lte",
-  "version": "2.4.10",
+  "version": "2.4.12",
  "main": "dist/js/adminlte.min.js",
  "repository": {
    "type": "git",
-    "url": "git://github.com/almasaeed2010/AdminLTE.git"
+    "url": "git://github.com/ColorlibHQ/AdminLTE.git"
  },
  "license": "MIT",
  "devDependencies": {
@@ -52,7 +52,7 @@
    "jquery-ui": "^1.12.1",
    "jvectormap": "^1.2.2",
    "moment": "^2.24.0",
-    "morris.js": "^0.5.0",
+    "morris.js": "github:morrisjs/morris.js",
    "pace": "0.0.4",
    "raphael": "^2.2.7",
    "select2": "^4.0.3",
--- a/pages/forms/advanced.html
+++ b/pages/forms/advanced.html
@@ -1174,7 +1174,7 @@
    //Date range picker
    $('#reservation').daterangepicker()
    //Date range picker with time picker
-    $('#reservationtime').daterangepicker({ timePicker: true, timePickerIncrement: 30, format: 'MM/DD/YYYY h:mm A' })
+    $('#reservationtime').daterangepicker({ timePicker: true, timePickerIncrement: 30, locale: { format: 'MM/DD/YYYY hh:mm A' }})
    //Date range as a button
    $('#daterange-btn').daterangepicker(
      {
Author	SHA1	Message	Date
REJack	7309e2e5d5	bump version	2019-06-11 13:52:23 +02:00
REJack	af70f05345	added height auto to .login-page & .register-page	2019-06-11 12:14:18 +02:00
REJack	90b65eac6d	bump version to v2.4.12-pre	2019-06-11 12:13:34 +02:00
REJack	340bbbaf93	fixed strange navigation menu behavior + dark space on reloads (#2126 ) - changed height: 0px to height: auto for uk.treeview-menu to fix not smooth treeview closing - fixed .content-wrapper calc, it returned -2% before - changed order of js file generation - rebuild dist files	2019-06-11 11:59:05 +02:00
REJack	67044517c3	fixed npm audit error	2019-06-11 11:53:48 +02:00
REJack	445a9c3e83	updated README.md - changed github links to ColorlibHQ - removed Donations part	2019-06-06 13:50:39 +02:00
REJack	7dda778f61	updated copyright in css & js files - updated repository url in package.json - updated copyright infos for js in Gruntfile.js - updated copyright infos for css in AdminLTE.less & AdminLTE-without-plugins.less - rebuild dist files	2019-06-06 11:32:52 +02:00
REJack	b2e020413d	fixed sidebar menu tree dropdown always open - added code from #2001 thanks @CoderSquirrel Closes #1854 & #2001	2019-06-06 11:07:56 +02:00
REJack	2226c0e7cf	fixed drag and drop breaking adminlte's design - updated ControlSidebar.js to hide control sidebar instead of only moving it - updated dashboard.js to use containment in sortable() - added display none to control sidebar content in index.html (Closes #1924)	2019-06-06 10:59:10 +02:00
REJack	3254b3b60f	fixed missing time in "Date and time range" picker Closes #2027	2019-06-06 10:05:15 +02:00
REJack	6f953ee8da	updated dist files	2019-06-05 14:20:04 +02:00
REJack	b4fa509976	fixed ionicons path in docs (closes #2044 )	2019-05-22 11:07:13 +02:00
REJack	c6720a8790	changed hr border color to `@gray` instead of `@gray-lighter`	2019-05-21 20:50:51 +02:00
REJack	c7509cfe70	package.json prep for v2.4.11	2019-05-21 19:02:47 +02:00
REJack	054c89ea53	changed min-height to calc in .content-wrapper	2019-05-21 12:34:52 +02:00
Aigars Silkalns	19113c3cbc	Merge pull request #2093 from Imbuzi/patch-1 Update adminlte.js	2019-04-10 17:36:47 +03:00
Nicolas Bourasseau	17f46f4eca	Update adminlte.js Fixing bug throwing error "Uncaught ReferenceError: expandingEvent is not defined" when collapsing .box .	2019-04-10 16:34:28 +02:00
Aigars Silkalns	1d943023e3	Merge pull request #2091 from yohaneslumentut/skin-black-light-fixing Fix layout skin-black-light height inconsistence	2019-04-08 13:48:39 +03:00
Yohanes Lumentut	4b9b563f42	Fix layout skin-black-light height inconsistence	2019-04-06 23:44:17 +07:00
Aigars Silkalns	bf86dc34e2	Merge pull request #2067 from Lowhearth/treeview-expand Treeview expand	2019-03-24 19:43:28 +02:00
Aigars Silkalns	100a35f3ce	Merge pull request #2076 from hirayama-onagigawa-computing/fix_box_widget_collapsing Fix typo which breaks BoxWidget collapsing.	2019-03-24 19:42:50 +02:00
平山度	998a1ff4be	Fix typo which breaks BoxWidget collapsing.	2019-03-15 17:33:15 +09:00
Daniel Vilanova Yamuza	f8fe281c43	Fixed formatting	2019-02-24 15:23:09 +01:00
Daniel Vilanova Yamuza	68834fc648	Now the collapse and expand event are triggered after the event loop, Fixes #2019	2019-02-24 15:16:53 +01:00