From 97535509fe7eacb7d72622e872355fa8960c2f5b Mon Sep 17 00:00:00 2001
From: Copons
Date: Wed, 8 Jul 2020 15:54:37 +0100
Subject: [PATCH 1/6] Site Description block initial commit
---
lib/blocks.php | 1 +
packages/block-library/src/index.js | 4 +-
.../src/site-description/block.json | 13 ++++++
.../src/site-description/edit.js | 40 +++++++++++++++++++
.../src/site-description/index.js | 20 ++++++++++
.../src/site-description/index.php | 36 +++++++++++++++++
6 files changed, 113 insertions(+), 1 deletion(-)
create mode 100644 packages/block-library/src/site-description/block.json
create mode 100644 packages/block-library/src/site-description/edit.js
create mode 100644 packages/block-library/src/site-description/index.js
create mode 100644 packages/block-library/src/site-description/index.php
diff --git a/lib/blocks.php b/lib/blocks.php
index df85df02b74428..2e36245da81969 100644
--- a/lib/blocks.php
+++ b/lib/blocks.php
@@ -86,6 +86,7 @@ function gutenberg_reregister_core_block_types() {
'query.php' => 'core/query',
'query-loop.php' => 'core/query-loop',
'query-pagination.php' => 'core/query-pagination',
+ 'site-description.php' => 'core/site-description',
'site-logo.php' => 'core/site-logo',
'site-title.php' => 'core/site-title',
'template-part.php' => 'core/template-part',
diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js
index 5ff83c96790993..e58b0db5a270c4 100644
--- a/packages/block-library/src/index.js
+++ b/packages/block-library/src/index.js
@@ -67,6 +67,7 @@ import * as widgetArea from './widget-area';
// Full Site Editing Blocks
import * as siteLogo from './site-logo';
import * as siteTitle from './site-title';
+import * as siteDescription from './site-description';
import * as templatePart from './template-part';
import * as query from './query';
import * as queryLoop from './query-loop';
@@ -199,8 +200,9 @@ export const __experimentalRegisterExperimentalCoreBlocks =
// Register Full Site Editing Blocks.
...( __experimentalEnableFullSiteEditing
? [
- siteTitle,
+ siteDescription,
siteLogo,
+ siteTitle,
templatePart,
query,
queryLoop,
diff --git a/packages/block-library/src/site-description/block.json b/packages/block-library/src/site-description/block.json
new file mode 100644
index 00000000000000..fdae4232d55463
--- /dev/null
+++ b/packages/block-library/src/site-description/block.json
@@ -0,0 +1,13 @@
+{
+ "name": "core/site-description",
+ "category": "design",
+ "attributes": {
+ "align": {
+ "type": "string"
+ }
+ },
+ "supports": {
+ "html": false,
+ "lightBlockWrapper": true
+ }
+}
diff --git a/packages/block-library/src/site-description/edit.js b/packages/block-library/src/site-description/edit.js
new file mode 100644
index 00000000000000..013f6660edf7f3
--- /dev/null
+++ b/packages/block-library/src/site-description/edit.js
@@ -0,0 +1,40 @@
+/**
+ * WordPress dependencies
+ */
+import { useEntityProp } from '@wordpress/core-data';
+import {
+ AlignmentToolbar,
+ BlockControls,
+ RichText,
+} from '@wordpress/block-editor';
+import { __ } from '@wordpress/i18n';
+
+export default function SiteDescriptionEdit( {
+ attributes: { align },
+ setAttributes,
+} ) {
+ const [ description, setDescription ] = useEntityProp(
+ 'root',
+ 'site',
+ 'description'
+ );
+ return (
+ <>
+
+
+ setAttributes( { align: newAlign } )
+ }
+ />
+
+
+ >
+ );
+}
diff --git a/packages/block-library/src/site-description/index.js b/packages/block-library/src/site-description/index.js
new file mode 100644
index 00000000000000..cabfdcd5ed0656
--- /dev/null
+++ b/packages/block-library/src/site-description/index.js
@@ -0,0 +1,20 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { info as icon } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import metadata from './block.json';
+import edit from './edit';
+
+const { name } = metadata;
+export { metadata, name };
+
+export const settings = {
+ title: __( 'Site Description' ),
+ icon,
+ edit,
+};
diff --git a/packages/block-library/src/site-description/index.php b/packages/block-library/src/site-description/index.php
new file mode 100644
index 00000000000000..40cbebfc48545b
--- /dev/null
+++ b/packages/block-library/src/site-description/index.php
@@ -0,0 +1,36 @@
+%2$s
',
+ 'wp-block-site-description' . esc_attr( $align_class_name ),
+ get_bloginfo( 'description' )
+ );
+}
+
+/**
+ * Registers the `core/site-description` block on the server.
+ */
+function register_block_core_site_description() {
+ register_block_type_from_metadata(
+ __DIR__ . '/site-description',
+ array(
+ 'render_callback' => 'render_block_core_site_description',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_site_description' );
From c3bb8d1238c45b1e33503b3863bf9289dd723c08 Mon Sep 17 00:00:00 2001
From: Copons
Date: Wed, 8 Jul 2020 16:13:00 +0100
Subject: [PATCH 2/6] Properly use the light block wrapper
---
.../src/site-description/edit.js | 25 +++++++++++++------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/packages/block-library/src/site-description/edit.js b/packages/block-library/src/site-description/edit.js
index 013f6660edf7f3..8fdfd272f614f3 100644
--- a/packages/block-library/src/site-description/edit.js
+++ b/packages/block-library/src/site-description/edit.js
@@ -1,39 +1,48 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
/**
* WordPress dependencies
*/
import { useEntityProp } from '@wordpress/core-data';
import {
AlignmentToolbar,
+ __experimentalBlock as Block,
BlockControls,
RichText,
} from '@wordpress/block-editor';
import { __ } from '@wordpress/i18n';
-export default function SiteDescriptionEdit( {
- attributes: { align },
- setAttributes,
-} ) {
+export default function SiteDescriptionEdit( { attributes, setAttributes } ) {
+ const { align } = attributes;
const [ description, setDescription ] = useEntityProp(
'root',
'site',
'description'
);
+
return (
<>
setAttributes( { align: newAlign } )
}
+ value={ align }
/>
+
>
);
From dabff3277b567d6bcd512a1e1f67851c957cb9fd Mon Sep 17 00:00:00 2001
From: Copons
Date: Wed, 8 Jul 2020 16:36:23 +0100
Subject: [PATCH 3/6] Add fixtures
---
.../e2e-tests/fixtures/block-transforms.js | 4 ++++
.../blocks/core__site-description.html | 1 +
.../blocks/core__site-description.json | 10 ++++++++++
.../blocks/core__site-description.parsed.json | 18 ++++++++++++++++++
.../core__site-description.serialized.html | 1 +
5 files changed, 34 insertions(+)
create mode 100644 packages/e2e-tests/fixtures/blocks/core__site-description.html
create mode 100644 packages/e2e-tests/fixtures/blocks/core__site-description.json
create mode 100644 packages/e2e-tests/fixtures/blocks/core__site-description.parsed.json
create mode 100644 packages/e2e-tests/fixtures/blocks/core__site-description.serialized.html
diff --git a/packages/e2e-tests/fixtures/block-transforms.js b/packages/e2e-tests/fixtures/block-transforms.js
index c9ebbc3ebe6ccf..e576a868345a85 100644
--- a/packages/e2e-tests/fixtures/block-transforms.js
+++ b/packages/e2e-tests/fixtures/block-transforms.js
@@ -332,6 +332,10 @@ export const EXPECTED_TRANSFORMS = {
originalBlock: 'Shortcode',
availableTransforms: [ 'Group' ],
},
+ 'core__site-description': {
+ availableTransforms: [ 'Group' ],
+ originalBlock: 'Site Description',
+ },
'core__site-title': {
availableTransforms: [ 'Group' ],
originalBlock: 'Site Title',
diff --git a/packages/e2e-tests/fixtures/blocks/core__site-description.html b/packages/e2e-tests/fixtures/blocks/core__site-description.html
new file mode 100644
index 00000000000000..5db296de25450d
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__site-description.html
@@ -0,0 +1 @@
+
diff --git a/packages/e2e-tests/fixtures/blocks/core__site-description.json b/packages/e2e-tests/fixtures/blocks/core__site-description.json
new file mode 100644
index 00000000000000..06c3abba355292
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__site-description.json
@@ -0,0 +1,10 @@
+[
+ {
+ "clientId": "_clientId_0",
+ "name": "core/site-description",
+ "isValid": true,
+ "attributes": {},
+ "innerBlocks": [],
+ "originalContent": ""
+ }
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__site-description.parsed.json b/packages/e2e-tests/fixtures/blocks/core__site-description.parsed.json
new file mode 100644
index 00000000000000..8afd2146570ac2
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__site-description.parsed.json
@@ -0,0 +1,18 @@
+[
+ {
+ "blockName": "core/site-description",
+ "attrs": {},
+ "innerBlocks": [],
+ "innerHTML": "",
+ "innerContent": []
+ },
+ {
+ "blockName": null,
+ "attrs": {},
+ "innerBlocks": [],
+ "innerHTML": "\n",
+ "innerContent": [
+ "\n"
+ ]
+ }
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__site-description.serialized.html b/packages/e2e-tests/fixtures/blocks/core__site-description.serialized.html
new file mode 100644
index 00000000000000..5db296de25450d
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__site-description.serialized.html
@@ -0,0 +1 @@
+
From a008cdc79a89ed731e1d15b31ee14d9c3bbd1fae Mon Sep 17 00:00:00 2001
From: Copons
Date: Mon, 13 Jul 2020 14:30:35 +0100
Subject: [PATCH 4/6] Add support for experimental colors, font size, line
height
---
.../developers/themes/theme-json.md | 15 +++++++++++++++
.../block-library/src/site-description/block.json | 7 ++++++-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/docs/designers-developers/developers/themes/theme-json.md b/docs/designers-developers/developers/themes/theme-json.md
index 3db274fbe70e0c..b7347ce03cd2b2 100644
--- a/docs/designers-developers/developers/themes/theme-json.md
+++ b/docs/designers-developers/developers/themes/theme-json.md
@@ -168,6 +168,7 @@ Each block will declare which style properties it exposes. This has been coined
| Columns | Yes | Yes | Yes | Yes |
| Media & text | Yes | Yes | Yes | Yes |
| Site Title | Yes | Yes | - | Yes |
+| Site Description | Yes | Yes | - | Yes |
[1] The heading block represents 6 distinct HTML elements: H1-H6. It comes with selectors to target each individual element (ex: core/heading/h1 for H1, etc).
@@ -182,6 +183,7 @@ Each block will declare which style properties it exposes. This has been coined
| Columns | - | - |
| Media & text | - | - |
| Site Title | Yes | Yes |
+| Site Description | Yes | Yes |
[1] The heading block represents 6 distinct HTML elements: H1-H6. It comes with selectors to target each individual element (ex: core/heading/h1 for H1, etc).
@@ -394,6 +396,19 @@ The list of features that are currently supported are:
"lineHeight":
}
}
+ },
+ "core/site-description": {
+ "styles": {
+ "color": {
+ "background": ,
+ "gradient": ,
+ "text":
+ },
+ "typography": {
+ "fontSize": ,
+ "lineHeight":
+ }
+ }
}
}
```
diff --git a/packages/block-library/src/site-description/block.json b/packages/block-library/src/site-description/block.json
index fdae4232d55463..a9f08b1aba53fc 100644
--- a/packages/block-library/src/site-description/block.json
+++ b/packages/block-library/src/site-description/block.json
@@ -8,6 +8,11 @@
},
"supports": {
"html": false,
- "lightBlockWrapper": true
+ "lightBlockWrapper": true,
+ "__experimentalColor": {
+ "gradients": true
+ },
+ "__experimentalFontSize": true,
+ "__experimentalLineHeight": true
}
}
From dc82e489479ce76c0f24f1a1a1d333a83f3a6105 Mon Sep 17 00:00:00 2001
From: Copons
Date: Mon, 13 Jul 2020 15:03:48 +0100
Subject: [PATCH 5/6] Update name to Site Tagline
---
.../developers/themes/theme-json.md | 6 ++--
lib/blocks.php | 2 +-
packages/block-library/src/index.js | 4 +--
.../src/site-description/index.php | 36 -------------------
.../block.json | 2 +-
.../edit.js | 10 +++---
.../index.js | 2 +-
.../block-library/src/site-tagline/index.php | 36 +++++++++++++++++++
.../e2e-tests/fixtures/block-transforms.js | 4 +--
.../blocks/core__site-description.html | 1 -
.../core__site-description.serialized.html | 1 -
.../fixtures/blocks/core__site-tagline.html | 1 +
...scription.json => core__site-tagline.json} | 2 +-
...ed.json => core__site-tagline.parsed.json} | 2 +-
.../blocks/core__site-tagline.serialized.html | 1 +
15 files changed, 55 insertions(+), 55 deletions(-)
delete mode 100644 packages/block-library/src/site-description/index.php
rename packages/block-library/src/{site-description => site-tagline}/block.json (88%)
rename packages/block-library/src/{site-description => site-tagline}/edit.js (75%)
rename packages/block-library/src/{site-description => site-tagline}/index.js (90%)
create mode 100644 packages/block-library/src/site-tagline/index.php
delete mode 100644 packages/e2e-tests/fixtures/blocks/core__site-description.html
delete mode 100644 packages/e2e-tests/fixtures/blocks/core__site-description.serialized.html
create mode 100644 packages/e2e-tests/fixtures/blocks/core__site-tagline.html
rename packages/e2e-tests/fixtures/blocks/{core__site-description.json => core__site-tagline.json} (79%)
rename packages/e2e-tests/fixtures/blocks/{core__site-description.parsed.json => core__site-tagline.parsed.json} (86%)
create mode 100644 packages/e2e-tests/fixtures/blocks/core__site-tagline.serialized.html
diff --git a/docs/designers-developers/developers/themes/theme-json.md b/docs/designers-developers/developers/themes/theme-json.md
index b7347ce03cd2b2..9e28ec37a8a794 100644
--- a/docs/designers-developers/developers/themes/theme-json.md
+++ b/docs/designers-developers/developers/themes/theme-json.md
@@ -168,7 +168,7 @@ Each block will declare which style properties it exposes. This has been coined
| Columns | Yes | Yes | Yes | Yes |
| Media & text | Yes | Yes | Yes | Yes |
| Site Title | Yes | Yes | - | Yes |
-| Site Description | Yes | Yes | - | Yes |
+| Site Tagline | Yes | Yes | - | Yes |
[1] The heading block represents 6 distinct HTML elements: H1-H6. It comes with selectors to target each individual element (ex: core/heading/h1 for H1, etc).
@@ -183,7 +183,7 @@ Each block will declare which style properties it exposes. This has been coined
| Columns | - | - |
| Media & text | - | - |
| Site Title | Yes | Yes |
-| Site Description | Yes | Yes |
+| Site Tagline | Yes | Yes |
[1] The heading block represents 6 distinct HTML elements: H1-H6. It comes with selectors to target each individual element (ex: core/heading/h1 for H1, etc).
@@ -397,7 +397,7 @@ The list of features that are currently supported are:
}
}
},
- "core/site-description": {
+ "core/site-tagline": {
"styles": {
"color": {
"background": ,
diff --git a/lib/blocks.php b/lib/blocks.php
index 2e36245da81969..b9bf822ea318d9 100644
--- a/lib/blocks.php
+++ b/lib/blocks.php
@@ -86,8 +86,8 @@ function gutenberg_reregister_core_block_types() {
'query.php' => 'core/query',
'query-loop.php' => 'core/query-loop',
'query-pagination.php' => 'core/query-pagination',
- 'site-description.php' => 'core/site-description',
'site-logo.php' => 'core/site-logo',
+ 'site-tagline.php' => 'core/site-tagline',
'site-title.php' => 'core/site-title',
'template-part.php' => 'core/template-part',
)
diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js
index e58b0db5a270c4..c962c8172dec66 100644
--- a/packages/block-library/src/index.js
+++ b/packages/block-library/src/index.js
@@ -66,8 +66,8 @@ import * as widgetArea from './widget-area';
// Full Site Editing Blocks
import * as siteLogo from './site-logo';
+import * as siteTagline from './site-tagline';
import * as siteTitle from './site-title';
-import * as siteDescription from './site-description';
import * as templatePart from './template-part';
import * as query from './query';
import * as queryLoop from './query-loop';
@@ -200,8 +200,8 @@ export const __experimentalRegisterExperimentalCoreBlocks =
// Register Full Site Editing Blocks.
...( __experimentalEnableFullSiteEditing
? [
- siteDescription,
siteLogo,
+ siteTagline,
siteTitle,
templatePart,
query,
diff --git a/packages/block-library/src/site-description/index.php b/packages/block-library/src/site-description/index.php
deleted file mode 100644
index 40cbebfc48545b..00000000000000
--- a/packages/block-library/src/site-description/index.php
+++ /dev/null
@@ -1,36 +0,0 @@
-%2$s',
- 'wp-block-site-description' . esc_attr( $align_class_name ),
- get_bloginfo( 'description' )
- );
-}
-
-/**
- * Registers the `core/site-description` block on the server.
- */
-function register_block_core_site_description() {
- register_block_type_from_metadata(
- __DIR__ . '/site-description',
- array(
- 'render_callback' => 'render_block_core_site_description',
- )
- );
-}
-add_action( 'init', 'register_block_core_site_description' );
diff --git a/packages/block-library/src/site-description/block.json b/packages/block-library/src/site-tagline/block.json
similarity index 88%
rename from packages/block-library/src/site-description/block.json
rename to packages/block-library/src/site-tagline/block.json
index a9f08b1aba53fc..d9d0577d824a15 100644
--- a/packages/block-library/src/site-description/block.json
+++ b/packages/block-library/src/site-tagline/block.json
@@ -1,5 +1,5 @@
{
- "name": "core/site-description",
+ "name": "core/site-tagline",
"category": "design",
"attributes": {
"align": {
diff --git a/packages/block-library/src/site-description/edit.js b/packages/block-library/src/site-tagline/edit.js
similarity index 75%
rename from packages/block-library/src/site-description/edit.js
rename to packages/block-library/src/site-tagline/edit.js
index 8fdfd272f614f3..eff39e55c3b910 100644
--- a/packages/block-library/src/site-description/edit.js
+++ b/packages/block-library/src/site-tagline/edit.js
@@ -15,9 +15,9 @@ import {
} from '@wordpress/block-editor';
import { __ } from '@wordpress/i18n';
-export default function SiteDescriptionEdit( { attributes, setAttributes } ) {
+export default function SiteTaglineEdit( { attributes, setAttributes } ) {
const { align } = attributes;
- const [ description, setDescription ] = useEntityProp(
+ const [ siteTagline, setSiteTagline ] = useEntityProp(
'root',
'site',
'description'
@@ -39,10 +39,10 @@ export default function SiteDescriptionEdit( { attributes, setAttributes } ) {
className={ classnames( {
[ `has-text-align-${ align }` ]: align,
} ) }
- onChange={ setDescription }
- placeholder={ __( 'Site Description' ) }
+ onChange={ setSiteTagline }
+ placeholder={ __( 'Site Tagline' ) }
tagName={ Block.p }
- value={ description }
+ value={ siteTagline }
/>
>
);
diff --git a/packages/block-library/src/site-description/index.js b/packages/block-library/src/site-tagline/index.js
similarity index 90%
rename from packages/block-library/src/site-description/index.js
rename to packages/block-library/src/site-tagline/index.js
index cabfdcd5ed0656..eb6787e6d518b8 100644
--- a/packages/block-library/src/site-description/index.js
+++ b/packages/block-library/src/site-tagline/index.js
@@ -14,7 +14,7 @@ const { name } = metadata;
export { metadata, name };
export const settings = {
- title: __( 'Site Description' ),
+ title: __( 'Site Tagline' ),
icon,
edit,
};
diff --git a/packages/block-library/src/site-tagline/index.php b/packages/block-library/src/site-tagline/index.php
new file mode 100644
index 00000000000000..c7461b19a4a20a
--- /dev/null
+++ b/packages/block-library/src/site-tagline/index.php
@@ -0,0 +1,36 @@
+%2$s',
+ 'wp-block-site-tagline' . esc_attr( $align_class_name ),
+ get_bloginfo( 'description' )
+ );
+}
+
+/**
+ * Registers the `core/site-tagline` block on the server.
+ */
+function register_block_core_site_tagline() {
+ register_block_type_from_metadata(
+ __DIR__ . '/site-tagline',
+ array(
+ 'render_callback' => 'render_block_core_site_tagline',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_site_tagline' );
diff --git a/packages/e2e-tests/fixtures/block-transforms.js b/packages/e2e-tests/fixtures/block-transforms.js
index e576a868345a85..35404b9dec474b 100644
--- a/packages/e2e-tests/fixtures/block-transforms.js
+++ b/packages/e2e-tests/fixtures/block-transforms.js
@@ -332,9 +332,9 @@ export const EXPECTED_TRANSFORMS = {
originalBlock: 'Shortcode',
availableTransforms: [ 'Group' ],
},
- 'core__site-description': {
+ 'core__site-tagline': {
availableTransforms: [ 'Group' ],
- originalBlock: 'Site Description',
+ originalBlock: 'Site Tagline',
},
'core__site-title': {
availableTransforms: [ 'Group' ],
diff --git a/packages/e2e-tests/fixtures/blocks/core__site-description.html b/packages/e2e-tests/fixtures/blocks/core__site-description.html
deleted file mode 100644
index 5db296de25450d..00000000000000
--- a/packages/e2e-tests/fixtures/blocks/core__site-description.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/packages/e2e-tests/fixtures/blocks/core__site-description.serialized.html b/packages/e2e-tests/fixtures/blocks/core__site-description.serialized.html
deleted file mode 100644
index 5db296de25450d..00000000000000
--- a/packages/e2e-tests/fixtures/blocks/core__site-description.serialized.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/packages/e2e-tests/fixtures/blocks/core__site-tagline.html b/packages/e2e-tests/fixtures/blocks/core__site-tagline.html
new file mode 100644
index 00000000000000..c332ab1cb57bb1
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__site-tagline.html
@@ -0,0 +1 @@
+
diff --git a/packages/e2e-tests/fixtures/blocks/core__site-description.json b/packages/e2e-tests/fixtures/blocks/core__site-tagline.json
similarity index 79%
rename from packages/e2e-tests/fixtures/blocks/core__site-description.json
rename to packages/e2e-tests/fixtures/blocks/core__site-tagline.json
index 06c3abba355292..35075600dc0d19 100644
--- a/packages/e2e-tests/fixtures/blocks/core__site-description.json
+++ b/packages/e2e-tests/fixtures/blocks/core__site-tagline.json
@@ -1,7 +1,7 @@
[
{
"clientId": "_clientId_0",
- "name": "core/site-description",
+ "name": "core/site-tagline",
"isValid": true,
"attributes": {},
"innerBlocks": [],
diff --git a/packages/e2e-tests/fixtures/blocks/core__site-description.parsed.json b/packages/e2e-tests/fixtures/blocks/core__site-tagline.parsed.json
similarity index 86%
rename from packages/e2e-tests/fixtures/blocks/core__site-description.parsed.json
rename to packages/e2e-tests/fixtures/blocks/core__site-tagline.parsed.json
index 8afd2146570ac2..c5d544814b04ad 100644
--- a/packages/e2e-tests/fixtures/blocks/core__site-description.parsed.json
+++ b/packages/e2e-tests/fixtures/blocks/core__site-tagline.parsed.json
@@ -1,6 +1,6 @@
[
{
- "blockName": "core/site-description",
+ "blockName": "core/site-tagline",
"attrs": {},
"innerBlocks": [],
"innerHTML": "",
diff --git a/packages/e2e-tests/fixtures/blocks/core__site-tagline.serialized.html b/packages/e2e-tests/fixtures/blocks/core__site-tagline.serialized.html
new file mode 100644
index 00000000000000..c332ab1cb57bb1
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__site-tagline.serialized.html
@@ -0,0 +1 @@
+
From 82d74e3f850e1f9e44a1e355f2a5ec3adba31d3e Mon Sep 17 00:00:00 2001
From: Copons
Date: Mon, 13 Jul 2020 18:25:50 +0100
Subject: [PATCH 6/6] Add icon and keywords
---
packages/block-library/src/site-tagline/icon.js | 11 +++++++++++
packages/block-library/src/site-tagline/index.js | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
create mode 100644 packages/block-library/src/site-tagline/icon.js
diff --git a/packages/block-library/src/site-tagline/icon.js b/packages/block-library/src/site-tagline/icon.js
new file mode 100644
index 00000000000000..9e708e94fafd79
--- /dev/null
+++ b/packages/block-library/src/site-tagline/icon.js
@@ -0,0 +1,11 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/components';
+
+export default (
+
+);
diff --git a/packages/block-library/src/site-tagline/index.js b/packages/block-library/src/site-tagline/index.js
index eb6787e6d518b8..13186a9fa54658 100644
--- a/packages/block-library/src/site-tagline/index.js
+++ b/packages/block-library/src/site-tagline/index.js
@@ -2,19 +2,20 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
-import { info as icon } from '@wordpress/icons';
/**
* Internal dependencies
*/
import metadata from './block.json';
import edit from './edit';
+import icon from './icon';
const { name } = metadata;
export { metadata, name };
export const settings = {
title: __( 'Site Tagline' ),
+ keywords: [ __( 'description' ) ],
icon,
edit,
};