Skip to content

Commit

Permalink
Merge branch 'master' into rnmobile/inserter
Browse files Browse the repository at this point in the history
  • Loading branch information
lukewalczak committed Jan 30, 2020
2 parents 7ef43f6 + d66d53b commit 54196b2
Show file tree
Hide file tree
Showing 43 changed files with 544 additions and 124 deletions.
9 changes: 9 additions & 0 deletions .markdownlintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
bin
build
node_modules
phpunit
playground
storybook
test
vendor
wordpress
2 changes: 1 addition & 1 deletion bin/build-plugin-zip.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ npm run build
php bin/generate-gutenberg-php.php > gutenberg.tmp.php
mv gutenberg.tmp.php gutenberg.php

build_files=$(ls build/*/*.{js,css,asset.php} build/block-library/blocks/*.{php,json})
build_files=$(ls build/*/*.{js,css,asset.php} build/block-library/blocks/*.php build/block-library/blocks/*/block.json)

# Generate the plugin zip file.
status "Creating archive... 🎁"
Expand Down
129 changes: 129 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@
"lint-css": "wp-scripts lint-style '**/*.scss'",
"lint-css:fix": "npm run lint-css -- --fix",
"lint-types": "tsc",
"lint-md": "wp-scripts lint-md",
"lint:md-js": "wp-scripts lint-md-js",
"lint:md-docs": "wp-scripts lint-md-docs",
"package-plugin": "./bin/build-plugin-zip.sh",
"pot-to-php": "./bin/pot-to-php.js",
"publish:check": "lerna updated",
Expand Down
1 change: 1 addition & 0 deletions packages/block-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"@wordpress/hooks": "file:../hooks",
"@wordpress/html-entities": "file:../html-entities",
"@wordpress/i18n": "file:../i18n",
"@wordpress/icons": "file:../icons",
"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
"@wordpress/keycodes": "file:../keycodes",
Expand Down
3 changes: 2 additions & 1 deletion packages/block-editor/src/components/block-list/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,8 @@
background: $white;
height: $block-padding * 2;
width: $block-padding * 2;
padding: $grid-size-small;
padding: 0;
justify-content: center;

&:not(:disabled):not([aria-disabled="true"]):hover {
box-shadow: none;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import classnames from 'classnames';
/**
* WordPress dependencies
*/
import { Button, Icon, Tooltip } from '@wordpress/components';
import { Button, Tooltip } from '@wordpress/components';
import { _x, sprintf } from '@wordpress/i18n';
import { Icon, plusCircle } from '@wordpress/icons';

/**
* Internal dependencies
Expand Down Expand Up @@ -39,7 +40,7 @@ function ButtonBlockAppender( { rootClientId, className, __experimentalSelectBlo
label={ label }
>
<span className="screen-reader-text">{ label }</span>
<Icon icon="insert" />
<Icon icon={ plusCircle } />
</Button>
</Tooltip>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ function ColorGradientControlInner( {
</Button>
</ButtonGroup>
) }
{ currentTab === 'color' && (
{ ( currentTab === 'color' || ! canChooseAGradient ) && (
<ColorPalette
value={ colorValue }
onChange={ canChooseAGradient ?
Expand All @@ -122,7 +122,7 @@ function ColorGradientControlInner( {
{ ... { colors, disableCustomColors } }
/>
) }
{ currentTab === 'gradient' && (
{ ( currentTab === 'gradient' || ! canChooseAColor ) && (
<GradientPicker
value={ gradientValue }
onChange={ canChooseAColor ?
Expand Down
Loading

0 comments on commit 54196b2

Please sign in to comment.