Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bundled Themes: Revert 56451. 

Reverts [56451] to avoid the following issues:

* missing the default `font-size` for anyone who does not use the size control.
* unintentional reduction in citation's `line-height` down to the `--pullquote--line-height` value (1.3 instead of 1.6).

With 6.4 RC1 happening shortly, this revert is necessary to avoid shipping this issues in the release, while giving the time needed to resolve in the next cycle.

Follow-up to [56451].

Props sabernhardt, nicolefurlan.
See #57854.
Built from https://develop.svn.wordpress.org/trunk@56959


git-svn-id: http://core.svn.wordpress.org/trunk@56470 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
hellofromTonya 2023-10-17 13:50:21 +00:00
parent 5dc3f83a07
commit 3d5cf30808
8 changed files with 55 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wp-content/themes/twentytwentyone/assets/css/ie-editor.css
View File

@ -1507,11 +1507,6 @@ pre.wp-block-preformatted {
color: currentColor;
border-color: currentColor;
position: relative;
font-weight: 700;
font-style: normal;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
letter-spacing: normal;
line-height: 1.3;
}
.wp-block-pullquote blockquote::before {
@ -1526,14 +1521,20 @@ pre.wp-block-preformatted {
}
.wp-block-pullquote p {
font-family: inherit;
font-size: inherit;
font-style: inherit;
font-weight: inherit;
letter-spacing: inherit;
line-height: inherit;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
font-size: 2rem;
font-style: normal;
font-weight: 700;
letter-spacing: normal;
line-height: 1.3;
margin: 0;
}
@media only screen and (min-width: 652px) {
.wp-block-pullquote p {
font-size: 2rem;
}
}
.wp-block-pullquote a {
color: currentColor;

23
wp-content/themes/twentytwentyone/assets/css/ie.css
View File

@ -3655,11 +3655,6 @@ pre.wp-block-preformatted {
color: currentColor;
border-color: currentColor;
position: relative;
font-weight: 700;
font-style: normal;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
letter-spacing: normal;
line-height: 1.3;
/**
* Block Options
@ -3678,14 +3673,20 @@ pre.wp-block-preformatted {
}
.wp-block-pullquote p {
font-family: inherit;
font-size: inherit;
font-style: inherit;
font-weight: inherit;
letter-spacing: inherit;
line-height: inherit;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
font-size: 2rem;
font-style: normal;
font-weight: 700;
letter-spacing: normal;
line-height: 1.3;
margin: 0;
}
@media only screen and (min-width: 652px) {
.wp-block-pullquote p {
font-size: 2rem;
}
}
.wp-block-pullquote a {
color: currentColor;

17
wp-content/themes/twentytwentyone/assets/css/style-editor.css
View File

@ -1419,11 +1419,6 @@ pre.wp-block-preformatted {
color: currentColor;
border-color: currentColor;
position: relative;
font-weight: 700;
font-style: var(--pullquote--font-style);
font-family: var(--pullquote--font-family);
letter-spacing: var(--pullquote--letter-spacing);
line-height: var(--pullquote--line-height);
}
.wp-block-pullquote blockquote::before {
@ -1438,12 +1433,12 @@ pre.wp-block-preformatted {
}
.wp-block-pullquote p {
font-family: inherit;
font-size: inherit;
font-style: inherit;
font-weight: inherit;
letter-spacing: inherit;
line-height: inherit;
font-family: var(--pullquote--font-family);
font-size: var(--pullquote--font-size);
font-style: var(--pullquote--font-style);
font-weight: 700;
letter-spacing: var(--pullquote--letter-spacing);
line-height: var(--pullquote--line-height);
margin: 0;
}

17
wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_editor.scss
View File

@ -7,11 +7,6 @@
color: currentColor;
border-color: currentColor;
position: relative;
font-weight: 700;
font-style: var(--pullquote--font-style);
font-family: var(--pullquote--font-family);
letter-spacing: var(--pullquote--letter-spacing);
line-height: var(--pullquote--line-height);
blockquote::before {
color: currentColor;
@ -25,12 +20,12 @@
}
p {
font-family: inherit;
font-size: inherit;
font-style: inherit;
font-weight: inherit;
letter-spacing: inherit;
line-height: inherit;
font-family: var(--pullquote--font-family);
font-size: var(--pullquote--font-size);
font-style: var(--pullquote--font-style);
font-weight: 700;
letter-spacing: var(--pullquote--letter-spacing);
line-height: var(--pullquote--line-height);
margin: 0;
}

17
wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_style.scss
View File

@ -7,11 +7,6 @@
color: currentColor;
border-color: currentColor;
position: relative;
font-weight: 700;
font-style: var(--pullquote--font-style);
font-family: var(--pullquote--font-family);
letter-spacing: var(--pullquote--letter-spacing);
line-height: var(--pullquote--line-height);
blockquote::before {
color: currentColor;
@ -25,12 +20,12 @@
}
p {
font-family: inherit;
font-size: inherit;
font-style: inherit;
font-weight: inherit;
letter-spacing: inherit;
line-height: inherit;
font-family: var(--pullquote--font-family);
font-size: var(--pullquote--font-size);
font-style: var(--pullquote--font-style);
font-weight: 700;
letter-spacing: var(--pullquote--letter-spacing);
line-height: var(--pullquote--line-height);
margin: 0;
}

17
wp-content/themes/twentytwentyone/style-rtl.css
View File

@ -2814,11 +2814,6 @@ pre.wp-block-preformatted {
color: currentColor;
border-color: currentColor;
position: relative;
font-weight: 700;
font-style: var(--pullquote--font-style);
font-family: var(--pullquote--font-family);
letter-spacing: var(--pullquote--letter-spacing);
line-height: var(--pullquote--line-height);
/**
* Block Options
@ -2837,12 +2832,12 @@ pre.wp-block-preformatted {
}
.wp-block-pullquote p {
font-family: inherit;
font-size: inherit;
font-style: inherit;
font-weight: inherit;
letter-spacing: inherit;
line-height: inherit;
font-family: var(--pullquote--font-family);
font-size: var(--pullquote--font-size);
font-style: var(--pullquote--font-style);
font-weight: 700;
letter-spacing: var(--pullquote--letter-spacing);
line-height: var(--pullquote--line-height);
margin: 0;
}

17
wp-content/themes/twentytwentyone/style.css
View File

@ -2824,11 +2824,6 @@ pre.wp-block-preformatted {
color: currentColor;
border-color: currentColor;
position: relative;
font-weight: 700;
font-style: var(--pullquote--font-style);
font-family: var(--pullquote--font-family);
letter-spacing: var(--pullquote--letter-spacing);
line-height: var(--pullquote--line-height);
/**
* Block Options
@ -2847,12 +2842,12 @@ pre.wp-block-preformatted {
}
.wp-block-pullquote p {
font-family: inherit;
font-size: inherit;
font-style: inherit;
font-weight: inherit;
letter-spacing: inherit;
line-height: inherit;
font-family: var(--pullquote--font-family);
font-size: var(--pullquote--font-size);
font-style: var(--pullquote--font-style);
font-weight: 700;
letter-spacing: var(--pullquote--letter-spacing);
line-height: var(--pullquote--line-height);
margin: 0;
}

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.4-beta4-56958';
$wp_version = '6.4-beta4-56959';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.