Merge branch 'develop' into feature/325-icon-button

material-components · Aug 25, 2022 · 1d339b3 · 1d339b3
2 parents 4847b52 + cbd4814
commit 1d339b3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/plugin/assets/css/src/material-components.css b/plugin/assets/css/src/material-components.css
@@ -19,7 +19,6 @@
  */
 
 @import "mixins.css";
-@import "@material/icon-button/dist/mdc.icon-button.css";
 @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";
@@ -35,3 +34,4 @@
 @import "./components/tooltip.css";
 @import "./components/checkbox.css";
 @import "./components/button.css";
+@import "./components/icon-button.css";
diff --git a/plugin/php/class-block-types.php b/plugin/php/class-block-types.php
@@ -187,7 +187,7 @@ public function enqueue_block_editor_assets() {
 		wp_register_style(
 			'material-block-editor-css',
 			$this->plugin->asset_url( 'assets/css/block-editor-compiled.css' ),
-			[],
+			[ 'material-google-fonts' ],
 			$version
 		);
 

diff --git a/theme/assets/css/src/material-components.css b/theme/assets/css/src/material-components.css
@@ -21,9 +21,19 @@
 @import "./components/material.css";
 @import "./material/drawer.css";
 @import "./material/top-app-bar.css";
-@import "../../../../plugin/assets/css/src/components/ripple.css";
-@import "../../../../plugin/assets/css/src/components/icon-button.css";
 
-/**
-  Todo: Add style from plugin for material card, image card, checkbox.
+/*
+ * Imported from plugin.
  */
+@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";
+@import "../../../../plugin/assets/css/src/components/list.css";
+@import "../../../../plugin/assets/css/src/components/form-field.css";
+@import "../../../../plugin/assets/css/src/components/floating-label.css";
+@import "../../../../plugin/assets/css/src/components/text-field.css";
+@import "../../../../plugin/assets/css/src/components/checkbox.css";
+@import "../../../../plugin/assets/css/src/components/card.css";
+@import "../../../../plugin/assets/css/src/components/image-card.css";
+@import "../../../../plugin/assets/css/src/components/tab-indicator.css";
+@import "../../../../plugin/assets/css/src/components/tab.css";