Skip to content

Commit

Permalink
Merge pull request #2120 from REJack/v3-dev
Browse files Browse the repository at this point in the history
some little changes
  • Loading branch information
REJack committed Jun 6, 2019
2 parents 96dc774 + 2c7fa65 commit 0cb792e
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 20 deletions.
8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -35,7 +35,7 @@ npm install admin-lte

- Clone to your machine
```
git clone https://github.com/almasaeed2010/AdminLTE.git
git clone https://github.com/ColorlibHQ/AdminLTE.git
```

Documentation
Expand Down Expand Up @@ -75,12 +75,12 @@ reserves the right to change the license of future releases.

Legacy Releases
---------------
- [AdminLTE 2](https://github.com/almasaeed2010/AdminLTE/releases/tag/v2.4.3)
- [AdminLTE 1](https://github.com/almasaeed2010/AdminLTE/releases/tag/1.3.1)
- [AdminLTE 2](https://github.com/ColorlibHQ/AdminLTE/releases/tag/v2.4.3)
- [AdminLTE 1](https://github.com/ColorlibHQ/AdminLTE/releases/tag/1.3.1)

Change log
----------
Visit the [releases](https://github.com/almasaeed2010/AdminLTE/releases) page to view the changelog
Visit the [releases](https://github.com/ColorlibHQ/AdminLTE/releases) page to view the changelog

Image Credits
-------------
Expand Down
14 changes: 9 additions & 5 deletions build/js/Layout.js
Expand Up @@ -33,11 +33,12 @@ const Layout = (($) => {
}

const ClassName = {
HOLD : 'hold-transition',
SIDEBAR : 'main-sidebar',
LAYOUT_FIXED: 'layout-fixed',
NAVBAR_FIXED: 'layout-navbar-fixed',
FOOTER_FIXED: 'layout-footer-fixed',
HOLD : 'hold-transition',
SIDEBAR : 'main-sidebar',
CONTENT_FIXED: 'content-fixed',
LAYOUT_FIXED : 'layout-fixed',
NAVBAR_FIXED : 'layout-navbar-fixed',
FOOTER_FIXED : 'layout-footer-fixed',
}

const Default = {
Expand Down Expand Up @@ -108,6 +109,9 @@ const Layout = (($) => {
}
if ($('body').hasClass(ClassName.FOOTER_FIXED)) {
$(Selector.CONTENT).css('margin-bottom', heights.footer)
}
if ($('body').hasClass(ClassName.CONTENT_FIXED)) {
$(Selector.CONTENT).css('height', $(Selector.CONTENT).css('min-height'))
}
}

Expand Down
5 changes: 2 additions & 3 deletions composer.json
Expand Up @@ -15,12 +15,11 @@
],
"authors": [
{
"name": "Abdullah Almsaeed",
"email": "support@adminlte.io"
"name": "Colorlib"
}
],
"license": "MIT",
"support": {
"issues": "https://github.com/almasaeed2010/AdminLTE/issues"
"issues": "https://github.com/ColorlibHQ/AdminLTE/issues"
}
}
6 changes: 5 additions & 1 deletion dist/js/adminlte.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/adminlte.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/js/adminlte.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/adminlte.min.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -3,7 +3,7 @@
"description": "Responsive open source admin dashboard and control panel.",
"version": "3.0.0-beta.1",
"license": "MIT",
"author": "Abdullah Almsaeed <abdullah@almsaeedstudio.com>",
"author": "Colorlib <http://colorlib.com>",
"main": "dist/js/adminlte.min.js",
"scripts": {
"css": "npm-run-all --sequential css-compile css-prefix css-minify",
Expand Down Expand Up @@ -38,10 +38,10 @@
"sass": "build/scss/AdminLTE.scss",
"repository": {
"type": "git",
"url": "git://github.com/almasaeed2010/AdminLTE.git"
"url": "git://github.com/ColorlibHQ/AdminLTE.git"
},
"bugs": {
"url": "https://github.com/almasaeed2010/AdminLTE/issues"
"url": "https://github.com/ColorlibHQ/AdminLTE/issues"
},
"dependencies": {
"@ckeditor/ckeditor5-build-classic": "^1.0.0-beta.4",
Expand Down

0 comments on commit 0cb792e

Please sign in to comment.