Merge pull request #3 from cqliu1/dashboard/gridstack-storybook-poc

Moved new grid scss files.
Heenawter · Jun 15, 2022 · de24fe1 · de24fe1
2 parents 72bc0af + 257c653
commit de24fe1
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/src/plugins/dashboard/.storybook/preview.js b/src/plugins/dashboard/.storybook/preview.js
@@ -7,5 +7,4 @@
  */
 
 import '../../../../node_modules/gridstack/dist/gridstack.min.css';
-import './demo.css';
-import './extra-columns.scss';
+import '../public/application/index.scss';
diff --git a/...s/dashboard/.storybook/extra-columns.scss → ...le/new_dashboard_grid/_extra_columns.scss b/...s/dashboard/.storybook/extra-columns.scss → ...le/new_dashboard_grid/_extra_columns.scss
diff --git a/src/plugins/dashboard/.storybook/demo.css → .../embeddable/new_dashboard_grid/_grid.scss b/src/plugins/dashboard/.storybook/demo.css → .../embeddable/new_dashboard_grid/_grid.scss
diff --git a/src/plugins/dashboard/public/application/embeddable/new_dashboard_grid/_index.scss b/src/plugins/dashboard/public/application/embeddable/new_dashboard_grid/_index.scss
@@ -0,0 +1,2 @@
+@import './_grid';
+@import './_extra_columns'
diff --git a/src/plugins/dashboard/public/application/index.scss b/src/plugins/dashboard/public/application/index.scss
@@ -1,6 +1,7 @@
 @import '../../../embeddable/public/variables';
 
 @import './embeddable/grid/index';
+@import './embeddable/new_dashboard_grid/index';
 @import './embeddable/panel/index';
 @import './embeddable/viewport/index';