Merge pull request #434 from material-components/fix/loading-material…

…-font Fix loading font in iframe
material-components · Aug 24, 2022 · cbd4814 · cbd4814
2 parents e8f80f5 + 8f03093
commit cbd4814
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
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
@@ -22,8 +22,18 @@
 @import "./components/material.css";
 @import "./material/drawer.css";
 @import "./material/top-app-bar.css";
-@import "../../../../plugin/assets/css/src/components/ripple.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/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";