From 803f6398755c55f24709fee58c44ded35adc81ed Mon Sep 17 00:00:00 2001 From: Alex Scott Date: Mon, 15 Feb 2021 14:59:10 +0100 Subject: [PATCH 1/3] Build from styles and not from theme. --- package.json | 4 ++-- src/styles/scss/index.scss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index ebe38f19..583807ac 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,9 @@ "author": "CivicActions ", "license": "GPL-3.0", "scripts": { - "css:watch": "node-sass --omit-source-map-url src/theme/styles/index.scss dist/index.css -w", + "css:watch": "node-sass --omit-source-map-url src/styles/scss/index.scss dist/index.css -w", "lib:watch": "babel src -d lib --watch", - "lib": "npm run clean && babel src -d lib && node-sass --omit-source-map-url src/theme/styles/index.scss dist/index.css && cp -R src/styles/scss dist/", + "lib": "npm run clean && babel src -d lib && node-sass --omit-source-map-url src/styles/scss/index.scss dist/index.css && cp -R src/styles/scss dist/", "clean": "rm -rf lib && mkdir lib && rm -rf dist && mkdir dist", "prepublish": "npm run lib", "storybook": "NODE_PATH=src start-storybook -p 6006", diff --git a/src/styles/scss/index.scss b/src/styles/scss/index.scss index e275fc56..c4969e27 100644 --- a/src/styles/scss/index.scss +++ b/src/styles/scss/index.scss @@ -1,8 +1,8 @@ -@import "../../../../bootstrap/scss/bootstrap.scss"; +//@import url(~bootstrap/dist/css/bootstrap.min.css); @import "./layout/footer.scss"; @import "./layout/general.scss"; @import "./layout/header.scss"; @import "./layout/menu.scss"; @import "./layout/navbar.scss"; @import "./layout/hero.scss"; -@import "./layout/iconlist.scss"; \ No newline at end of file +@import "./layout/iconlist.scss"; From b49a17466805808d24cc2b8e21e23d96e4f5a25b Mon Sep 17 00:00:00 2001 From: Alex Scott Date: Mon, 15 Feb 2021 15:50:17 +0100 Subject: [PATCH 2/3] Remove legacy theme directory. --- src/theme/styles/index.scss | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 src/theme/styles/index.scss diff --git a/src/theme/styles/index.scss b/src/theme/styles/index.scss deleted file mode 100644 index a838599c..00000000 --- a/src/theme/styles/index.scss +++ /dev/null @@ -1,10 +0,0 @@ -@import '~bootstrap/dist/css/bootstrap.min.css'; - -// Component styles. -@import "../../components/DataTable/ManageColumns/card.scss"; -@import "../../components/Menu/menu.scss"; -@import "../../components/Modal/modal.scss"; - -// Template styles. -@import "../../templates/DataTableHeader/datatableheader.scss"; -@import "../../templates/Hero/hero.scss"; From a86df0715bde3d580ea7fb0f068ebf1688ad70b3 Mon Sep 17 00:00:00 2001 From: Alex Scott Date: Thu, 18 Feb 2021 17:49:28 +0100 Subject: [PATCH 3/3] Ensure that boostrap is enabled! --- src/styles/scss/index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/scss/index.scss b/src/styles/scss/index.scss index c4969e27..13aabab0 100644 --- a/src/styles/scss/index.scss +++ b/src/styles/scss/index.scss @@ -1,4 +1,4 @@ -//@import url(~bootstrap/dist/css/bootstrap.min.css); +@import '~bootstrap/dist/css/bootstrap.min.css'; @import "./layout/footer.scss"; @import "./layout/general.scss"; @import "./layout/header.scss";