From afb46b010cae8270a01008ddf2ba3d4518981a45 Mon Sep 17 00:00:00 2001 From: etoledom Date: Wed, 20 Feb 2019 16:57:38 +0100 Subject: [PATCH 01/14] Overriding add-block Dashicon color. --- gutenberg | 2 +- src/block-management/block-toolbar.js | 3 ++- src/block-management/block-toolbar.scss | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 23e59d1f36..1452702ea7 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 23e59d1f3601164788278297e5cbb33d0c1d31e5 +Subproject commit 1452702ea72a777a2e29d628d9d77a46ef772d6c diff --git a/src/block-management/block-toolbar.js b/src/block-management/block-toolbar.js index 598af91351..9cf0fb7ba8 100644 --- a/src/block-management/block-toolbar.js +++ b/src/block-management/block-toolbar.js @@ -49,8 +49,9 @@ export class BlockToolbar extends Component { Date: Wed, 20 Feb 2019 17:27:26 +0100 Subject: [PATCH 02/14] Fix test error --- gutenberg | 2 +- src/block-management/block-toolbar.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 1452702ea7..f60cb58cb7 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 1452702ea72a777a2e29d628d9d77a46ef772d6c +Subproject commit f60cb58cb78d1a61fc7fa88e62e1ba90caa8ae9e diff --git a/src/block-management/block-toolbar.js b/src/block-management/block-toolbar.js index 9cf0fb7ba8..874e3bf431 100644 --- a/src/block-management/block-toolbar.js +++ b/src/block-management/block-toolbar.js @@ -51,7 +51,7 @@ export class BlockToolbar extends Component { label={ __( 'Add block' ) } icon="plus-alt" onClick={ onInsertClick } - extraProps={ { iconColor: styles.addBlockButton.color } } + extraProps={ styles.addBlockButton } /> Date: Wed, 20 Feb 2019 21:13:59 +0100 Subject: [PATCH 03/14] Adding border to add block button --- gutenberg | 2 +- src/block-management/block-toolbar.js | 2 +- src/block-management/block-toolbar.scss | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index f60cb58cb7..63f18dcc1c 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit f60cb58cb78d1a61fc7fa88e62e1ba90caa8ae9e +Subproject commit 63f18dcc1c7d52e6afa292e2ea7ae74fac4b58a7 diff --git a/src/block-management/block-toolbar.js b/src/block-management/block-toolbar.js index 874e3bf431..55df9a0a50 100644 --- a/src/block-management/block-toolbar.js +++ b/src/block-management/block-toolbar.js @@ -51,7 +51,7 @@ export class BlockToolbar extends Component { label={ __( 'Add block' ) } icon="plus-alt" onClick={ onInsertClick } - extraProps={ styles.addBlockButton } + extraProps={ { style: styles.addBlockButton } } /> Date: Thu, 21 Feb 2019 18:54:36 +0100 Subject: [PATCH 04/14] Sending color and style to ToolbarButton via extraProps --- __mocks__/styleMock.js | 3 +++ gutenberg | 2 +- src/block-management/block-toolbar.js | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/__mocks__/styleMock.js b/__mocks__/styleMock.js index 505dc720a4..064aad614d 100644 --- a/__mocks__/styleMock.js +++ b/__mocks__/styleMock.js @@ -25,4 +25,7 @@ module.exports = { 'editor-plain-text': { fontFamily: 'serif', }, + addBlockButton: { + color: '', + }, }; diff --git a/gutenberg b/gutenberg index 63f18dcc1c..c28b209007 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 63f18dcc1c7d52e6afa292e2ea7ae74fac4b58a7 +Subproject commit c28b209007e7b0b54da43a51f3788f8c888d033c diff --git a/src/block-management/block-toolbar.js b/src/block-management/block-toolbar.js index 55df9a0a50..e157ef7223 100644 --- a/src/block-management/block-toolbar.js +++ b/src/block-management/block-toolbar.js @@ -51,7 +51,7 @@ export class BlockToolbar extends Component { label={ __( 'Add block' ) } icon="plus-alt" onClick={ onInsertClick } - extraProps={ { style: styles.addBlockButton } } + extraProps={ { style: styles.addBlockButton, color: styles.addBlockButton.color } } /> Date: Thu, 21 Feb 2019 18:56:36 +0100 Subject: [PATCH 05/14] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index c28b209007..562b9aa8ea 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit c28b209007e7b0b54da43a51f3788f8c888d033c +Subproject commit 562b9aa8eadcee9c5674738735ea734a426d0cb8 From afcefaf478667f4a834cbe6eb03e9c3feac6f420 Mon Sep 17 00:00:00 2001 From: etoledom Date: Fri, 22 Feb 2019 12:36:12 +0100 Subject: [PATCH 06/14] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 562b9aa8ea..1523473d3d 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 562b9aa8eadcee9c5674738735ea734a426d0cb8 +Subproject commit 1523473d3d9b87cea9fd96cf6e44e2360eda3214 From e25a6cb14756406a406deb5847ad98621d713d04 Mon Sep 17 00:00:00 2001 From: etoledom Date: Fri, 22 Feb 2019 12:55:37 +0100 Subject: [PATCH 07/14] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 1523473d3d..fc96acd3fb 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 1523473d3d9b87cea9fd96cf6e44e2360eda3214 +Subproject commit fc96acd3fb14d3d9fcf09776cffdc0ff9757b06b From b2b50eee73ff269d74a281523cc11968a097aada Mon Sep 17 00:00:00 2001 From: etoledom Date: Fri, 22 Feb 2019 16:11:56 +0100 Subject: [PATCH 08/14] Sending iconProps to ToolbarButton --- gutenberg | 2 +- src/block-management/block-toolbar.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index fc96acd3fb..c2fec4e345 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit fc96acd3fb14d3d9fcf09776cffdc0ff9757b06b +Subproject commit c2fec4e3454d6547e8c9dcdef250f87e4c2a7c86 diff --git a/src/block-management/block-toolbar.js b/src/block-management/block-toolbar.js index e157ef7223..f5b4921bdb 100644 --- a/src/block-management/block-toolbar.js +++ b/src/block-management/block-toolbar.js @@ -51,7 +51,7 @@ export class BlockToolbar extends Component { label={ __( 'Add block' ) } icon="plus-alt" onClick={ onInsertClick } - extraProps={ { style: styles.addBlockButton, color: styles.addBlockButton.color } } + iconProps={ { style: styles.addBlockButton, color: styles.addBlockButton.color } } /> Date: Fri, 22 Feb 2019 16:13:47 +0100 Subject: [PATCH 09/14] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index c2fec4e345..91dc3f6a86 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit c2fec4e3454d6547e8c9dcdef250f87e4c2a7c86 +Subproject commit 91dc3f6a8636ab93ba67404cc75fc13100a1fc69 From 077309cc0e4d1730b2cb0f8279dc497a5486fcd1 Mon Sep 17 00:00:00 2001 From: etoledom Date: Tue, 26 Mar 2019 10:55:29 +0100 Subject: [PATCH 10/14] Remove conflicting colors.scss import --- src/block-management/block-toolbar.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/block-management/block-toolbar.scss b/src/block-management/block-toolbar.scss index 5a5078f52a..6b79c18d62 100644 --- a/src/block-management/block-toolbar.scss +++ b/src/block-management/block-toolbar.scss @@ -1,5 +1,3 @@ -@import './colors.scss'; - .container { height: 44; flex-direction: row; From bd12d09e7c4097e2e1784e586c1ff5667e7afe58 Mon Sep 17 00:00:00 2001 From: etoledom Date: Tue, 26 Mar 2019 11:13:32 +0100 Subject: [PATCH 11/14] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index ae6fbbe3e1..81566b1cbd 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit ae6fbbe3e132567be5cc5fb15ed35b84d0bc7284 +Subproject commit 81566b1cbd5d90db75d59050c9874f71bbca88a3 From 0e442850e5c33b7d5279d82625c18d53629ad373 Mon Sep 17 00:00:00 2001 From: etoledom Date: Tue, 26 Mar 2019 11:38:10 +0100 Subject: [PATCH 12/14] Send Dashicon component directly on ToolbarButton to set proper color. --- gutenberg | 2 +- src/block-management/block-toolbar.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gutenberg b/gutenberg index 81566b1cbd..30fc892ec8 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 81566b1cbd5d90db75d59050c9874f71bbca88a3 +Subproject commit 30fc892ec811cfb27b2c061688e2c08e4cdffb9c diff --git a/src/block-management/block-toolbar.js b/src/block-management/block-toolbar.js index 4ccfab4c55..7a1c1cbebc 100644 --- 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 { )} onClick={ onInsertClick } iconProps={ { style: styles.addBlockButton, color: styles.addBlockButton.color } } /> From 6d6fd76bcf6fbe3ac78c76c7b7cc489dfa40afae Mon Sep 17 00:00:00 2001 From: etoledom Date: Tue, 26 Mar 2019 11:39:31 +0100 Subject: [PATCH 13/14] Fix lint issues --- src/block-management/block-toolbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/block-management/block-toolbar.js b/src/block-management/block-toolbar.js index 7a1c1cbebc..267138b456 100644 --- a/src/block-management/block-toolbar.js +++ b/src/block-management/block-toolbar.js @@ -59,7 +59,7 @@ export class BlockToolbar extends Component { )} + icon={ ( ) } onClick={ onInsertClick } iconProps={ { style: styles.addBlockButton, color: styles.addBlockButton.color } } /> From fb249429076540f9eed3de3193265e70950d9225 Mon Sep 17 00:00:00 2001 From: etoledom Date: Tue, 26 Mar 2019 12:18:58 +0100 Subject: [PATCH 14/14] BlockToolbar: Remove unnecessary iconProps prop from AddBlock ToolbarButton --- src/block-management/block-toolbar.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/block-management/block-toolbar.js b/src/block-management/block-toolbar.js index 267138b456..9dbb079a89 100644 --- a/src/block-management/block-toolbar.js +++ b/src/block-management/block-toolbar.js @@ -61,7 +61,6 @@ export class BlockToolbar extends Component { label={ __( 'Add block' ) } icon={ ( ) } onClick={ onInsertClick } - iconProps={ { style: styles.addBlockButton, color: styles.addBlockButton.color } } />