Bläddra i källkod

Merge pull request #2120 from REJack/v3-dev

some little changes
Raphael Jackstadt 5 år sedan
förälder
incheckning
0cb792e529
8 ändrade filer med 24 tillägg och 17 borttagningar
  1. 4 4
      README.md
  2. 9 5
      build/js/Layout.js
  3. 2 3
      composer.json
  4. 5 1
      dist/js/adminlte.js
  5. 0 0
      dist/js/adminlte.js.map
  6. 1 1
      dist/js/adminlte.min.js
  7. 0 0
      dist/js/adminlte.min.js.map
  8. 3 3
      package.json

+ 4 - 4
README.md

@@ -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
@@ -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
 -------------

+ 9 - 5
build/js/Layout.js

@@ -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 = {
@@ -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'))
       } 
     }
 

+ 2 - 3
composer.json

@@ -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"
   }
 }

+ 5 - 1
dist/js/adminlte.js

@@ -1,6 +1,6 @@
 /*!
  * 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)
  */
 (function (global, factory) {
@@ -202,6 +202,7 @@ var Layout = function ($) {
   var ClassName = {
     HOLD: 'hold-transition',
     SIDEBAR: 'main-sidebar',
+    CONTENT_FIXED: 'content-fixed',
     LAYOUT_FIXED: 'layout-fixed',
     NAVBAR_FIXED: 'layout-navbar-fixed',
     FOOTER_FIXED: 'layout-footer-fixed'
@@ -277,6 +278,9 @@ var Layout = function ($) {
       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'));
+      }
     };
 
     // Private

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/adminlte.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/js/adminlte.min.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/adminlte.min.js.map


+ 3 - 3
package.json

@@ -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",
@@ -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",

Vissa filer visades inte eftersom för många filer har ändrats