Merge pull request #628 from wordpress-mobile/issue/546-add-block-ico…

…n-color "Add Block" icon color
wordpress-mobile · Mar 27, 2019 · 48e5251 · 48e5251
2 parents bd1ebf5 + 9ebdffc
commit 48e5251
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/__mocks__/styleMock.js b/__mocks__/styleMock.js
@@ -26,6 +26,9 @@ module.exports = {
 	'block-editor-plain-text': {
 		fontFamily: 'serif',
 	},
+	addBlockButton: {
+		color: '',
+	},
 	blockHolderFocused: {
 		borderColor: 'gray',
 	},

diff --git a/gutenberg b/gutenberg
diff --git a/src/block-management/block-toolbar.js b/src/block-management/block-toolbar.js
@@ -14,7 +14,7 @@ import { View, ScrollView, Keyboard } from 'react-native';
  */
 import { withSelect, withDispatch } from '@wordpress/data';
 import { compose } from '@wordpress/compose';
-import { Toolbar, ToolbarButton } from '@wordpress/components';
+import { Toolbar, ToolbarButton, Dashicon } from '@wordpress/components';
 import { BlockFormatControls, BlockControls } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
 
@@ -59,7 +59,7 @@ export class BlockToolbar extends Component<PropsType> {
 					<Toolbar>
 						<ToolbarButton
 							label={ __( 'Add block' ) }
-							icon="insert"
+							icon={ ( <Dashicon icon="plus-alt" style={ styles.addBlockButton } color={ styles.addBlockButton.color } /> ) }
 							onClick={ onInsertClick }
 						/>
 						<ToolbarButton

diff --git a/src/block-management/block-toolbar.scss b/src/block-management/block-toolbar.scss
@@ -18,3 +18,10 @@
     justify-content: center;
     align-items: center;
 }
+
+.addBlockButton {
+    color: $blue-wordpress;
+    border: 2px;
+    border-radius: 10px;
+    border-color: $blue-wordpress;
+}
+4 −0		.eslintrc.js
+16 −15		bin/install-wordpress.sh
+0 −3		bin/reset-e2e-tests.sh
+0 −14		bin/run-e2e-tests.sh
+1 −1		bin/update-readmes.js
+23 −8		docker-compose.yml
+60 −22		package-lock.json
+1 −1		package.json
+6 −2		packages/block-library/CHANGELOG.md
+2 −15		packages/block-library/src/archives/edit.js
+1 −7		packages/block-library/src/archives/index.js
+1 −0		packages/block-library/src/archives/index.php
+0 −8		packages/block-library/src/block/index.js
+0 −1		packages/block-library/src/block/index.php
+1 −0		packages/block-library/src/calendar/index.php
+0 −16		packages/block-library/src/categories/index.js
+21 −0		packages/block-library/src/categories/index.php
+6 −3		packages/block-library/src/heading/edit.native.js
+2 −9		packages/block-library/src/latest-posts/edit.js
+1 −7		packages/block-library/src/latest-posts/index.js
+5 −4		packages/block-library/src/latest-posts/index.php
+3 −0		packages/block-library/src/legacy-widget/index.php
+3 −0		packages/block-library/src/rss/editor.scss
+1 −0		packages/block-library/src/rss/index.js
+25 −2		packages/block-library/src/rss/index.php
+1 −0		packages/block-library/src/rss/style.scss
+4 −0		packages/block-library/src/search/index.js
+11 −1		packages/block-library/src/search/index.php
+0 −7		packages/block-library/src/shortcode/index.js
+6 −0		packages/block-library/src/shortcode/index.php
+7 −6		packages/block-library/src/tag-cloud/index.php
+1 −2		packages/components/src/dashicon/icon-class.js
+1 −2		packages/components/src/dashicon/icon-class.native.js
+4 −12		packages/components/src/dashicon/index.js
+309 −144		packages/data/README.md
+54 −2		packages/data/src/components/with-dispatch/index.js
+26 −0		packages/data/src/components/with-select/index.js
+95 −0		packages/data/src/index.js
+4 −4		packages/e2e-tests/fixtures/blocks/core__rss.parsed.json
+1 −1		packages/e2e-tests/fixtures/blocks/core__rss.serialized.html
+2 −2		packages/e2e-tests/fixtures/blocks/core__search__custom-text.parsed.json
+1 −1		packages/e2e-tests/fixtures/blocks/core__search__custom-text.serialized.html
+2 −2		packages/e2e-tests/fixtures/blocks/core__tag-cloud__showTagCounts.parsed.json
+1 −1		packages/e2e-tests/fixtures/blocks/core__tag-cloud__showTagCounts.serialized.html
+2 −2		packages/e2e-tests/fixtures/blocks/core__video.json
+1 −1		test/integration/full-content/server-registered.json