From 39bc785073fd63e954b7445c331797ac4e6b34a2 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Tue, 30 Oct 2018 16:28:37 -0400 Subject: [PATCH 1/9] merge from upstream --- gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg-mobile b/gutenberg-mobile index c90c36410d4c0c..776bb23f7f19ef 160000 --- a/gutenberg-mobile +++ b/gutenberg-mobile @@ -1 +1 @@ -Subproject commit c90c36410d4c0c3f2dea84ca666b1b585408a03f +Subproject commit 776bb23f7f19ef57b491f9708e9795b3a2ddb68e From cc87beb9947e06990f3d5dc574656c811c3696ec Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Wed, 28 Nov 2018 13:49:45 -0500 Subject: [PATCH 2/9] local save --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5d995bca4758f9..907960cc5096e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11402,7 +11402,7 @@ }, "yargs": { "version": "11.1.0", - "resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==", "dev": true, "requires": { @@ -12713,7 +12713,7 @@ }, "yargs": { "version": "11.1.0", - "resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==", "dev": true, "requires": { From 2cf001e4a61c869eb19e2bbc90ec50ff5bb65584 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Fri, 30 Nov 2018 13:38:10 -0500 Subject: [PATCH 3/9] darked focus state outline for block lists --- packages/editor/src/components/block-list/style.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/editor/src/components/block-list/style.scss b/packages/editor/src/components/block-list/style.scss index 3ecb8dcc263b82..250786c8153c3a 100644 --- a/packages/editor/src/components/block-list/style.scss +++ b/packages/editor/src/components/block-list/style.scss @@ -130,10 +130,10 @@ // Selected style &.is-selected > .editor-block-list__block-edit::before { // Use opacity to work in various editor styles. - outline: $border-width solid $dark-opacity-light-500; + outline: $border-width solid $dark-opacity-200; .is-dark-theme & { - outline-color: $light-opacity-light-500; + outline-color: $light-opacity-300; } } From 8aef5e5303156d2ac5c2e90aa1292f03524e82fb Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Mon, 17 Dec 2018 13:45:34 -0500 Subject: [PATCH 4/9] sasve --- packages/editor/src/components/block-list/style.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/editor/src/components/block-list/style.scss b/packages/editor/src/components/block-list/style.scss index 250786c8153c3a..3ecb8dcc263b82 100644 --- a/packages/editor/src/components/block-list/style.scss +++ b/packages/editor/src/components/block-list/style.scss @@ -130,10 +130,10 @@ // Selected style &.is-selected > .editor-block-list__block-edit::before { // Use opacity to work in various editor styles. - outline: $border-width solid $dark-opacity-200; + outline: $border-width solid $dark-opacity-light-500; .is-dark-theme & { - outline-color: $light-opacity-300; + outline-color: $light-opacity-light-500; } } From 483432869e9fb15369c05fe30fdfc90378315425 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Mon, 17 Dec 2018 15:50:32 -0500 Subject: [PATCH 5/9] updated permalink labelling --- packages/edit-post/src/components/sidebar/post-link/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/edit-post/src/components/sidebar/post-link/index.js b/packages/edit-post/src/components/sidebar/post-link/index.js index 4b614805e03019..af97811782dfe7 100644 --- a/packages/edit-post/src/components/sidebar/post-link/index.js +++ b/packages/edit-post/src/components/sidebar/post-link/index.js @@ -54,7 +54,7 @@ function PostLink( { > { isEditable && ( { editPermalink( newValue ); From fadb6cb675de646af0e6e59e42991596df648d63 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 20 Dec 2018 17:03:32 -0500 Subject: [PATCH 6/9] reverted package lock --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4e4a000ebdebbf..1867b41831f791 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11359,7 +11359,7 @@ }, "yargs": { "version": "11.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", + "resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==", "dev": true, "requires": { @@ -12670,7 +12670,7 @@ }, "yargs": { "version": "11.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", + "resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==", "dev": true, "requires": { From cd8481fcd24d582009c2cbaa6637daef50a723d3 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Fri, 21 Dec 2018 16:57:52 -0500 Subject: [PATCH 7/9] updated label and added helper link --- .../src/components/sidebar/post-link/index.js | 65 ++++++++++--------- 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/packages/edit-post/src/components/sidebar/post-link/index.js b/packages/edit-post/src/components/sidebar/post-link/index.js index af97811782dfe7..20efa0c510df4c 100644 --- a/packages/edit-post/src/components/sidebar/post-link/index.js +++ b/packages/edit-post/src/components/sidebar/post-link/index.js @@ -53,38 +53,45 @@ function PostLink( { onToggle={ onTogglePanel } > { isEditable && ( - { - editPermalink( newValue ); - // When we delete the field the permalink gets - // reverted to the original value. - // The forceEmptyField logic allows the user to have - // the field temporarily empty while typing. - if ( ! newValue ) { - if ( ! forceEmptyField ) { +
+ { + editPermalink( newValue ); + // When we delete the field the permalink gets + // reverted to the original value. + // The forceEmptyField logic allows the user to have + // the field temporarily empty while typing. + if ( ! newValue ) { + if ( ! forceEmptyField ) { + setState( { + forceEmptyField: true, + } ); + } + return; + } + if ( forceEmptyField ) { + setState( { + forceEmptyField: false, + } ); + } + } } + onBlur={ ( event ) => { + editPermalink( cleanForSlug( event.target.value ) ); + if ( forceEmptyField ) { setState( { - forceEmptyField: true, + forceEmptyField: false, } ); } - return; - } - if ( forceEmptyField ) { - setState( { - forceEmptyField: false, - } ); - } - } } - onBlur={ ( event ) => { - editPermalink( cleanForSlug( event.target.value ) ); - if ( forceEmptyField ) { - setState( { - forceEmptyField: false, - } ); - } - } } - /> + } } + /> +

+ + { __( 'Learn more about permalinks' ) } + +

+
) }

{ __( 'Preview' ) } From 6049de64108fc46e2d89c623bdefa9ad3c4b26ab Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Mon, 28 Jan 2019 08:36:29 -0500 Subject: [PATCH 8/9] post link text update --- packages/edit-post/src/components/sidebar/post-link/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/edit-post/src/components/sidebar/post-link/index.js b/packages/edit-post/src/components/sidebar/post-link/index.js index 0ce81aa4de3f99..45ad1a3b3d4b3e 100644 --- a/packages/edit-post/src/components/sidebar/post-link/index.js +++ b/packages/edit-post/src/components/sidebar/post-link/index.js @@ -55,7 +55,7 @@ function PostLink( { { isEditable && (

{ editPermalink( newValue ); @@ -87,8 +87,9 @@ function PostLink( { } } />

+ { __( 'The last part of the URL. ' ) } - { __( 'Learn more about permalinks' ) } + { __( 'Read about permalinks' ) }

From b12340881b7f59d92195e103664cec1335e53bc0 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Fri, 8 Feb 2019 09:44:51 -0500 Subject: [PATCH 9/9] Update index.js --- packages/edit-post/src/components/sidebar/post-link/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/edit-post/src/components/sidebar/post-link/index.js b/packages/edit-post/src/components/sidebar/post-link/index.js index 45ad1a3b3d4b3e..c6305b63110665 100644 --- a/packages/edit-post/src/components/sidebar/post-link/index.js +++ b/packages/edit-post/src/components/sidebar/post-link/index.js @@ -55,7 +55,7 @@ function PostLink( { { isEditable && (
{ editPermalink( newValue );