Skip to content

Commit

Permalink
Merge pull request #440 from material-components/import/variable-theme
Browse files Browse the repository at this point in the history
  • Loading branch information
emeaguiar committed Aug 27, 2022
2 parents e6f7429 + da78686 commit 3684aa5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions plugin/assets/css/src/material-components.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
@import "@material/layout-grid/dist/mdc.layout-grid.css";
@import "@material/tab-bar/dist/mdc.tab-bar.css";
@import "@material/tab-scroller/dist/mdc.tab-scroller.css";
@import "./components/card.css";
@import "./components/image-card.css";
@import "./components/material.css";
@import "./components/datatable.css";
Expand All @@ -35,3 +36,4 @@
@import "./components/checkbox.css";
@import "./components/button.css";
@import "./components/icon-button.css";
@import "./components/ripple.css";
4 changes: 3 additions & 1 deletion theme/assets/css/src/material-components.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@
@import "@material/layout-grid/dist/mdc.layout-grid.css";
@import "@material/tab-bar/dist/mdc.tab-bar.css";
@import "@material/tab-scroller/dist/mdc.tab-scroller.css";
@import "@material/tab/dist/mdc.tab.css";
@import "./components/material.css";
@import "./material/drawer.css";
@import "./material/top-app-bar.css";

/*
* Imported from plugin.
*/
@import "../../../../plugin/assets/css/src/tokens/shape.css";
@import "../../../../plugin/assets/css/src/tokens/opacity.css";
@import "../../../../plugin/assets/css/src/tokens/elevation.css";
@import "../../../../plugin/assets/css/src/components/ripple.css";
@import "../../../../plugin/assets/css/src/components/button.css";
@import "../../../../plugin/assets/css/src/components/icon-button.css";
Expand Down

0 comments on commit 3684aa5

Please sign in to comment.