From 0164a6b24ca537070b6ec8d3b63590f52e0529de Mon Sep 17 00:00:00 2001 From: Utkarsh Patel Date: Wed, 26 Jan 2022 13:30:34 +0530 Subject: [PATCH 1/2] Whitelist block.json in theme bundle --- Gruntfile.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Gruntfile.js b/Gruntfile.js index 49e0a0ce7..d31855fe4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -86,6 +86,7 @@ module.exports = function ( grunt ) { '!theme/assets/js/*.map', '!theme/assets/js/editor*', '!theme/assets/src/**', + 'theme/assets/src/**/*.json', '!theme/tests/**', '!theme/wp-assets/**', '!theme/composer*', From 7f21098665cf92087685c65070997e3033ca5479 Mon Sep 17 00:00:00 2001 From: Utkarsh Patel Date: Wed, 26 Jan 2022 15:49:51 +0530 Subject: [PATCH 2/2] Add fallback font --- theme/assets/src/block-editor/blocks/back-to-top/block.json | 2 +- theme/assets/src/block-editor/blocks/card/block.json | 2 +- .../src/block-editor/blocks/dark-mode-switch/block.json | 2 +- theme/assets/src/block-editor/blocks/search/block.json | 2 +- theme/inc/block-editor.php | 6 ++++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/theme/assets/src/block-editor/blocks/back-to-top/block.json b/theme/assets/src/block-editor/blocks/back-to-top/block.json index 4175d84f0..1a7b95213 100644 --- a/theme/assets/src/block-editor/blocks/back-to-top/block.json +++ b/theme/assets/src/block-editor/blocks/back-to-top/block.json @@ -11,7 +11,7 @@ }, "description": "Material back to top button", "editorStyle": [ - "material-google-fonts-cdn", + "material-google-fonts", "material-block-editor-css-theme" ], "editorScript": "material-block-editor-js-theme" diff --git a/theme/assets/src/block-editor/blocks/card/block.json b/theme/assets/src/block-editor/blocks/card/block.json index 80e7fb8a8..9b7aafd55 100644 --- a/theme/assets/src/block-editor/blocks/card/block.json +++ b/theme/assets/src/block-editor/blocks/card/block.json @@ -28,7 +28,7 @@ "supports": {}, "apiVersion": 2, "description": "Material card for query loop block", - "editorStyle": ["material-google-fonts-cdn", "material-block-editor-css-theme"], + "editorStyle": ["material-google-fonts", "material-block-editor-css-theme"], "editorScript": "material-block-editor-js-theme", "usesContext": [ "postId", "postType", "queryId" ], "textdomain": "material-design-google" diff --git a/theme/assets/src/block-editor/blocks/dark-mode-switch/block.json b/theme/assets/src/block-editor/blocks/dark-mode-switch/block.json index 93164d2d9..c20f66a95 100644 --- a/theme/assets/src/block-editor/blocks/dark-mode-switch/block.json +++ b/theme/assets/src/block-editor/blocks/dark-mode-switch/block.json @@ -8,7 +8,7 @@ "title": "Dark Mode Switch", "description": "Material dark mode switch", "editorStyle": [ - "material-google-fonts-cdn", + "material-google-fonts", "material-block-editor-css-theme" ], "editorScript": "material-block-editor-js-theme" diff --git a/theme/assets/src/block-editor/blocks/search/block.json b/theme/assets/src/block-editor/blocks/search/block.json index 0ec723831..c2737721e 100644 --- a/theme/assets/src/block-editor/blocks/search/block.json +++ b/theme/assets/src/block-editor/blocks/search/block.json @@ -9,7 +9,7 @@ "supports": {}, "description": "Material search bar", "editorStyle": [ - "material-google-fonts-cdn", + "material-google-fonts", "material-block-editor-css-theme" ], "editorScript": "material-block-editor-js-theme" diff --git a/theme/inc/block-editor.php b/theme/inc/block-editor.php index ec03968e4..fef5bb5e9 100644 --- a/theme/inc/block-editor.php +++ b/theme/inc/block-editor.php @@ -83,9 +83,11 @@ function enqueue_block_editor_assets() { $version, false ); - if ( ! wp_style_is( 'material-google-fonts-cdn', 'enqueued' ) ) { + + if ( ! wp_style_is( 'material-google-fonts', 'enqueued' ) ) { + // Ideally this should be injected by the plugin if not fallback to default fonts. wp_enqueue_style( - 'material-google-fonts-cdn', + 'material-google-fonts', esc_url( '//fonts.googleapis.com/css?family=Roboto|Material+Icons' ), [], $theme_version