diff --git a/build/scss/AdminLTE-raw.scss b/build/scss/_adminlte.raw.scss similarity index 99% rename from build/scss/AdminLTE-raw.scss rename to build/scss/_adminlte.raw.scss index a7be33197..4c17754e2 100644 --- a/build/scss/AdminLTE-raw.scss +++ b/build/scss/_adminlte.raw.scss @@ -4,6 +4,7 @@ * Website: AdminLTE.io * License: Open source - 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 // --------------------------------------------------- diff --git a/build/scss/AdminLTE.scss b/build/scss/adminlte.scss similarity index 100% rename from build/scss/AdminLTE.scss rename to build/scss/adminlte.scss index 3d597074b..b101cdbe7 100644 --- a/build/scss/AdminLTE.scss +++ b/build/scss/adminlte.scss @@ -4,6 +4,7 @@ * Website: AdminLTE.io * License: Open source - MIT */ + // Bootstrap // --------------------------------------------------- @import "~bootstrap/scss/functions"; @@ -21,4 +22,3 @@ @import "parts/pages"; @import "parts/plugins"; @import "parts/miscellaneous"; - diff --git a/build/scss/AdminLTE-components.scss b/build/scss/parts/adminlte.components.scss similarity index 75% rename from build/scss/AdminLTE-components.scss rename to build/scss/parts/adminlte.components.scss index 9f93401e3..dee5da8af 100644 --- a/build/scss/AdminLTE-components.scss +++ b/build/scss/parts/adminlte.components.scss @@ -5,16 +5,16 @@ * Website: AdminLTE.io * License: Open source - 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"; diff --git a/build/scss/AdminLTE-core.scss b/build/scss/parts/adminlte.core.scss similarity index 77% rename from build/scss/AdminLTE-core.scss rename to build/scss/parts/adminlte.core.scss index 90f0591ac..c3b9e0798 100644 --- a/build/scss/AdminLTE-core.scss +++ b/build/scss/parts/adminlte.core.scss @@ -5,16 +5,17 @@ * Website: AdminLTE.io * License: Open source - 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"; diff --git a/build/scss/AdminLTE-extra-components.scss b/build/scss/parts/adminlte.extra-components.scss similarity index 74% rename from build/scss/AdminLTE-extra-components.scss rename to build/scss/parts/adminlte.extra-components.scss index ce612e479..7cd1414a6 100644 --- a/build/scss/AdminLTE-extra-components.scss +++ b/build/scss/parts/adminlte.extra-components.scss @@ -5,16 +5,16 @@ * Website: AdminLTE.io * License: Open source - 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"; diff --git a/build/scss/AdminLTE-pages.scss b/build/scss/parts/adminlte.pages.scss similarity index 82% rename from build/scss/AdminLTE-pages.scss rename to build/scss/parts/adminlte.pages.scss index e2cbcc9c9..b87018ac8 100644 --- a/build/scss/AdminLTE-pages.scss +++ b/build/scss/parts/adminlte.pages.scss @@ -5,16 +5,17 @@ * Website: AdminLTE.io * License: Open source - 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"; diff --git a/build/scss/AdminLTE-plugins.scss b/build/scss/parts/adminlte.plugins.scss similarity index 75% rename from build/scss/AdminLTE-plugins.scss rename to build/scss/parts/adminlte.plugins.scss index 41bb866c7..4246b463e 100644 --- a/build/scss/AdminLTE-plugins.scss +++ b/build/scss/parts/adminlte.plugins.scss @@ -5,16 +5,16 @@ * Website: AdminLTE.io * License: Open source - 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"; diff --git a/package.json b/package.json index 12339816d..b7e765268 100644 --- a/package.json +++ b/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"