Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove the Large style option from the quote block #37580

Merged
merged 5 commits into from
Jan 27, 2022
Merged

Remove the Large style option from the quote block #37580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b6162ce
Remove the large quote style option
carolinan Dec 22, 2021
7aa61e8
Try to update style variation e2e tests
carolinan Dec 22, 2021
65be753
fix e2e test
ntsekouras Dec 23, 2021
e015489
Add comment about backwards compatible CSS
carolinan Jan 11, 2022
002aab4
Make it easier to change styles
carolinan Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/block-library/src/quote/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@
"label": "Default",
"isDefault": true
},
{ "name": "plain", "label": "Plain" },
{ "name": "large", "label": "Large" }
{ "name": "plain", "label": "Plain" }
],
"editorStyle": "wp-block-quote-editor",
"style": "wp-block-quote"
Expand Down
1 change: 0 additions & 1 deletion packages/block-library/src/quote/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ export const settings = {
value:
'<p>' + __( 'In quoting others, we cite ourselves.' ) + '</p>',
citation: 'Julio Cortázar',
className: 'is-style-large',
},
},
transforms,
Expand Down
6 changes: 3 additions & 3 deletions packages/block-library/src/quote/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.wp-block-quote {
overflow-wrap: break-word; // Break long strings of text without spaces so they don't overflow the block.

&.is-style-large,
&.is-large {
// .is-style-large and .is-large are kept for backwards compatibility. The :not pseudo-class is used to enable switching styles. See PR #37580.
&.is-style-large:not(.is-style-plain),
&.is-large:not(.is-style-plain) {
margin-bottom: 1em;
padding: 0 1em;

Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/quote/theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
border: none;
padding-left: 0;
}

// .is-style-large and .is-large are kept for backwards compatibility.
&.is-style-plain,
&.is-style-large,
&.is-large {
Expand Down
7 changes: 0 additions & 7 deletions packages/e2e-tests/specs/editor/various/__snapshots__/style-variation.test.js.snap
View file
Open in desktop

This file was deleted.

14 changes: 9 additions & 5 deletions packages/e2e-tests/specs/editor/various/style-variation.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,24 @@ describe( 'adding blocks', () => {
await createNewPost();
} );

it( 'Should switch to the large style of the quote block', async () => {
it( 'Should switch to the plain style of the quote block', async () => {
// Inserting a quote block
await insertBlock( 'Quote' );
await page.keyboard.type( 'Quote content' );

await clickBlockToolbarButton( 'Quote' );

const largeStyleButton = await page.waitForXPath(
'//*[@role="menuitem"][contains(., "Large")]'
const plainStyleButton = await page.waitForXPath(
'//*[@role="menuitem"][contains(., "Plain")]'
);
await largeStyleButton.click();
await plainStyleButton.click();

// Check the content
const content = await getEditedPostContent();
expect( content ).toMatchSnapshot();
expect( content ).toMatchInlineSnapshot( `
"<!-- wp:quote {\\"className\\":\\"is-style-plain\\"} -->
<blockquote class=\\"wp-block-quote is-style-plain\\"><p>Quote content</p></blockquote>
<!-- /wp:quote -->"
` );
} );
} );