From 15dd5b3af405148505615ced8b189d2f929b70d5 Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Mon, 11 Dec 2023 15:45:14 +0100 Subject: [PATCH 1/3] Social Icons: update Patreon icon Fixes #56925 Patreon's logo is changing: https://news.patreon.com/articles/patreon-reimagined Our Social Icons logo should change too. --- packages/block-library/src/social-link/icons/patreon.js | 7 +++---- packages/block-library/src/social-link/index.php | 2 +- .../block-library/src/social-link/socials-with-bg.scss | 2 +- .../block-library/src/social-link/socials-without-bg.scss | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/block-library/src/social-link/icons/patreon.js b/packages/block-library/src/social-link/icons/patreon.js index 9970d49eb4e0f..c90cc3c27f1b0 100644 --- a/packages/block-library/src/social-link/icons/patreon.js +++ b/packages/block-library/src/social-link/icons/patreon.js @@ -1,11 +1,10 @@ /** * WordPress dependencies */ -import { Circle, Rect, SVG } from '@wordpress/primitives'; +import { Path, SVG } from '@wordpress/primitives'; export const PatreonIcon = () => ( - - - + + ); diff --git a/packages/block-library/src/social-link/index.php b/packages/block-library/src/social-link/index.php index b203a662822f5..9b73e57aea735 100644 --- a/packages/block-library/src/social-link/index.php +++ b/packages/block-library/src/social-link/index.php @@ -228,7 +228,7 @@ function block_core_social_link_services( $service = '', $field = '' ) { ), 'patreon' => array( 'name' => 'Patreon', - 'icon' => '', + 'icon' => '', ), 'pinterest' => array( 'name' => 'Pinterest', diff --git a/packages/block-library/src/social-link/socials-with-bg.scss b/packages/block-library/src/social-link/socials-with-bg.scss index 6a5906483b5df..67528dac91457 100644 --- a/packages/block-library/src/social-link/socials-with-bg.scss +++ b/packages/block-library/src/social-link/socials-with-bg.scss @@ -114,7 +114,7 @@ } .wp-social-link-patreon { - background-color: #ff424d; + background-color: #000; color: #fff; } diff --git a/packages/block-library/src/social-link/socials-without-bg.scss b/packages/block-library/src/social-link/socials-without-bg.scss index 85e0c4f6af4d7..3979123bab60b 100644 --- a/packages/block-library/src/social-link/socials-without-bg.scss +++ b/packages/block-library/src/social-link/socials-without-bg.scss @@ -87,7 +87,7 @@ } .wp-social-link-patreon { - color: #ff424d; + color: #000; } .wp-social-link-pinterest { From b0cbe532b808133efd55b2042ec560f1f6c81a8c Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Mon, 29 Jan 2024 11:33:47 +0100 Subject: [PATCH 2/3] Add test fixtures for Patreon --- .../fixtures/blocks/core__social-link-patreon.html | 1 + .../fixtures/blocks/core__social-link-patreon.json | 11 +++++++++++ .../blocks/core__social-link-patreon.parsed.json | 11 +++++++++++ .../blocks/core__social-link-patreon.serialized.html | 1 + 4 files changed, 24 insertions(+) create mode 100644 test/integration/fixtures/blocks/core__social-link-patreon.html create mode 100644 test/integration/fixtures/blocks/core__social-link-patreon.json create mode 100644 test/integration/fixtures/blocks/core__social-link-patreon.parsed.json create mode 100644 test/integration/fixtures/blocks/core__social-link-patreon.serialized.html diff --git a/test/integration/fixtures/blocks/core__social-link-patreon.html b/test/integration/fixtures/blocks/core__social-link-patreon.html new file mode 100644 index 0000000000000..e1880adaf1f59 --- /dev/null +++ b/test/integration/fixtures/blocks/core__social-link-patreon.html @@ -0,0 +1 @@ + diff --git a/test/integration/fixtures/blocks/core__social-link-patreon.json b/test/integration/fixtures/blocks/core__social-link-patreon.json new file mode 100644 index 0000000000000..935f138ac9f09 --- /dev/null +++ b/test/integration/fixtures/blocks/core__social-link-patreon.json @@ -0,0 +1,11 @@ +[ + { + "name": "core/social-link", + "isValid": true, + "attributes": { + "url": "https://example.com/", + "service": "patreon" + }, + "innerBlocks": [] + } +] diff --git a/test/integration/fixtures/blocks/core__social-link-patreon.parsed.json b/test/integration/fixtures/blocks/core__social-link-patreon.parsed.json new file mode 100644 index 0000000000000..069bdad26ca10 --- /dev/null +++ b/test/integration/fixtures/blocks/core__social-link-patreon.parsed.json @@ -0,0 +1,11 @@ +[ + { + "blockName": "core/social-link-patreon", + "attrs": { + "url": "https://example.com/" + }, + "innerBlocks": [], + "innerHTML": "", + "innerContent": [] + } +] diff --git a/test/integration/fixtures/blocks/core__social-link-patreon.serialized.html b/test/integration/fixtures/blocks/core__social-link-patreon.serialized.html new file mode 100644 index 0000000000000..831e1926b4f64 --- /dev/null +++ b/test/integration/fixtures/blocks/core__social-link-patreon.serialized.html @@ -0,0 +1 @@ + From c5b2d96ff7ab432fa4a925494a0c82e359557569 Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Mon, 29 Jan 2024 11:45:25 +0100 Subject: [PATCH 3/3] Adjust alignment of the SVG --- packages/block-library/src/social-link/icons/patreon.js | 2 +- packages/block-library/src/social-link/index.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/block-library/src/social-link/icons/patreon.js b/packages/block-library/src/social-link/icons/patreon.js index c90cc3c27f1b0..04ef99a14706e 100644 --- a/packages/block-library/src/social-link/icons/patreon.js +++ b/packages/block-library/src/social-link/icons/patreon.js @@ -5,6 +5,6 @@ import { Path, SVG } from '@wordpress/primitives'; export const PatreonIcon = () => ( - + ); diff --git a/packages/block-library/src/social-link/index.php b/packages/block-library/src/social-link/index.php index cf81c908f55ee..12c2904d558c7 100644 --- a/packages/block-library/src/social-link/index.php +++ b/packages/block-library/src/social-link/index.php @@ -228,7 +228,7 @@ function block_core_social_link_services( $service = '', $field = '' ) { ), 'patreon' => array( 'name' => 'Patreon', - 'icon' => '', + 'icon' => '', ), 'pinterest' => array( 'name' => 'Pinterest',