Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-11 19:02:23 +01:00
Code Issues Projects Releases Wiki Activity

Privacy: Support additional elements (table, ol, ul) in privacy policy guide new styling

Browse Source 
The privacy policy guide supports a lot of HTML, include rules for lists, and ensure proper styling for the rest.

Backports the trunk commit to the 5.4 branch.

Props garrett-eclipse.
Fixes #49772.

Built from https://develop.svn.wordpress.org/branches/5.4@47561


git-svn-id: http://core.svn.wordpress.org/branches/5.4@47336 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
whyisjake 2020-04-09 22:46:07 +00:00
parent 114aa78d2a
commit 2c5a618d63
5 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wp-admin/css/edit-rtl.css
View File

@ -449,7 +449,7 @@ form#tags-filter {
#post-body #visibility:before, #post-body #visibility:before,
.curtime #timestamp:before, .curtime #timestamp:before,
#post-body .misc-pub-revisions:before, #post-body .misc-pub-revisions:before,
#post-body .misc-pub-response-to:before, #post-body .misc-pub-response-to:before,
#post-body .misc-pub-comment-status:before { #post-body .misc-pub-comment-status:before {
color: #82878c; color: #82878c;
} }
@ -458,7 +458,7 @@ form#tags-filter {
#post-body #visibility:before, #post-body #visibility:before,
.curtime #timestamp:before, .curtime #timestamp:before,
#post-body .misc-pub-revisions:before, #post-body .misc-pub-revisions:before,
#post-body .misc-pub-response-to:before, #post-body .misc-pub-response-to:before,
#post-body .misc-pub-comment-status:before { #post-body .misc-pub-comment-status:before {
font: normal 20px/1 dashicons; font: normal 20px/1 dashicons;
speak: none; speak: none;
@ -470,7 +470,7 @@ form#tags-filter {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
#post-body .misc-pub-post-status:before, #post-body .misc-pub-post-status:before,
#post-body .misc-pub-comment-status:before { #post-body .misc-pub-comment-status:before {
content: "\f173"; content: "\f173";
} }
@ -757,21 +757,32 @@ form#tags-filter {
margin-bottom: 1em; margin-bottom: 1em;
} }
.policy-text p:not(.privacy-policy-tutorial):not(.wp-policy-help) { .policy-text > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help),
.policy-text div > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) {
background-color: #fff; background-color: #fff;
margin: 0; margin: 0;
padding: 1em; padding: 1em;
} }
.policy-text p:not(.privacy-policy-tutorial):not(.wp-policy-help) + p:not(.privacy-policy-tutorial):not(.wp-policy-help) { .policy-text > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) + *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help),
.policy-text div > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) + *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) {
padding-top: 0; padding-top: 0;
} }
.hide-privacy-policy-tutorial p:not(.privacy-policy-tutorial):not(.wp-policy-help) { .hide-privacy-policy-tutorial > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) {
margin: 1em 0; margin: 1em 0;
padding: 0; padding: 0;
} }
.policy-text ul li,
.policy-text ol li {
margin-right: 2em;
}
.policy-text ul {
list-style: disc;
}
strong.wp-policy-help, /* For back-compat, see #49282 */ strong.wp-policy-help, /* For back-compat, see #49282 */
strong.privacy-policy-tutorial { strong.privacy-policy-tutorial {
display: block; display: block;

2
wp-admin/css/edit-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

23
wp-admin/css/edit.css
View File

@ -448,7 +448,7 @@ form#tags-filter {
#post-body #visibility:before, #post-body #visibility:before,
.curtime #timestamp:before, .curtime #timestamp:before,
#post-body .misc-pub-revisions:before, #post-body .misc-pub-revisions:before,
#post-body .misc-pub-response-to:before, #post-body .misc-pub-response-to:before,
#post-body .misc-pub-comment-status:before { #post-body .misc-pub-comment-status:before {
color: #82878c; color: #82878c;
} }
@ -457,7 +457,7 @@ form#tags-filter {
#post-body #visibility:before, #post-body #visibility:before,
.curtime #timestamp:before, .curtime #timestamp:before,
#post-body .misc-pub-revisions:before, #post-body .misc-pub-revisions:before,
#post-body .misc-pub-response-to:before, #post-body .misc-pub-response-to:before,
#post-body .misc-pub-comment-status:before { #post-body .misc-pub-comment-status:before {
font: normal 20px/1 dashicons; font: normal 20px/1 dashicons;
speak: none; speak: none;
@ -469,7 +469,7 @@ form#tags-filter {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
#post-body .misc-pub-post-status:before, #post-body .misc-pub-post-status:before,
#post-body .misc-pub-comment-status:before { #post-body .misc-pub-comment-status:before {
content: "\f173"; content: "\f173";
} }
@ -756,21 +756,32 @@ form#tags-filter {
margin-bottom: 1em; margin-bottom: 1em;
} }
.policy-text p:not(.privacy-policy-tutorial):not(.wp-policy-help) { .policy-text > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help),
.policy-text div > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) {
background-color: #fff; background-color: #fff;
margin: 0; margin: 0;
padding: 1em; padding: 1em;
} }
.policy-text p:not(.privacy-policy-tutorial):not(.wp-policy-help) + p:not(.privacy-policy-tutorial):not(.wp-policy-help) { .policy-text > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) + *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help),
.policy-text div > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) + *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) {
padding-top: 0; padding-top: 0;
} }
.hide-privacy-policy-tutorial p:not(.privacy-policy-tutorial):not(.wp-policy-help) { .hide-privacy-policy-tutorial > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) {
margin: 1em 0; margin: 1em 0;
padding: 0; padding: 0;
} }
.policy-text ul li,
.policy-text ol li {
margin-left: 2em;
}
.policy-text ul {
list-style: disc;
}
strong.wp-policy-help, /* For back-compat, see #49282 */ strong.wp-policy-help, /* For back-compat, see #49282 */
strong.privacy-policy-tutorial { strong.privacy-policy-tutorial {
display: block; display: block;

2
wp-admin/css/edit.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.4.1-alpha-47543'; $wp_version = '5.4.1-alpha-47561';
/** /**
* 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.