Skip to content

Commit 905fed1

Browse files
author
Mario Aguiar
authored
Merge pull request #87 from material-components/fix/settings-5.2
Fix/settings WordPress 5.2
2 parents baf2fb7 + 0480013 commit 905fed1

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

plugin/assets/css/src/block-editor.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
height: auto;
7171
max-height: 100%;
7272
min-height: 48px;
73+
overflow: hidden;
7374
padding: 8px 16px;
7475
}
7576

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
height: auto;
134134
max-height: 100%;
135135
min-height: 48px;
136+
overflow: hidden;
136137
padding: 8px 16px;
137138
}
138139

plugin/assets/src/block-editor/components/icon-picker/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export default ( { currentIcon, onChange } ) => {
5757
: '';
5858

5959
return (
60-
<div key={ rawIcons[ icon ].name } className="icons-container__icon">
60+
<div key={ rawIcons[ icon ].hex } className="icons-container__icon">
6161
<Tooltip text={ rawIcons[ icon ].name }>
6262
<button
6363
type="button"

plugin/assets/src/block-editor/components/layout-controls/index.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@ export default ( {
5353
onColumnsChange( { ...columns, ...{ [ selectedDevice ]: newColumns } } );
5454
};
5555

56+
const VisualLabel = BaseControl.VisualLabel || 'label';
57+
5658
return (
5759
<BaseControl>
58-
<BaseControl.VisualLabel className="components-base-control__layout-controls-label">
60+
<VisualLabel className="components-base-control__layout-controls-label">
5961
{ label }
6062
<div className="components-base-control__label-actions components-base-control__layout-controls">
6163
{ DEVICES.map( device => (
@@ -71,7 +73,7 @@ export default ( {
7173
</Tooltip>
7274
) ) }
7375
</div>
74-
</BaseControl.VisualLabel>
76+
</VisualLabel>
7577
<RangeControl
7678
label={ __( 'Columns', 'material-design' ) }
7779
value={

plugin/assets/src/settings/utils/promises.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import apiFetch from '@wordpress/api-fetch';
2222
/**
2323
* Internal dependencies
2424
*/
25-
import { UPDATERS } from '../constants';
2625
import getConfig from '../../admin/get-config';
2726

2827
/**
@@ -59,8 +58,7 @@ export const updateIcons = () => {
5958
} );
6059
};
6160

62-
export const isCoreUpdate = type =>
63-
[ UPDATERS.PLUGIN.type, UPDATERS.THEME.type ].includes( type );
61+
export const isCoreUpdate = type => [ 'PLUGIN', 'THEME' ].includes( type );
6462

6563
/**
6664
* Save API Key in database

0 commit comments

Comments
 (0)