Merge branch 'puikinsh'

README.md

@@ -65,7 +65,6 @@ If `gulp` is installed, follow the steps below.
 * jVectorMap
 * moment.js
 * Morris.js - pretty time-series line graphs
-* jquery-nicescroll plugin
 * PNotify - Awesome JavaScript notifications
 * NProgress
 * Pace

bower.json

@@ -1,12 +1,11 @@
 {
   "name": "gentelella",
-  "version": "1.3.0",
   "homepage": "https://colorlib.com/polygon/gentelella/index.html",
   "authors": [
     "Aigars Silkalns",
     "Christian Esperar"
   ],
-  "description": "Gentellela Admin is a free to use Bootstrap admin template",
+  "description": "Gentelella Admin is a free to use Bootstrap admin template",
   "keywords": [
     "css",
     "js",
@@ -25,7 +24,7 @@
   ],
   "devDependencies": {
     "jquery": "^2.2.3",
-    "bootstrap": "^3.3.6",
+    "bootstrap": "^3.3.7",
     "font-awesome": "fontawesome#^4.6.1",
     "fastclick": "^1.0.6",
     "nprogress": "^0.2.0",

documentation/index.html

@@ -394,10 +394,6 @@
                                     <td>Auto resize textarea</td>
                                     <td><a href="http://www.jacklmoore.com/autosize/">http://www.jacklmoore.com/autosize/</a></td>
                                 </tr>
-                                <tr>
-                                    <td>Nice scroll</td>
-                                    <td><a href="http://areaaperta.com/nicescroll/">http://areaaperta.com/nicescroll/</a></td>
-                                </tr>
                                 <tr>
                                     <td>C3 charts</td>
                                     <td><a href="http://c3js.org/">http://c3js.org/</a></td>

documentation/index_cn.html

@@ -472,10 +472,6 @@
                                     <td>Auto resize textarea</td>
                                     <td><a href="http://www.jacklmoore.com/autosize/">http://www.jacklmoore.com/autosize/</a></td>
                                 </tr>
-                                <tr>
-                                    <td>Nice scroll</td>
-                                    <td><a href="http://areaaperta.com/nicescroll/">http://areaaperta.com/nicescroll/</a></td>
-                                </tr>
                                 <tr>
                                     <td>C3 charts</td>
                                     <td><a href="http://c3js.org/">http://c3js.org/</a></td>
@@ -593,4 +589,4 @@
 
         <script src="js/bootstrap.min.js"></script>
 
-    </body></html>
+    </body></html>

production/login.html

@@ -16,7 +16,7 @@
     <!-- NProgress -->
     <link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
     <!-- Animate.css -->
-    <link href="https://colorlib.com/polygon/gentelella/css/animate.min.css" rel="stylesheet">
+    <link href="../vendors/animate.css/animate.min.css" rel="stylesheet">
 
     <!-- Custom Theme Style -->
     <link href="../build/css/custom.min.css" rel="stylesheet">
@@ -100,4 +100,4 @@
       </div>
     </div>
   </body>
-</html>
+</html>

src/js/custom.js

@@ -4,7 +4,7 @@
  * and open the template in the editor.
  */
 
-var CURRENT_URL = window.location.href.split('?')[0],
+var CURRENT_URL = window.location.href.split('#')[0].split('?')[0],
     $BODY = $('body'),
     $MENU_TOGGLE = $('#menu_toggle'),
     $SIDEBAR_MENU = $('#sidebar-menu'),
@@ -241,4 +241,4 @@ if (typeof NProgress != 'undefined') {
     $(window).load(function () {
         NProgress.done();
     });
-}
+}

vendors/bootstrap/dist/css/bootstrap-theme.css

@@ -1,6 +1,6 @@
 /*!
- * Bootstrap v3.3.6 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 .btn-default,