Bundled Themes: Correct list block alignment in editor styles.

Additionally:
* Indent nested lists in list and category blocks.
* Match ordered and unordered indentation for the classic block's lists.

This applies to:
* Twenty Ten
* Twenty Eleven
* Twenty Thirteen
* Twenty Fourteen
* Twenty Fifteen
* Twenty Sixteen
* Twenty Seventeen

Props sabernhardt, amolv, kjellr, audrasjb, francina.
Fixes #51157.
Built from https://develop.svn.wordpress.org/trunk@49511


git-svn-id: http://core.svn.wordpress.org/trunk@49266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-11-06 11:53:05 +00:00
parent a3faece50b
commit 3f7d705cfe
8 changed files with 112 additions and 90 deletions

View File

@ -96,11 +96,7 @@ Description: Used to style blocks in the editor.
.block-library-list ul.editor-rich-text__tinymce, .block-library-list ul.editor-rich-text__tinymce,
.edit-post-visual-editor ol, .edit-post-visual-editor ol,
.editor-block-list__block ol, .editor-block-list__block ol,
.block-library-list ol.editor-rich-text__tinymce { .block-library-list ol.editor-rich-text__tinymce,
margin: 0 0 1.625em 2.5em;
padding: 0;
}
.block-library-list .editor-rich-text__tinymce { .block-library-list .editor-rich-text__tinymce {
padding: 0; padding: 0;
} }
@ -146,14 +142,22 @@ Description: Used to style blocks in the editor.
margin-bottom: 0; margin-bottom: 0;
} }
.rtl .edit-post-visual-editor ul:not(.wp-block-gallery), .rtl .editor-styles-wrapper ul ul,
.rtl .editor-block-list__block ul:not(.wp-block-gallery), .rtl .editor-styles-wrapper ol ol,
.rtl .block-library-list ul, .rtl .editor-styles-wrapper ul ol,
.rtl .edit-post-visual-editor ol, .rtl .editor-styles-wrapper ol ul {
.rtl .editor-block-list__block ol,
.rtl .block-library-list ol {
margin-left: 0; margin-left: 0;
margin-right: 1.3333em; margin-right: 2.5em;
}
.wp-block-freeform.block-library-rich-text__tinymce ul,
.wp-block-freeform.block-library-rich-text__tinymce ol {
padding-left: 2.5em;
}
.rtl .wp-block-freeform.block-library-rich-text__tinymce ul,
.rtl .wp-block-freeform.block-library-rich-text__tinymce ol {
padding: 0;
} }
/* Captions */ /* Captions */

View File

@ -331,10 +331,7 @@ Description: Used to style blocks in the editor.
.block-library-list ul, .block-library-list ul,
.edit-post-visual-editor ol, .edit-post-visual-editor ol,
.editor-block-list__block ol, .editor-block-list__block ol,
.block-library-list ol { .block-library-list ol,
padding: 0;
}
.block-library-list .editor-rich-text__tinymce { .block-library-list .editor-rich-text__tinymce {
padding: 0; padding: 0;
} }
@ -365,14 +362,22 @@ Description: Used to style blocks in the editor.
margin-bottom: 0; margin-bottom: 0;
} }
.rtl .edit-post-visual-editor ul:not(.wp-block-gallery), .rtl .editor-styles-wrapper ul ul,
.rtl .editor-block-list__block ul:not(.wp-block-gallery), .rtl .editor-styles-wrapper ol ol,
.rtl .block-library-list ul, .rtl .editor-styles-wrapper ul ol,
.rtl .edit-post-visual-editor ol, .rtl .editor-styles-wrapper ol ul {
.rtl .editor-block-list__block ol,
.rtl .block-library-list ol {
margin-left: 0; margin-left: 0;
margin-right: 1.3333em; margin-right: 23px;
}
.wp-block-freeform.block-library-rich-text__tinymce ul,
.wp-block-freeform.block-library-rich-text__tinymce ol {
padding-left: 23px;
}
.rtl .wp-block-freeform.block-library-rich-text__tinymce ul,
.rtl .wp-block-freeform.block-library-rich-text__tinymce ol {
padding: 0;
} }
/* Quote */ /* Quote */

View File

@ -97,11 +97,7 @@ Description: Used to style blocks in the editor.
.block-library-list ul, .block-library-list ul,
.edit-post-visual-editor ol, .edit-post-visual-editor ol,
.editor-block-list__block ol, .editor-block-list__block ol,
.block-library-list ol { .block-library-list ol,
margin: 0 0 1.6em 1.3333em;
padding: 0;
}
.block-library-list .editor-rich-text__tinymce { .block-library-list .editor-rich-text__tinymce {
padding: 0; padding: 0;
} }
@ -132,14 +128,22 @@ Description: Used to style blocks in the editor.
margin-bottom: 0; margin-bottom: 0;
} }
.rtl .edit-post-visual-editor ul:not(.wp-block-gallery), .rtl .editor-styles-wrapper ul ul,
.rtl .editor-block-list__block ul:not(.wp-block-gallery), .rtl .editor-styles-wrapper ol ol,
.rtl .block-library-list ul, .rtl .editor-styles-wrapper ul ol,
.rtl .edit-post-visual-editor ol, .rtl .editor-styles-wrapper ol ul {
.rtl .editor-block-list__block ol,
.rtl .block-library-list ol {
margin-left: 0; margin-left: 0;
margin-right: 1.3333em; margin-right: 20px;
}
.wp-block-freeform.block-library-rich-text__tinymce ul,
.wp-block-freeform.block-library-rich-text__tinymce ol {
padding-left: 20px;
}
.rtl .wp-block-freeform.block-library-rich-text__tinymce ul,
.rtl .wp-block-freeform.block-library-rich-text__tinymce ol {
padding: 0;
} }
/* Code */ /* Code */

View File

@ -388,7 +388,6 @@ html[lang="th"] .edit-post-visual-editor * {
.editor-block-list__block ol, .editor-block-list__block ol,
.block-library-list ol, .block-library-list ol,
.block-library-list .editor-rich-text__tinymce { .block-library-list .editor-rich-text__tinymce {
margin: 0 0 1.5em 1.5em;
padding: 0; padding: 0;
} }
@ -420,23 +419,25 @@ html[lang="th"] .edit-post-visual-editor * {
margin: 0; margin: 0;
} }
.rtl .edit-post-visual-editor ul:not(.wp-block-gallery), .rtl .editor-styles-wrapper ul ul,
.rtl .editor-block-list__block ul:not(.wp-block-gallery), .rtl .editor-styles-wrapper ol ol,
.rtl .block-library-list ul, .rtl .editor-styles-wrapper ul ol,
.rtl .edit-post-visual-editor ol, .rtl .editor-styles-wrapper ol ul {
.rtl .editor-block-list__block ol, margin-left: 0;
.rtl .block-library-list ol,
.rtl .block-library-list .editor-rich-text__tinymce,
.rtl .edit-post-visual-editor li > ul:not(.wp-block-gallery),
.rtl .editor-block-list__block li > ul:not(.wp-block-gallery),
.rtl .block-library-list li > ul:not(.wp-block-gallery),
.rtl .edit-post-visual-editor li > ol,
.rtl .editor-block-list__block li > ol,
.rtl .block-library-list li > ol {
margin-left: 1.5em;
margin-right: 1.5em; margin-right: 1.5em;
} }
.wp-block-freeform.block-library-rich-text__tinymce ul:not(.wp-block-gallery),
.wp-block-freeform.block-library-rich-text__tinymce ol {
margin-left: 0;
padding-left: 1.5em;
}
.rtl .wp-block-freeform.block-library-rich-text__tinymce ul:not(.wp-block-gallery),
.rtl .wp-block-freeform.block-library-rich-text__tinymce ol {
padding: 0;
}
/* Quote styles */ /* Quote styles */
.editor-block-list__block blockquote p { .editor-block-list__block blockquote p {

View File

@ -197,7 +197,6 @@ Description: Used to style blocks in the editor.
.edit-post-visual-editor ol, .edit-post-visual-editor ol,
.editor-block-list__block ol, .editor-block-list__block ol,
.block-library-list ol { .block-library-list ol {
margin: 0 0 1.75em 1.25em;
padding: 0; padding: 0;
} }
@ -231,22 +230,22 @@ Description: Used to style blocks in the editor.
margin-bottom: 0; margin-bottom: 0;
} }
.rtl .edit-post-visual-editor ul:not(.wp-block-gallery), .rtl .editor-styles-wrapper ul ul,
.rtl .editor-block-list__block ul:not(.wp-block-gallery), .rtl .editor-styles-wrapper ol ol,
.rtl .block-library-list ul, .rtl .editor-styles-wrapper ul ol,
.rtl .edit-post-visual-editor ol, .rtl .editor-styles-wrapper ol ul {
.rtl .editor-block-list__block ol,
.rtl .block-library-list ol {
margin-left: 0; margin-left: 0;
margin-right: 1.25em; margin-right: 1.5em;
padding: 0;
} }
.rtl .edit-post-visual-editor ol, .wp-block-freeform.block-library-rich-text__tinymce ul,
.rtl .editor-block-list__block ol, .wp-block-freeform.block-library-rich-text__tinymce ol {
.rtl .block-library-list ol { padding-left: 1.5em;
margin-left: 1.5em; }
margin-right: 1.5em;
.rtl .wp-block-freeform.block-library-rich-text__tinymce ul,
.rtl .wp-block-freeform.block-library-rich-text__tinymce ol {
padding: 0;
} }
/* Quotes */ /* Quotes */

View File

@ -96,7 +96,6 @@ Description: Used to style blocks in the editor.
.edit-post-visual-editor ol, .edit-post-visual-editor ol,
.editor-block-list__block ol, .editor-block-list__block ol,
.block-library-list ol.editor-rich-text__tinymce { .block-library-list ol.editor-rich-text__tinymce {
margin: 0 0 18px 1.5em;
padding: 0; padding: 0;
} }
@ -130,14 +129,21 @@ Description: Used to style blocks in the editor.
margin-bottom: 0; margin-bottom: 0;
} }
.rtl .edit-post-visual-editor ul:not(.wp-block-gallery), .rtl .editor-styles-wrapper ul ul,
.rtl .editor-block-list__block ul:not(.wp-block-gallery), .rtl .editor-styles-wrapper ol ol,
.rtl .block-library-list ul, .rtl .editor-styles-wrapper ul ol,
.rtl .edit-post-visual-editor ol, .rtl .editor-styles-wrapper ol ul {
.rtl .editor-block-list__block ol,
.rtl .block-library-list ol {
margin-left: 0; margin-left: 0;
margin-right: 1.25em; margin-right: 1.5em;
}
.wp-block-freeform.block-library-rich-text__tinymce ul,
.wp-block-freeform.block-library-rich-text__tinymce ol {
padding-left: 1.5em;
}
.rtl .wp-block-freeform.block-library-rich-text__tinymce ul,
.rtl .wp-block-freeform.block-library-rich-text__tinymce ol {
padding: 0; padding: 0;
} }

View File

@ -83,13 +83,9 @@ Description: Used to style blocks in the editor.
.block-library-list ul, .block-library-list ul,
.edit-post-visual-editor ol, .edit-post-visual-editor ol,
.editor-block-list__block ol, .editor-block-list__block ol,
.block-library-list ol { .block-library-list ol,
margin: 16px 0;
padding: 0 0 0 40px;
}
.block-library-list .editor-rich-text__tinymce { .block-library-list .editor-rich-text__tinymce {
padding: 0 0 0 40px; padding: 0;
} }
.edit-post-visual-editor ul:not(.wp-block-gallery), .edit-post-visual-editor ul:not(.wp-block-gallery),
@ -121,19 +117,26 @@ Description: Used to style blocks in the editor.
margin-bottom: 0; margin-bottom: 0;
} }
.rtl .edit-post-visual-editor ul:not(.wp-block-gallery), .editor-styles-wrapper ul.block-editor-block-list__block,
.rtl .editor-block-list__block ul:not(.wp-block-gallery), .editor-styles-wrapper ol.block-editor-block-list__block,
.rtl .block-library-list ul, .editor-styles-wrapper ol ul:not(.wp-block-gallery),
.rtl .edit-post-visual-editor ol, .editor-styles-wrapper ul ul:not(.wp-block-gallery),
.rtl .editor-block-list__block ol, .editor-styles-wrapper ul ol,
.rtl .block-library-list ol { .editor-styles-wrapper ol ol,
padding-left: 0; .wp-block-freeform.block-library-rich-text__tinymce ul,
padding-right: 40px; .wp-block-freeform.block-library-rich-text__tinymce ol {
padding: 0 0 0 40px;
} }
.rtl .block-library-list .editor-rich-text__tinymce { .rtl .editor-styles-wrapper ul.block-editor-block-list__block,
padding-left: 0; .rtl .editor-styles-wrapper ol.block-editor-block-list__block,
padding-right: 40px; .rtl .editor-styles-wrapper ol ul:not(.wp-block-gallery),
.rtl .editor-styles-wrapper ul ul:not(.wp-block-gallery),
.rtl .editor-styles-wrapper ul ol,
.rtl .editor-styles-wrapper ol ol,
.rtl .wp-block-freeform.block-library-rich-text__tinymce ul,
.rtl .wp-block-freeform.block-library-rich-text__tinymce ol {
padding: 0 40px 0 0;
} }
/* Quote */ /* Quote */

View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.6-beta3-49510'; $wp_version = '5.6-beta3-49511';
/** /**
* 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.