Skip to content

Commit

Permalink
Merge pull request #129 from wordpress-mobile/feature/inserter-icons
Browse files Browse the repository at this point in the history
Inserter - block icons
  • Loading branch information
mzorz committed Oct 12, 2018
2 parents 6f5e350 + 8ddcbda commit eecb7b7
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 346 files
2 changes: 1 addition & 1 deletion react-native-aztec
2 changes: 1 addition & 1 deletion sass-transformer-inside-gb.js
Expand Up @@ -63,7 +63,7 @@ if ( reactNativeMinorVersion >= 56 ) {

// TODO: need to find a way to pass the include paths and the default asset files via some config
const autoImportIncludePaths = [
path.join( path.dirname( __filename ), '../edit-post/assets/stylesheets' ),
path.join( path.dirname( __filename ), '../assets/stylesheets' ),
];
const autoImportAssets = [
'_colors.scss',
Expand Down
2 changes: 1 addition & 1 deletion sass-transformer.js
Expand Up @@ -63,7 +63,7 @@ if ( reactNativeMinorVersion >= 56 ) {

// TODO: need to find a way to pass the include paths and the default asset files via some config
const autoImportIncludePaths = [
path.join( path.dirname( __filename ), 'gutenberg/edit-post/assets/stylesheets' ),
path.join( path.dirname( __filename ), 'gutenberg/assets/stylesheets' ),
];
const autoImportAssets = [
'_colors.scss',
Expand Down
4 changes: 1 addition & 3 deletions src/block-management/block-picker.js
Expand Up @@ -62,9 +62,7 @@ export default class BlockPicker extends Component<PropsType, StateType> {
onPress={ this.props.onValueSelected.bind( this, item.name ) }>
<View style={ styles.modalItem }>
<View style={ styles.modalIcon }>
{ /* TODO: ICON IMAGE GOES HERE */ }
{ /* <Text>{ item.icon.src }</Text> */ }
<Text>icon</Text>
{ item.icon.src }
</View>
<Text style={ styles.modalItemLabel }>{ item.title }</Text>
</View>
Expand Down

0 comments on commit eecb7b7

Please sign in to comment.