fix(styles): don't import and use carbon themes in styles.scss

carbon-design-system · Jan 31, 2020 · 1da8b3e · 1da8b3e
1 parent c880bd2
commit 1da8b3e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/packages/core/build.sh b/packages/core/build.sh
@@ -8,8 +8,8 @@ cp *.md dist/
 cp package.json dist/
 cp -a src/styles/. dist/styles
 
-sass --load-path ../../node_modules dist/styles/styles.scss dist/styles.css
-sass --load-path ../../node_modules dist/styles/styles.scss dist/styles.min.css --style=compressed
+sass --load-path ../../node_modules dist/styles/base-theme.scss dist/styles.css
+sass --load-path ../../node_modules dist/styles/base-theme.scss dist/styles.min.css --style=compressed
 
 sass --load-path ../../node_modules dist/styles/styles-g10.scss dist/styles-g10.css
 sass --load-path ../../node_modules dist/styles/styles-g10.scss dist/styles-g10.min.css --style=compressed

diff --git a/packages/core/src/styles/base-theme.scss b/packages/core/src/styles/base-theme.scss
@@ -0,0 +1,5 @@
+// Carbon theme initializations
+@import "./vendor/@carbon/themes/scss/themes";
+@include carbon--theme();
+
+@import "./styles.scss";
diff --git a/packages/core/src/styles/styles-g10.scss b/packages/core/src/styles/styles-g10.scss
@@ -1,4 +1,4 @@
 @import "./vendor/@carbon/themes/scss/themes";
 
 $carbon--theme: $carbon--theme--g10;
-@import "./styles";
+@import "./base-theme";
diff --git a/packages/core/src/styles/styles-g100.scss b/packages/core/src/styles/styles-g100.scss
@@ -1,4 +1,4 @@
 @import "./vendor/@carbon/themes/scss/themes";
 
 $carbon--theme: $carbon--theme--g100;
-@import "./styles";
+@import "./base-theme";
diff --git a/packages/core/src/styles/styles-g90.scss b/packages/core/src/styles/styles-g90.scss
@@ -1,4 +1,4 @@
 @import "./vendor/@carbon/themes/scss/themes";
 
 $carbon--theme: $carbon--theme--g90;
-@import "./styles";
+@import "./base-theme";
diff --git a/packages/core/src/styles/styles.scss b/packages/core/src/styles/styles.scss
@@ -3,9 +3,6 @@ $charts-prefix: "cc";
 
 // Carbon imports
 @import "./vendor/@carbon/colors/scss/colors";
-// Carbon theme initializations
-@import "./vendor/@carbon/themes/scss/themes";
-@include carbon--theme();
 
 // Internal
 @import "./mixins.scss";