Merge pull request #35 from material-components/fix/13-dialog-styles

Fix/13 dialog styles
material-components · Apr 8, 2021 · 3168e21 · 3168e21
2 parents fe355a3 + d371453
commit 3168e21
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/plugin/assets/css/src/settings/index.css b/plugin/assets/css/src/settings/index.css
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+@import "@material/dialog/dist/mdc.dialog.css";
 @import "./base.css";
 @import "./updater.css";
 @import "./switch.css";

diff --git a/plugin/assets/src/common/components/dialog/index.js b/plugin/assets/src/common/components/dialog/index.js
@@ -19,7 +19,6 @@
  */
 import classNames from 'classnames';
 import { MDCDialog } from '@material/dialog';
-import '@material/dialog/dist/mdc.dialog.css';
 
 /**
  * WordPress dependencies

diff --git a/plugin/assets/src/settings/constants.js b/plugin/assets/src/settings/constants.js
@@ -34,7 +34,7 @@ export const ACTIONS = {
 	SET_UPDATED: 'SET_UPDATED',
 };
 
-export const UPDATERS = {
+const ASSET_UPDATES = {
 	FONTS: {
 		title: __( 'Google Fonts', 'material-design' ),
 		type: 'FONTS',
@@ -51,6 +51,9 @@ export const UPDATERS = {
 		updateAvailable: 'update' === getConfig( 'iconsUpdateStatus' ),
 		autoUpdates: parseInt( getConfig( 'iconsAutoUpdate' ), 10 ),
 	},
+};
+
+const CORE_UPDATES = {
 	PLUGIN: {
 		title: __( 'Material Design Plugin', 'material-design' ),
 		type: 'PLUGIN',
@@ -73,4 +76,9 @@ export const UPDATERS = {
 	},
 };
 
+export const UPDATERS = {
+	...ASSET_UPDATES,
+	...( getConfig( 'coreUpdatesEnabled' ) ? CORE_UPDATES : {} ),
+};
+
 export const KEY_PLACEHOLDER = '•••••••••••••••••••••••••••••';
diff --git a/plugin/php/class-admin.php b/plugin/php/class-admin.php
@@ -319,6 +319,7 @@ public function enqueue_assets() {
 					'themeAutoUpdate'    => in_array( Plugin::THEME_SLUG, get_site_option( 'auto_update_themes', [] ), true ),
 					'pluginUpdateStatus' => $plugin_status,
 					'themeUpdateStatus'  => $theme_status,
+					'coreUpdatesEnabled' => version_compare( get_bloginfo( 'version' ), '5.5', '>=' ),
 					'coreUpdateUrl'      => admin_url( 'update-core.php' ),
 					'autoUpdateNonce'    => wp_create_nonce( 'updates' ),
 					'autoUpdateUrl'      => admin_url( 'admin-ajax.php' ),