Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

Bundled Themes: Fix alignment and styles for quote, verse, and code blocks.

Browse Source 
Updates older themes to fix alignment, spacing, and font issues to better match the frontend display. Applies to themes: Twenty Eleven, Twenty Thirteen, Twenty Fourteen, Twenty Sixteen, Twenty Seventeen, and Twenty Twenty.

Props burnuser, talldanwp, cristinasoponar, poena, kjellr
Fixes #52009.


Built from https://develop.svn.wordpress.org/trunk@50358


git-svn-id: http://core.svn.wordpress.org/trunk@49969 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryelle 2021-02-16 18:59:04 +00:00
parent 6cb1eaa583
commit 5f56591fe5
13 changed files with 87 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wp-content/themes/twentyeleven/editor-blocks.css
View File

@ -267,17 +267,19 @@ p.has-drop-cap:not(:focus)::first-letter {
padding: 0; padding: 0;
} }
.edit-post-visual-editor .editor-block-list__block .wp-block-quote p { .edit-post-visual-editor .editor-block-list__block .wp-block-quote p,
.editor-styles-wrapper .wp-block-quote p {
font-family: Georgia, "Bitstream Charter", serif; font-family: Georgia, "Bitstream Charter", serif;
} }
.wp-block-quote:not(.is-large):not(.is-style-large) { .wp-block-quote:not(.is-large):not(.is-style-large) {
border: 0; border: 0;
padding-left: 0; padding-left: 3em;
padding-right: 0; padding-right: 3em;
} }
.wp-block-quote .wp-block-quote__citation.editor-rich-text__tinymce.mce-content-body { .wp-block-quote .wp-block-quote__citation.editor-rich-text__tinymce.mce-content-body,
.wp-block-quote .wp-block-quote__citation {
color: #666; color: #666;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 300; font-weight: 300;
@ -331,7 +333,7 @@ p.has-drop-cap:not(:focus)::first-letter {
/* Code */ /* Code */
.wp-block-code { .editor-styles-wrapper .wp-block-code {
background: transparent; background: transparent;
border: 0; border: 0;
padding: 0; padding: 0;
@ -339,7 +341,8 @@ p.has-drop-cap:not(:focus)::first-letter {
/* Pullquote */ /* Pullquote */
.edit-post-visual-editor .editor-block-list__block .wp-block-pullquote p { .edit-post-visual-editor .editor-block-list__block .wp-block-pullquote p,
.editor-styles-wrapper .wp-block-pullquote p {
font-family: Georgia, "Bitstream Charter", serif; font-family: Georgia, "Bitstream Charter", serif;
font-style: italic; font-style: italic;
font-weight: normal; font-weight: normal;
@ -368,6 +371,12 @@ p.has-drop-cap:not(:focus)::first-letter {
text-align: right; text-align: right;
} }
/* Verse */
.editor-styles-wrapper .wp-block-verse {
font-family: inherit;
}
/*-------------------------------------------------------------- /*--------------------------------------------------------------
5.0 Blocks - Layout Elements 5.0 Blocks - Layout Elements

8
wp-content/themes/twentyfifteen/css/editor-blocks.css
View File

@ -635,7 +635,7 @@ p.has-drop-cap:not(:focus)::first-letter {
/* Code */ /* Code */
.wp-block-code, .editor-styles-wrapper .wp-block-code,
.wp-block-freeform.block-library-rich-text__tinymce code { .wp-block-freeform.block-library-rich-text__tinymce code {
background: transparent; background: transparent;
border: 0; border: 0;
@ -706,6 +706,12 @@ p.has-drop-cap:not(:focus)::first-letter {
text-align: right; text-align: right;
} }
/* Verse */
.editor-styles-wrapper .wp-block-verse {
font-family: inherit;
}
/*-------------------------------------------------------------- /*--------------------------------------------------------------
5.0 Blocks - Layout Elements 5.0 Blocks - Layout Elements
--------------------------------------------------------------*/ --------------------------------------------------------------*/

1
wp-content/themes/twentyfifteen/css/editor-style.css
View File

@ -163,7 +163,6 @@ pre {
font-size: 17px; font-size: 17px;
line-height: 1.2353; line-height: 1.2353;
margin-bottom: 28px; margin-bottom: 28px;
max-width: 100%;
overflow: auto; overflow: auto;
padding: 14px; padding: 14px;
white-space: pre; white-space: pre;

10
wp-content/themes/twentyfourteen/css/editor-blocks.css
View File

@ -350,9 +350,9 @@ p.has-drop-cap:not(:focus)::first-letter {
4.0 Blocks - Formatting 4.0 Blocks - Formatting
--------------------------------------------------------------*/ --------------------------------------------------------------*/
/* Code */ /* Code (Added specficity required to override TinyMCE styles) */
.wp-block-code { .editor-styles-wrapper .wp-block-code {
border: 0; border: 0;
padding: 0; padding: 0;
} }
@ -391,6 +391,12 @@ p.has-drop-cap:not(:focus)::first-letter {
} }
} }
/* Verse */
.editor-styles-wrapper .wp-block-verse {
font-family: inherit;
}
/*-------------------------------------------------------------- /*--------------------------------------------------------------
5.0 Blocks - Layout Elements 5.0 Blocks - Layout Elements
--------------------------------------------------------------*/ --------------------------------------------------------------*/

1
wp-content/themes/twentyfourteen/css/editor-style.css
View File

@ -153,7 +153,6 @@ pre {
pre { pre {
border: 1px solid rgba(0, 0, 0, 0.1); border: 1px solid rgba(0, 0, 0, 0.1);
margin-bottom: 24px; margin-bottom: 24px;
max-width: 100%;
overflow: auto; overflow: auto;
padding: 12px; padding: 12px;
white-space: pre; white-space: pre;

45
wp-content/themes/twentyseventeen/assets/css/editor-blocks.css
View File

@ -518,7 +518,7 @@ html[lang="th"] .edit-post-visual-editor * {
padding: 0; padding: 0;
} }
.editor-block-list__block .wp-block-quote .wp-block-quote__citation { .wp-block-quote .wp-block-quote__citation {
color: inherit; color: inherit;
display: block; display: block;
font-size: inherit; font-size: inherit;
@ -533,16 +533,16 @@ html[lang="th"] .edit-post-visual-editor * {
width: 48%; width: 48%;
} }
.editor-block-list__block .wp-block-quote.alignleft p, .wp-block-quote.alignleft p,
.editor-block-list__block .wp-block-quote.alignright p, .wp-block-quote.alignright p,
.editor-block-list__block .wp-block-quote.alignleft .wp-block-quote__citation, .wp-block-quote.alignleft .wp-block-quote__citation,
.editor-block-list__block .wp-block-quote.alignright .wp-block-quote__citation { .wp-block-quote.alignright .wp-block-quote__citation {
font-size: 13px; font-size: 13px;
font-size: 0.8125rem; font-size: 0.8125rem;
} }
.editor-block-list__block .wp-block-quote.alignleft p:last-of-type, .wp-block-quote.alignleft p:last-of-type,
.editor-block-list__block .wp-block-quote.alignright p:last-of-type { .wp-block-quote.alignright p:last-of-type {
margin-bottom: 0; margin-bottom: 0;
} }
@ -557,31 +557,31 @@ html[lang="th"] .edit-post-visual-editor * {
} }
@media screen and (min-width: 30em) { @media screen and (min-width: 30em) {
.editor-block-list__block .wp-block-quote.alignleft p, .wp-block-quote.alignleft p,
.editor-block-list__block .wp-block-quote.alignright p, .wp-block-quote.alignright p,
.editor-block-list__block .wp-block-quote.alignleft .wp-block-quote__citation, .wp-block-quote.alignleft .wp-block-quote__citation,
.editor-block-list__block .wp-block-quote.alignright .wp-block-quote__citation, .wp-block-quote.alignright .wp-block-quote__citation,
.editor-block-list__block .wp-block-quote footer { .wp-block-quote footer {
font-size: 14px; font-size: 14px;
font-size: 0.875rem; font-size: 0.875rem;
} }
} }
@media screen and (min-width: 48em) { @media screen and (min-width: 48em) {
.editor-block-list__block .wp-block-quote.alignleft p, .wp-block-quote.alignleft p,
.editor-block-list__block .wp-block-quote.alignright p, .wp-block-quote.alignright p,
.editor-block-list__block .wp-block-quote.alignleft .wp-block-quote__citation, .wp-block-quote.alignleft .wp-block-quote__citation,
.editor-block-list__block .wp-block-quote.alignright .wp-block-quote__citation { .wp-block-quote.alignright .wp-block-quote__citation {
font-size: 13px; font-size: 13px;
font-size: 0.8125rem; font-size: 0.8125rem;
} }
.editor-block-list__block .wp-block-quote.alignleft { .wp-block-quote.alignleft {
margin-left: -17.5%; margin-left: -17.5%;
width: 48%; width: 48%;
} }
.editor-block-list__block .wp-block-quote.alignright { .wp-block-quote.alignright {
margin-right: -17.5%; margin-right: -17.5%;
width: 48%; width: 48%;
} }
@ -617,9 +617,10 @@ html[lang="th"] .edit-post-visual-editor * {
/* Code */ /* Code */
.wp-block-code { .editor-styles-wrapper .wp-block-code {
border: 0; border: 0;
padding: 0; padding: 0;
background-color: transparent;
} }
.editor-styles-wrapper .wp-block-code code { .editor-styles-wrapper .wp-block-code code {
@ -704,6 +705,12 @@ table.wp-block-table td:last-child {
text-align: right; text-align: right;
} }
/* Verse */
.editor-styles-wrapper .wp-block-verse {
font-family: inherit;
}
/*-------------------------------------------------------------- /*--------------------------------------------------------------
5.0 Blocks - Layout Elements 5.0 Blocks - Layout Elements
--------------------------------------------------------------*/ --------------------------------------------------------------*/

1
wp-content/themes/twentyseventeen/assets/css/editor-style.css
View File

@ -149,7 +149,6 @@ pre {
font-size: 0.9375rem; font-size: 0.9375rem;
line-height: 1.6; line-height: 1.6;
margin-bottom: 1.6em; margin-bottom: 1.6em;
max-width: 100%;
overflow: auto; overflow: auto;
padding: 1.6em; padding: 1.6em;
} }

18
wp-content/themes/twentysixteen/css/editor-blocks.css
View File

@ -365,15 +365,6 @@ Description: Used to style blocks in the editor.
width: -webkit-calc(50% - 0.736842105em); width: -webkit-calc(50% - 0.736842105em);
width: calc(50% - 0.736842105em); width: calc(50% - 0.736842105em);
} }
.wp-block-quote:not(.alignleft):not(.alignright) {
margin-left: -1.473684211em;
}
.rtl .wp-block-quote:not(.alignleft):not(.alignright) {
margin-left: 0;
margin-right: -1.473684211em;
}
} }
@media screen and (min-width: 80em) { @media screen and (min-width: 80em) {
@ -410,9 +401,10 @@ Description: Used to style blocks in the editor.
/* Code */ /* Code */
.wp-block-code { .editor-styles-wrapper .wp-block-code {
border: 0; border: 0;
padding: 0.125em 0.25em; padding: 0.125em 0.25em;
background-color: #d1d1d1;
} }
/* Classic */ /* Classic */
@ -535,6 +527,12 @@ Description: Used to style blocks in the editor.
text-align: right; text-align: right;
} }
/* Verse */
.editor-styles-wrapper .wp-block-verse {
font-family: inherit;
}
/*-------------------------------------------------------------- /*--------------------------------------------------------------
5.0 Blocks - Layout Elements 5.0 Blocks - Layout Elements
--------------------------------------------------------------*/ --------------------------------------------------------------*/

6
wp-content/themes/twentysixteen/css/editor-style.css
View File

@ -120,10 +120,6 @@ blockquote {
padding: 0 0 0 24px; padding: 0 0 0 24px;
} }
blockquote:not(.alignleft):not(.alignright) {
margin-left: -28px;
}
blockquote blockquote:not(.alignleft):not(.alignright) { blockquote blockquote:not(.alignleft):not(.alignright) {
margin-left: 0; margin-left: 0;
} }
@ -188,7 +184,6 @@ pre {
font-size: 16px; font-size: 16px;
line-height: 1.3125; line-height: 1.3125;
margin: 0 0 28px; margin: 0 0 28px;
max-width: 100%;
overflow: auto; overflow: auto;
padding: 14px; padding: 14px;
white-space: pre; white-space: pre;
@ -519,7 +514,6 @@ fieldset {
} }
.rtl blockquote:not(.alignleft):not(.alignright) { .rtl blockquote:not(.alignleft):not(.alignright) {
margin-right: -28px;
padding: 0 24px 0 0; padding: 0 24px 0 0;
} }

19
wp-content/themes/twentythirteen/css/editor-blocks.css
View File

@ -164,7 +164,8 @@ Description: Used to style blocks in the editor.
/* Code */ /* Code */
.wp-block-freeform.block-library-rich-text__tinymce code { .wp-block-freeform.block-library-rich-text__tinymce code,
.editor-styles-wrapper .wp-block-code {
background: transparent; background: transparent;
} }
@ -220,14 +221,16 @@ p.has-drop-cap:not(:focus)::first-letter {
.wp-block-quote:not(.is-large):not(.is-style-large) { .wp-block-quote:not(.is-large):not(.is-style-large) {
border-left: 0; border-left: 0;
border-right: 0; border-right: 0;
padding-left: 0; padding-left: 40px;
padding-right: 0; padding-right: 40px;
} }
.wp-block-quote .wp-block-quote__citation.editor-rich-text__tinymce.mce-content-body { .wp-block-quote .wp-block-quote__citation.editor-rich-text__tinymce.mce-content-body,
.wp-block-quote .wp-block-quote__citation {
color: inherit; color: inherit;
font-size: 16px; font-size: 16px;
font-style: italic; font-style: italic;
font-weight: normal;
text-transform: uppercase; text-transform: uppercase;
} }
@ -269,13 +272,19 @@ p.has-drop-cap:not(:focus)::first-letter {
text-decoration: none; text-decoration: none;
} }
/* Verse */
.editor-styles-wrapper .wp-block-verse {
font-family: inherit;
}
/*-------------------------------------------------------------- /*--------------------------------------------------------------
5.0 Blocks - Formatting 5.0 Blocks - Formatting
--------------------------------------------------------------*/ --------------------------------------------------------------*/
/* Code */ /* Code */
.wp-block-code { .editor-styles-wrapper .wp-block-code {
border: 0; border: 0;
padding: 0; padding: 0;
} }

6
wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css
View File

@ -619,7 +619,8 @@ hr.wp-block-separator.is-style-dots::before {
border-color: #cd2653; border-color: #cd2653;
border-style: solid; border-style: solid;
border-width: 0 2px 0 0; border-width: 0 2px 0 0;
margin: 20px 0; margin-top: 20px;
margin-bottom: 20px;
padding: 5px 20px 5px 0; padding: 5px 20px 5px 0;
} }
@ -878,7 +879,8 @@ hr.wp-block-separator.is-style-dots::before {
.editor-styles-wrapper .wp-block-verse pre, .editor-styles-wrapper .wp-block-verse pre,
.editor-styles-wrapper pre.wp-block-verse { .editor-styles-wrapper pre.wp-block-verse {
font-size: 0.75em; font-family: NonBreakingSpaceOverride, "Hoefler Text", Garamond, "Times New Roman", serif;
font-size: 0.9em;
} }

6
wp-content/themes/twentytwenty/assets/css/editor-style-block.css
View File

@ -619,7 +619,8 @@ hr.wp-block-separator.is-style-dots::before {
border-color: #cd2653; border-color: #cd2653;
border-style: solid; border-style: solid;
border-width: 0 0 0 2px; border-width: 0 0 0 2px;
margin: 20px 0; margin-top: 20px;
margin-bottom: 20px;
padding: 5px 0 5px 20px; padding: 5px 0 5px 20px;
} }
@ -878,7 +879,8 @@ hr.wp-block-separator.is-style-dots::before {
.editor-styles-wrapper .wp-block-verse pre, .editor-styles-wrapper .wp-block-verse pre,
.editor-styles-wrapper pre.wp-block-verse { .editor-styles-wrapper pre.wp-block-verse {
font-size: 0.75em; font-family: NonBreakingSpaceOverride, "Hoefler Text", Garamond, "Times New Roman", serif;
font-size: 0.9em;
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.7-beta2-50357'; $wp_version = '5.7-beta2-50358';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.