Merge branch 'master' of https://github.com/ColorlibHQ/AdminLTE

.bundlewatch.config.json

@@ -2,11 +2,11 @@
   "files": [
     {
       "path": "./dist/css/adminlte.css",
-      "maxSize": "84.5 kB"
+      "maxSize": "89.5 kB"
     },
     {
       "path": "./dist/css/adminlte.min.css",
-      "maxSize": "80.9 kB"
+      "maxSize": "84.9 kB"
     },
     {
       "path": "./dist/css/alt/adminlte.components.css",
@@ -18,11 +18,11 @@
     },
     {
       "path": "./dist/css/alt/adminlte.core.css",
-      "maxSize": "49.4 kB"
+      "maxSize": "54.4 kB"
     },
     {
       "path": "./dist/css/alt/adminlte.core.min.css",
-      "maxSize": "46.3 kB"
+      "maxSize": "50.8 kB"
     },
     {
       "path": "./dist/css/alt/adminlte.extra-components.css",
@@ -50,7 +50,7 @@
     },
     {
       "path": "./dist/js/adminlte.js",
-      "maxSize": "15 kB"
+      "maxSize": "15.7 kB"
     },
     {
       "path": "./dist/js/adminlte.min.js",

docs/_config.yml

@@ -85,6 +85,9 @@ navigation:
   - title: Upgrade Guide
     url: upgrade-guide.html
     icon: fas fa-hand-point-up
+  - title: Contributing Guide
+    url: contributing.html
+    icon: fas fa-hands-helping
   - title: FAQ
     url: faq.html
     icon: fas fa-question-circle

docs/contributing.md

@@ -0,0 +1,47 @@
+---
+layout: page
+title: Contributing Guide
+---
+
+Contributions are always **welcome and recommended**! Here is how for beginner's: [Get started with open source click here](https://youtu.be/GbqSvJs-6W4)
+
+1. Contribution Requirements : 
+    * When you contribute, you agree to give a non-exclusive license to AdminLTE.io to use that contribution in any context as we (AdminLTE.io) see appropriate. 
+    * If you use content provided by another party, it must be appropriately licensed using an [open source](https://opensource.org/licenses) license.
+    * Contributions are only accepted through GitHub pull requests.
+    * Finally, contributed code must work in all supported browsers (see above for browser support).
+2. Installation :
+    * Fork the repository ([here is the guide](https://help.github.com/articles/fork-a-repo/)).
+    * Clone to your machine
+
+    ```bash
+    git clone https://github.com/YOUR_USERNAME/AdminLTE.git
+    ```
+    * Create a new branch
+3. Compile dist files (Development) :
+    * To compile the dist files you need Node.js 10 or higher/npm (node package manager)
+    * Delete ./package-lock.json file
+    * `npm install` (install npm deps)
+    * `npm run dev` (developer mode, autocompile with browsersync support for live demo)
+    * Make your changes only in ./buid Folder OR package.json OR ./dist/js/demo.js OR in any html files which nessary to contribute
+    * Do not changes in ./dist/css/ AND ./dist/js/ Because its compiled files
+    * `npm run production` (compile css/js files and test every pages are perfectly working fine, before creating pull request)
+4. Create a pull request
+
+### Online one-click setup for contributing
+
+You can use Gitpod(an online IDE which is free for Open Source) for working on issues or making Prs. With a single click it will launch a workspace and automatically:
+
+- clone the `AdminLTE` repo.
+- install the dependencies.
+- run `yarn dev` to start the server.
+
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/from-referrer/)
+
+### Compile dist files
+
+To compile the dist files you need Node.js/npm, clone/download the repo then:
+
+1. `npm install` (install npm deps)
+2. _Optional:_ `npm run dev` (developer mode, autocompile with browsersync support for live demo)
+3. `npm run production` (compile css/js files)

docs/dependencies.md

@@ -8,9 +8,9 @@ title: Dependencies & Plugins
 AdminLTE depends on two main frameworks. The downloadable package contains both of these libraries, so you don't have to manually download them.
 {: .lead}
 
-- [Bootstrap 4](https://getbootstrap.com/)
+- [Bootstrap 4.5](https://getbootstrap.com/)
-- [jQuery 3.3.1+](https://jquery.com/)
+- [jQuery 3.5.1+](https://jquery.com/)
-- [Popper.js 1.14.7+](https://popper.js.org/)
+- [Popper.js 1.16.1+](https://popper.js.org/)
 - [All other plugins are listed below](#plugins)
 
 #### Plugins

docs/index.md

@@ -38,3 +38,7 @@ composer require "almasaeed2010/adminlte=~3.0"
 ```bash
 git clone https://github.com/ColorlibHQ/AdminLTE.git
 ```
+
+### From CDN
+
+[https://www.jsdelivr.com/package/npm/admin-lte](https://www.jsdelivr.com/package/npm/admin-lte)

docs/layout.md

@@ -21,7 +21,7 @@ The layout consists of four major parts:
 > You cannot use both layout-boxed and layout-navbar-fixed or layout-footer-fixed at the same time. Anything else can be mixed together.
 {: .quote-danger}
 
-AdminLTE 3.0 provides a set of options to apply to your main layout. Each one of these classes can be added to the body tag to get the desired goal.
+AdminLTE 3.1 provides a set of options to apply to your main layout. Each one of these classes can be added to the body tag to get the desired goal.
 
 - Fixed Sidebar: use the class `.layout-fixed` to get a fixed sidebar.
 - Fixed Navbar: use the class `.layout-navbar-fixed` to get a fixed navbar.
@@ -51,7 +51,7 @@ You can also use the following classes for responsive changes with placing
 
 #### Color Variations
 
-AdminLTE 3.0 provides a set of color variations to apply to your sidebar (light & dark) & navbar. You can combine any available color with these class prefixes:
+AdminLTE 3.1 provides a set of color variations to apply to your sidebar (light & dark) & navbar. You can combine any available color with these class prefixes:
 
 - `.navbar-*`
 - `.sidebar-dark-*`

package.json

@@ -84,7 +84,7 @@
     "datatables.net-autofill-bs4": "^2.3.5",
     "datatables.net-bs4": "^1.10.22",
     "datatables.net-buttons-bs4": "^1.6.5",
-    "datatables.net-colreorder-bs4": "^1.5.2",
+    "datatables.net-colreorder-bs4": "^1.5.3",
     "datatables.net-fixedcolumns-bs4": "^3.3.2",
     "datatables.net-fixedheader-bs4": "^3.1.7",
     "datatables.net-keytable-bs4": "^2.5.3",
@@ -92,7 +92,7 @@
     "datatables.net-rowgroup-bs4": "^1.1.2",
     "datatables.net-rowreorder-bs4": "^1.2.7",
     "datatables.net-scroller-bs4": "^2.0.3",
-    "datatables.net-searchpanes-bs4": "^1.2.1",
+    "datatables.net-searchpanes-bs4": "^1.2.2",
     "datatables.net-select-bs4": "^1.3.1",
     "daterangepicker": "^3.1.0",
     "dropzone": "^5.7.2",
@@ -123,20 +123,20 @@
     "select2": "^4.0.13",
     "sparklines": "^1.3.0",
     "summernote": "^0.8.18",
-    "sweetalert2": "^10.10.2",
+    "sweetalert2": "^10.12.0",
     "tempusdominus-bootstrap-4": "^5.39.0",
     "toastr": "^2.1.4",
-    "uplot": "^1.4.6"
+    "uplot": "^1.4.7"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",
     "@babel/preset-env": "^7.12.7",
-    "@rollup/plugin-babel": "^5.2.1",
+    "@rollup/plugin-babel": "^5.2.2",
-    "autoprefixer": "^9.8.6",
+    "autoprefixer": "^10.0.4",
     "browser-sync": "^2.26.13",
     "bundlewatch": "^0.3.1",
     "clean-css-cli": "^4.3.0",
-    "eslint": "^7.14.0",
+    "eslint": "^7.15.0",
     "eslint-config-xo": "^0.33.1",
     "eslint-plugin-compat": "^3.8.0",
     "eslint-plugin-import": "^2.22.1",
@@ -145,7 +145,8 @@
     "node-sass-package-importer": "^5.3.2",
     "nodemon": "^2.0.6",
     "npm-run-all": "^4.1.5",
-    "postcss-cli": "^7.1.2",
+    "postcss": "^8.1.10",
+    "postcss-cli": "^8.3.0",
     "rollup": "^2.34.0",
     "stylelint": "^13.8.0",
     "stylelint-config-twbs-bootstrap": "^2.1.0",