Compile less and minify js

Update version number
Merge pull request #1160 from antoniocambados/antoniocambados-patch-1158
2016-10-19 11:34:25 -04:00 · 2016-10-19 11:30:41 -04:00 · 2016-09-12 16:23:06 -04:00 · 2016-09-12 16:22:01 -04:00 · 2016-09-12 16:21:52 -04:00 · 2016-09-12 16:18:09 -04:00
43 changed files with 71 additions and 50 deletions
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ AdminLTE 1.x can be easily upgraded to 2.x using [this guide](https://almsaeedst

 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).** We will add a detailed release notes to each new release. 
+**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 a detailed release notes to each new release. 

 Image Credits
 -------------
--- a/build/less/AdminLTE.less
+++ b/build/less/AdminLTE.less
@@ -1,5 +1,5 @@
 /*!
- *   AdminLTE v2.3.6
+ *   AdminLTE v2.3.7
 *   Author: Almsaeed Studio
 *	 Website: Almsaeed Studio <http://almsaeedstudio.com>
 *   License: Open source - MIT
--- a/build/less/forms.less
+++ b/build/less/forms.less
@@ -29,7 +29,8 @@
    label {
      color: @green;
    }
-    .form-control {
+    .form-control,
+    .input-group-addon {
      border-color: @green;
      box-shadow: none;
    }
@@ -42,7 +43,8 @@
    label {
      color: @yellow;
    }
-    .form-control {
+    .form-control,
+    .input-group-addon {
      border-color: @yellow;
      box-shadow: none;
    }
@@ -55,7 +57,8 @@
    label {
      color: @red;
    }
-    .form-control {
+    .form-control,
+    .input-group-addon {
      border-color: @red;
      box-shadow: none;
    }
--- a/build/less/sidebar.less
+++ b/build/less/sidebar.less
@@ -121,7 +121,7 @@
    margin-right: 10px;
  }
  li.active {
-    > a > .fa-angle-left
+    > a > .fa-angle-left,
    > a > .pull-right-container > .fa-angle-left {
      .rotate(-90deg);
    }
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,18 @@
 ### CHANGE LOG:
+**v2.3.7**
+- Merge pull request #1160 from antoniocambados/antoniocambados-patch-1158
+- Merge branch 'rickysang-master'
+- merge pull request #1165
+- Merge pull request #1166 from liamgall/master
+- Merge pull request #1178 from mortonfox/patch-1
+- Merge pull request #1184 from leoncheek/master
+- Fix sidebar li.active fa-angle-left rotate.
+- Fix link to changelog
+- Merge pull request #1 from liamgall/liamgall-patch-1
+- changed index2.html to ../index2.html
+- Fix issue #1008
+- Update sidebar.less
+
 **v2.3.6:**
 - Update version
 - Use markdown in the changelog file
--- a/dist/css/AdminLTE.css
+++ b/dist/css/AdminLTE.css
@@ -1,6 +1,6 @@
@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);
 /*!
- *   AdminLTE v2.3.6
+ *   AdminLTE v2.3.7
 *   Author: Almsaeed Studio
 *	 Website: Almsaeed Studio <http://almsaeedstudio.com>
 *   License: Open source - MIT
@@ -543,7 +543,8 @@ a:focus {
  padding: 0;
  margin-right: 10px;
 }
-.sidebar-menu li.active > a > .fa-angle-left > a > .pull-right-container > .fa-angle-left {
+.sidebar-menu li.active > a > .fa-angle-left,
+.sidebar-menu li.active > a > .pull-right-container > .fa-angle-left {
  -webkit-transform: rotate(-90deg);
  -ms-transform: rotate(-90deg);
  -o-transform: rotate(-90deg);
@@ -1269,7 +1270,8 @@ a:focus {
 .form-group.has-success label {
  color: #00a65a;
 }
-.form-group.has-success .form-control {
+.form-group.has-success .form-control,
+.form-group.has-success .input-group-addon {
  border-color: #00a65a;
  box-shadow: none;
 }
@@ -1279,7 +1281,8 @@ a:focus {
 .form-group.has-warning label {
  color: #f39c12;
 }
-.form-group.has-warning .form-control {
+.form-group.has-warning .form-control,
+.form-group.has-warning .input-group-addon {
  border-color: #f39c12;
  box-shadow: none;
 }
@@ -1289,7 +1292,8 @@ a:focus {
 .form-group.has-error label {
  color: #dd4b39;
 }
-.form-group.has-error .form-control {
+.form-group.has-error .form-control,
+.form-group.has-error .input-group-addon {
  border-color: #dd4b39;
  box-shadow: none;
 }
--- a/dist/css/AdminLTE.min.css
+++ b/dist/css/AdminLTE.min.css
--- a/dist/js/app.js
+++ b/dist/js/app.js
@@ -7,7 +7,7 @@
 * @Author  Almsaeed Studio
 * @Support <http://www.almsaeedstudio.com>
 * @Email   <abdullah@almsaeedstudio.com>
- * @version 2.3.6
+ * @version 2.3.7
 * @license MIT <http://opensource.org/licenses/MIT>
 */

--- a/dist/js/app.min.js
+++ b/dist/js/app.min.js
--- a/documentation/build/index.html
+++ b/documentation/build/index.html
@@ -158,7 +158,7 @@ include "license.html"

      <footer class="main-footer">
        <div class="pull-right hidden-xs">
-          <b>Version</b> 2.3.6
+          <b>Version</b> 2.3.7
        </div>
        <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights reserved.
      </footer>
--- a/documentation/index.html
+++ b/documentation/index.html
@@ -2130,7 +2130,7 @@ AdminLTE/

      <footer class="main-footer">
        <div class="pull-right hidden-xs">
-          <b>Version</b> 2.3.6
+          <b>Version</b> 2.3.7
        </div>
        <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights reserved.
      </footer>
--- a/index.html
+++ b/index.html
@@ -1015,7 +1015,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/index2.html
+++ b/index2.html
@@ -1330,7 +1330,7 @@

  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/UI/buttons.html
+++ b/pages/UI/buttons.html
@@ -1493,7 +1493,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/UI/general.html
+++ b/pages/UI/general.html
@@ -1441,7 +1441,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/UI/icons.html
+++ b/pages/UI/icons.html
@@ -2816,7 +2816,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/UI/modals.html
+++ b/pages/UI/modals.html
@@ -684,7 +684,7 @@

  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/UI/sliders.html
+++ b/pages/UI/sliders.html
@@ -607,7 +607,7 @@

  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/UI/timeline.html
+++ b/pages/UI/timeline.html
@@ -688,7 +688,7 @@

  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/calendar.html
+++ b/pages/calendar.html
@@ -590,7 +590,7 @@

  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/charts/chartjs.html
+++ b/pages/charts/chartjs.html
@@ -492,7 +492,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/charts/flot.html
+++ b/pages/charts/flot.html
@@ -635,7 +635,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/charts/inline.html
+++ b/pages/charts/inline.html
@@ -873,7 +873,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/charts/morris.html
+++ b/pages/charts/morris.html
@@ -605,7 +605,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/examples/404.html
+++ b/pages/examples/404.html
@@ -540,7 +540,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/examples/500.html
+++ b/pages/examples/500.html
@@ -541,7 +541,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/examples/blank.html
+++ b/pages/examples/blank.html
@@ -435,7 +435,7 @@

  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/examples/invoice.html
+++ b/pages/examples/invoice.html
@@ -670,7 +670,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer no-print">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/examples/pace.html
+++ b/pages/examples/pace.html
@@ -448,7 +448,7 @@

  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/examples/profile.html
+++ b/pages/examples/profile.html
@@ -869,7 +869,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/forms/advanced.html
+++ b/pages/forms/advanced.html
@@ -917,7 +917,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/forms/editors.html
+++ b/pages/forms/editors.html
@@ -569,7 +569,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/forms/general.html
+++ b/pages/forms/general.html
@@ -900,7 +900,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/layout/boxed.html
+++ b/pages/layout/boxed.html
@@ -436,7 +436,7 @@

  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/layout/collapsed-sidebar.html
+++ b/pages/layout/collapsed-sidebar.html
@@ -442,7 +442,7 @@

  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/layout/fixed.html
+++ b/pages/layout/fixed.html
@@ -442,7 +442,7 @@

  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/layout/top-nav.html
+++ b/pages/layout/top-nav.html
@@ -264,7 +264,7 @@
  <footer class="main-footer">
    <div class="container">
      <div class="pull-right hidden-xs">
-        <b>Version</b> 2.3.6
+        <b>Version</b> 2.3.7
      </div>
      <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
      reserved.
--- a/pages/mailbox/compose.html
+++ b/pages/mailbox/compose.html
@@ -531,7 +531,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/mailbox/mailbox.html
+++ b/pages/mailbox/mailbox.html
@@ -674,7 +674,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/mailbox/read-mail.html
+++ b/pages/mailbox/read-mail.html
@@ -598,7 +598,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/tables/data.html
+++ b/pages/tables/data.html
@@ -1403,7 +1403,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/tables/simple.html
+++ b/pages/tables/simple.html
@@ -838,7 +838,7 @@
  <!-- /.content-wrapper -->
  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
--- a/pages/widgets.html
+++ b/pages/widgets.html
@@ -30,7 +30,7 @@

  <header class="main-header">
    <!-- Logo -->
-    <a href="index2.html" class="logo">
+    <a href="../index2.html" class="logo">
      <!-- mini logo for sidebar mini 50x50 pixels -->
      <span class="logo-mini"><b>A</b>LT</span>
      <!-- logo for regular state and mobile devices -->
@@ -1570,7 +1570,7 @@

  <footer class="main-footer">
    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.6
+      <b>Version</b> 2.3.7
    </div>
    <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
    reserved.
Author	SHA1	Message	Date
Abdullah Almsaeed	797b65b3ca	Compile less and minify js	2016-10-19 11:34:25 -04:00
Abdullah Almsaeed	5b14053e35	Update version number	2016-10-19 11:30:41 -04:00
Abdullah Almsaeed	1a89a2feab	Merge pull request #1160 from antoniocambados/antoniocambados-patch-1158 Update sidebar.less	2016-09-12 16:23:06 -04:00
Abdullah Almsaeed	060f79063e	Merge branch 'rickysang-master'	2016-09-12 16:22:01 -04:00
Abdullah Almsaeed	159887612e	merge pull request #1165	2016-09-12 16:21:52 -04:00
Abdullah Almsaeed	e207c9c0c8	Merge pull request #1166 from liamgall/master Fix link to dashboard in widgets page	2016-09-12 16:18:09 -04:00
Abdullah Almsaeed	be18803032	Merge pull request #1178 from mortonfox/patch-1 Fix link to changelog	2016-09-12 16:16:36 -04:00
Abdullah Almsaeed	79bd17075e	Merge pull request #1184 from leoncheek/master Fix sidebar angle rotate issue	2016-09-05 12:44:23 -04:00
Leon Cheek	30f9916802	Fix sidebar li.active fa-angle-left rotate.	2016-09-04 23:43:26 +08:00
Morton Fox	5170c4f8ea	Fix link to changelog	2016-09-01 00:32:40 -04:00
Kihwan Kim	09a8974ab7	Merge pull request #1 from liamgall/liamgall-patch-1 changed index2.html to ../index2.html	2016-08-20 14:43:20 +09:00
Kihwan Kim	e989db685e	changed index2.html to ../index2.html it send me to file:///~~~/AdminLTE-2.3.6/pages/index2.html so can't find page. changed "index2.html" to "../index2.html"	2016-08-20 14:38:44 +09:00
rickysang	87cba5d352	Fix issue #1008	2016-08-19 18:19:40 +08:00
Antonio Cambados	8f0a652055	Update sidebar.less Fixes https://github.com/almasaeed2010/AdminLTE/issues/1158: expandable indicators of sidebar's expandable menu items didn't toggle (rotate) upon expansion.	2016-08-11 08:47:38 +02:00