Bläddra i källkod

Refactor SCSS main files. (#2791)

XhmikosR 4 år sedan
förälder
incheckning
74cccca8a1

+ 2 - 0
build/scss/AdminLTE-raw.scss → build/scss/_adminlte.raw.scss

@@ -4,6 +4,7 @@
  *   Website: AdminLTE.io <https://adminlte.io>
  *   License: Open source - MIT <https://opensource.org/licenses/MIT>
  */
+
 //
 // ------------------------------------------------------------------
 // This file is to be included in your custom SCSS. Before importing
@@ -12,6 +13,7 @@
 // ok to import this file without custom variables too!
 // NOTE: be sure to keep the license notice in the generated css.
 // ------------------------------------------------------------------
+
 //
 // Variables and Mixins
 // ---------------------------------------------------

+ 1 - 1
build/scss/AdminLTE.scss → build/scss/adminlte.scss

@@ -4,6 +4,7 @@
  *   Website: AdminLTE.io <https://adminlte.io>
  *   License: Open source - MIT <https://opensource.org/licenses/MIT>
  */
+
 // Bootstrap
 // ---------------------------------------------------
 @import "~bootstrap/scss/functions";
@@ -21,4 +22,3 @@
 @import "parts/pages";
 @import "parts/plugins";
 @import "parts/miscellaneous";
-

+ 5 - 5
build/scss/AdminLTE-components.scss → build/scss/parts/adminlte.components.scss

@@ -5,16 +5,16 @@
  *   Website: AdminLTE.io <https://adminlte.io>
  *   License: Open source - MIT <https://opensource.org/licenses/MIT>
  */
+
 // Bootstrap
 // ---------------------------------------------------
 @import "~bootstrap/scss/functions";
-@import "bootstrap-variables";
+@import "../bootstrap-variables";
 @import "~bootstrap/scss/mixins";
-// @import '~bootstrap/scss/bootstrap';
 
 // Variables and Mixins
 // ---------------------------------------------------
-@import "variables";
-@import "mixins";
+@import "../variables";
+@import "../mixins";
 
-@import "parts/components";
+@import "components";

+ 6 - 5
build/scss/AdminLTE-core.scss → build/scss/parts/adminlte.core.scss

@@ -5,16 +5,17 @@
  *   Website: AdminLTE.io <https://adminlte.io>
  *   License: Open source - MIT <https://opensource.org/licenses/MIT>
  */
+
 // Bootstrap
 // ---------------------------------------------------
 @import "~bootstrap/scss/functions";
-@import "bootstrap-variables";
+@import "../bootstrap-variables";
 @import "~bootstrap/scss/bootstrap";
 
 // Variables and Mixins
 // ---------------------------------------------------
-@import "variables";
-@import "mixins";
+@import "../variables";
+@import "../mixins";
 
-@import "parts/core";
-@import "parts/miscellaneous";
+@import "core";
+@import "miscellaneous";

+ 5 - 5
build/scss/AdminLTE-extra-components.scss → build/scss/parts/adminlte.extra-components.scss

@@ -5,16 +5,16 @@
  *   Website: AdminLTE.io <https://adminlte.io>
  *   License: Open source - MIT <https://opensource.org/licenses/MIT>
  */
+
 // Bootstrap
 // ---------------------------------------------------
 @import "~bootstrap/scss/functions";
-@import "bootstrap-variables";
+@import "../bootstrap-variables";
 @import "~bootstrap/scss/mixins";
-// @import '~bootstrap/scss/bootstrap';
 
 // Variables and Mixins
 // ---------------------------------------------------
-@import "variables";
-@import "mixins";
+@import "../variables";
+@import "../mixins";
 
-@import "parts/extra-components";
+@import "extra-components";

+ 5 - 4
build/scss/AdminLTE-pages.scss → build/scss/parts/adminlte.pages.scss

@@ -5,16 +5,17 @@
  *   Website: AdminLTE.io <https://adminlte.io>
  *   License: Open source - MIT <https://opensource.org/licenses/MIT>
  */
+
 // Bootstrap
 // ---------------------------------------------------
 @import "~bootstrap/scss/functions";
-@import "bootstrap-variables";
+@import "../bootstrap-variables";
 @import "~bootstrap/scss/mixins";
 @import "~bootstrap/scss/close";
 
 // Variables and Mixins
 // ---------------------------------------------------
-@import "variables";
-@import "mixins";
+@import "../variables";
+@import "../mixins";
 
-@import "parts/pages";
+@import "pages";

+ 5 - 5
build/scss/AdminLTE-plugins.scss → build/scss/parts/adminlte.plugins.scss

@@ -5,16 +5,16 @@
  *   Website: AdminLTE.io <https://adminlte.io>
  *   License: Open source - MIT <https://opensource.org/licenses/MIT>
  */
+
 // Bootstrap
 // ---------------------------------------------------
 @import "~bootstrap/scss/functions";
-@import "bootstrap-variables";
+@import "../bootstrap-variables";
 @import "~bootstrap/scss/mixins";
-// @import '~bootstrap/scss/bootstrap';
 
 // Variables and Mixins
 // ---------------------------------------------------
-@import "variables";
-@import "mixins";
+@import "../variables";
+@import "../mixins";
 
-@import "parts/plugins";
+@import "plugins";

+ 3 - 8
package.json

@@ -10,13 +10,8 @@
     "css": "npm-run-all --sequential css-compile css-prefix css-minify",
     "css-all": "npm-run-all --sequential css-compile css-compile-splits css-prefix css-prefix-splits css-minify css-minify-splits",
     "css-compile-bash": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js --output-style expanded --source-map true --source-map-contents true --precision 6 ",
-    "css-compile": "npm run css-compile-bash -- build/scss/AdminLTE.scss dist/css/adminlte.css",
-    "css-compile-splits": "npm-run-all --sequential css-compile:core css-compile:components css-compile:extra-components css-compile:pages css-compile:plugins",
-    "css-compile:core": "npm run css-compile-bash -- build/scss/AdminLTE-core.scss dist/css/alt/adminlte.core.css",
-    "css-compile:components": "npm run css-compile-bash -- build/scss/AdminLTE-components.scss dist/css/alt/adminlte.components.css",
-    "css-compile:extra-components": "npm run css-compile-bash -- build/scss/AdminLTE-extra-components.scss dist/css/alt/adminlte.extra-components.css",
-    "css-compile:pages": "npm run css-compile-bash -- build/scss/AdminLTE-pages.scss dist/css/alt/adminlte.pages.css",
-    "css-compile:plugins": "npm run css-compile-bash -- build/scss/AdminLTE-plugins.scss dist/css/alt/adminlte.plugins.css",
+    "css-compile": "npm run css-compile-bash -- build/scss/adminlte.scss dist/css/adminlte.css",
+    "css-compile-splits": "npm run css-compile-bash -- build/scss/parts -o dist/css/alt/",
     "css-prefix": "postcss --config build/config/postcss.config.js --replace \"dist/css/*.css\" \"!dist/css/*.min.css\"",
     "css-prefix-splits": "postcss --config build/config/postcss.config.js --replace \"dist/css/alt/*.css\" \"!dist/css/alt/*.min.css\"",
     "css-minify-bash": "cleancss --level 1 --format breakWith=lf --source-map --source-map-inline-sources --output ",
@@ -63,7 +58,7 @@
   ],
   "homepage": "https://adminlte.io",
   "style": "dist/css/adminlte.css",
-  "sass": "build/scss/AdminLTE.scss",
+  "sass": "build/scss/adminlte.scss",
   "repository": {
     "type": "git",
     "url": "git://github.com/ColorlibHQ/AdminLTE.git"