fix(grid): add _grid.scss and move over flex grid for precedence (#1242)

carbon-design-system · May 18, 2022 · 4d3c1ad · 4d3c1ad
1 parent 374476c
commit 4d3c1ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/gatsby-theme-carbon/src/styles/internal/_global.scss b/packages/gatsby-theme-carbon/src/styles/internal/_global.scss
@@ -1,4 +1,4 @@
-@use '@carbon/grid/scss/flex-grid';
+@use 'grid';
 @use '@carbon/react/scss/type';
 @use '@carbon/react/scss/colors' as *;
 @use '@carbon/react/scss/compat/theme' as *;
@@ -11,7 +11,6 @@
 
 @use 'plex';
 
-@include flex-grid.flex-grid();
 @include type.reset();
 
 //---------------------------------------

diff --git a/packages/gatsby-theme-carbon/src/styles/internal/_grid.scss b/packages/gatsby-theme-carbon/src/styles/internal/_grid.scss
@@ -0,0 +1,3 @@
+@use '@carbon/grid/scss/flex-grid';
+
+@include flex-grid.flex-grid();
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		@use '@carbon/grid/scss/flex-grid';

		@include flex-grid.flex-grid();