Skip to content

Commit 1d339b3

Browse files
committed
Merge branch 'develop' into feature/325-icon-button
2 parents 4847b52 + cbd4814 commit 1d339b3

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

plugin/assets/css/src/material-components.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
*/
2020

2121
@import "mixins.css";
22-
@import "@material/icon-button/dist/mdc.icon-button.css";
2322
@import "@material/layout-grid/dist/mdc.layout-grid.css";
2423
@import "@material/tab-bar/dist/mdc.tab-bar.css";
2524
@import "@material/tab-scroller/dist/mdc.tab-scroller.css";
@@ -35,3 +34,4 @@
3534
@import "./components/tooltip.css";
3635
@import "./components/checkbox.css";
3736
@import "./components/button.css";
37+
@import "./components/icon-button.css";

plugin/php/class-block-types.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public function enqueue_block_editor_assets() {
187187
wp_register_style(
188188
'material-block-editor-css',
189189
$this->plugin->asset_url( 'assets/css/block-editor-compiled.css' ),
190-
[],
190+
[ 'material-google-fonts' ],
191191
$version
192192
);
193193

theme/assets/css/src/material-components.css

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,19 @@
2121
@import "./components/material.css";
2222
@import "./material/drawer.css";
2323
@import "./material/top-app-bar.css";
24-
@import "../../../../plugin/assets/css/src/components/ripple.css";
25-
@import "../../../../plugin/assets/css/src/components/icon-button.css";
2624

27-
/**
28-
Todo: Add style from plugin for material card, image card, checkbox.
25+
/*
26+
* Imported from plugin.
2927
*/
28+
@import "../../../../plugin/assets/css/src/components/ripple.css";
29+
@import "../../../../plugin/assets/css/src/components/button.css";
30+
@import "../../../../plugin/assets/css/src/components/icon-button.css";
31+
@import "../../../../plugin/assets/css/src/components/list.css";
32+
@import "../../../../plugin/assets/css/src/components/form-field.css";
33+
@import "../../../../plugin/assets/css/src/components/floating-label.css";
34+
@import "../../../../plugin/assets/css/src/components/text-field.css";
35+
@import "../../../../plugin/assets/css/src/components/checkbox.css";
36+
@import "../../../../plugin/assets/css/src/components/card.css";
37+
@import "../../../../plugin/assets/css/src/components/image-card.css";
38+
@import "../../../../plugin/assets/css/src/components/tab-indicator.css";
39+
@import "../../../../plugin/assets/css/src/components/tab.css";

0 commit comments

Comments
 (0)