Merge pull request #2120 from REJack/v3-dev

some little changes
pull/2063/head
Raphael Jackstadt 2019-06-06 14:35:31 +02:00 committed by GitHub
commit 0cb792e529
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 27 additions and 20 deletions

View File

@ -35,7 +35,7 @@ npm install admin-lte
- Clone to your machine - Clone to your machine
``` ```
git clone https://github.com/almasaeed2010/AdminLTE.git git clone https://github.com/ColorlibHQ/AdminLTE.git
``` ```
Documentation Documentation
@ -75,12 +75,12 @@ reserves the right to change the license of future releases.
Legacy Releases Legacy Releases
--------------- ---------------
- [AdminLTE 2](https://github.com/almasaeed2010/AdminLTE/releases/tag/v2.4.3) - [AdminLTE 2](https://github.com/ColorlibHQ/AdminLTE/releases/tag/v2.4.3)
- [AdminLTE 1](https://github.com/almasaeed2010/AdminLTE/releases/tag/1.3.1) - [AdminLTE 1](https://github.com/ColorlibHQ/AdminLTE/releases/tag/1.3.1)
Change log 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 Image Credits
------------- -------------

View File

@ -33,11 +33,12 @@ const Layout = (($) => {
} }
const ClassName = { const ClassName = {
HOLD : 'hold-transition', HOLD : 'hold-transition',
SIDEBAR : 'main-sidebar', SIDEBAR : 'main-sidebar',
LAYOUT_FIXED: 'layout-fixed', CONTENT_FIXED: 'content-fixed',
NAVBAR_FIXED: 'layout-navbar-fixed', LAYOUT_FIXED : 'layout-fixed',
FOOTER_FIXED: 'layout-footer-fixed', NAVBAR_FIXED : 'layout-navbar-fixed',
FOOTER_FIXED : 'layout-footer-fixed',
} }
const Default = { const Default = {
@ -108,6 +109,9 @@ const Layout = (($) => {
} }
if ($('body').hasClass(ClassName.FOOTER_FIXED)) { if ($('body').hasClass(ClassName.FOOTER_FIXED)) {
$(Selector.CONTENT).css('margin-bottom', heights.footer) $(Selector.CONTENT).css('margin-bottom', heights.footer)
}
if ($('body').hasClass(ClassName.CONTENT_FIXED)) {
$(Selector.CONTENT).css('height', $(Selector.CONTENT).css('min-height'))
} }
} }

View File

@ -15,12 +15,11 @@
], ],
"authors": [ "authors": [
{ {
"name": "Abdullah Almsaeed", "name": "Colorlib"
"email": "support@adminlte.io"
} }
], ],
"license": "MIT", "license": "MIT",
"support": { "support": {
"issues": "https://github.com/almasaeed2010/AdminLTE/issues" "issues": "https://github.com/ColorlibHQ/AdminLTE/issues"
} }
} }

6
dist/js/adminlte.js vendored
View File

@ -1,6 +1,6 @@
/*! /*!
* AdminLTE v3.0.0-beta.1 (https://adminlte.io) * AdminLTE v3.0.0-beta.1 (https://adminlte.io)
* Copyright 2014-2019 Abdullah Almsaeed <abdullah@almsaeedstudio.com> * Copyright 2014-2019 Colorlib <http://colorlib.com>
* Licensed under MIT (https://github.com/almasaeed2010/AdminLTE/blob/master/LICENSE) * Licensed under MIT (https://github.com/almasaeed2010/AdminLTE/blob/master/LICENSE)
*/ */
(function (global, factory) { (function (global, factory) {
@ -202,6 +202,7 @@ var Layout = function ($) {
var ClassName = { var ClassName = {
HOLD: 'hold-transition', HOLD: 'hold-transition',
SIDEBAR: 'main-sidebar', SIDEBAR: 'main-sidebar',
CONTENT_FIXED: 'content-fixed',
LAYOUT_FIXED: 'layout-fixed', LAYOUT_FIXED: 'layout-fixed',
NAVBAR_FIXED: 'layout-navbar-fixed', NAVBAR_FIXED: 'layout-navbar-fixed',
FOOTER_FIXED: 'layout-footer-fixed' FOOTER_FIXED: 'layout-footer-fixed'
@ -277,6 +278,9 @@ var Layout = function ($) {
if ($('body').hasClass(ClassName.FOOTER_FIXED)) { if ($('body').hasClass(ClassName.FOOTER_FIXED)) {
$(Selector.CONTENT).css('margin-bottom', heights.footer); $(Selector.CONTENT).css('margin-bottom', heights.footer);
} }
if ($('body').hasClass(ClassName.CONTENT_FIXED)) {
$(Selector.CONTENT).css('height', $(Selector.CONTENT).css('min-height'));
}
}; };
// Private // Private

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

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