From 49f0fc9e535d9eacec46d1a1d662187be7007dcf Mon Sep 17 00:00:00 2001
From: Peter Wilson <wilson@peterwilson.cc>
Date: Mon, 15 Feb 2021 23:52:04 +0000
Subject: [PATCH] Twenty Twenty-One: Match bullets between editor and frontend.

Change bullet style on frontend nested unordered lists to `circle` to match the editor styles.

Props poena, mukesh27, mahfuz01, tejwanihemant.
Fixes #52412.


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


git-svn-id: http://core.svn.wordpress.org/trunk@49961 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentytwentyone/assets/css/ie.css       | 8 ++++++++
 .../assets/sass/05-blocks/list/_style.scss                | 6 ++++++
 wp-content/themes/twentytwentyone/style-rtl.css           | 8 ++++++++
 wp-content/themes/twentytwentyone/style.css               | 8 ++++++++
 wp-includes/version.php                                   | 2 +-
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/wp-content/themes/twentytwentyone/assets/css/ie.css b/wp-content/themes/twentytwentyone/assets/css/ie.css
index 30529f3a15..2f8850c84f 100644
--- a/wp-content/themes/twentytwentyone/assets/css/ie.css
+++ b/wp-content/themes/twentytwentyone/assets/css/ie.css
@@ -3827,10 +3827,18 @@ ul {
 	list-style-type: disc;
 }
 
+ul ul {
+	list-style-type: circle;
+}
+
 ol {
 	list-style-type: decimal;
 }
 
+ol ul {
+	list-style-type: circle;
+}
+
 dt {
 	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
 	font-weight: bold;
diff --git a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/list/_style.scss b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/list/_style.scss
index 01e8581cea..3b22604b53 100644
--- a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/list/_style.scss
+++ b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/list/_style.scss
@@ -19,10 +19,16 @@ ol {
 
 ul {
 	list-style-type: disc;
+	ul {
+		list-style-type: circle;
+	}
 }
 
 ol {
 	list-style-type: decimal;
+	ul {
+		list-style-type: circle;
+	}
 }
 
 dt {
diff --git a/wp-content/themes/twentytwentyone/style-rtl.css b/wp-content/themes/twentytwentyone/style-rtl.css
index 7da1592bde..119d6da748 100644
--- a/wp-content/themes/twentytwentyone/style-rtl.css
+++ b/wp-content/themes/twentytwentyone/style-rtl.css
@@ -2685,10 +2685,18 @@ ul {
 	list-style-type: disc;
 }
 
+ul ul {
+	list-style-type: circle;
+}
+
 ol {
 	list-style-type: decimal;
 }
 
+ol ul {
+	list-style-type: circle;
+}
+
 dt {
 	font-family: var(--definition-term--font-family);
 	font-weight: bold;
diff --git a/wp-content/themes/twentytwentyone/style.css b/wp-content/themes/twentytwentyone/style.css
index 08241535f4..65d2aa3054 100644
--- a/wp-content/themes/twentytwentyone/style.css
+++ b/wp-content/themes/twentytwentyone/style.css
@@ -2695,10 +2695,18 @@ ul {
 	list-style-type: disc;
 }
 
+ul ul {
+	list-style-type: circle;
+}
+
 ol {
 	list-style-type: decimal;
 }
 
+ol ul {
+	list-style-type: circle;
+}
+
 dt {
 	font-family: var(--definition-term--font-family);
 	font-weight: bold;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1aac83cd9e..09d329f6ff 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.7-beta2-50349';
+$wp_version = '5.7-beta2-50350';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.