diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index c2769e5d4b6..475608efa79 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -403,59 +403,13 @@ function wp_install_defaults( $user_id ) {
// Set up default widgets for default theme.
update_option(
- 'widget_search',
+ 'widget_block',
array(
- 2 => array( 'title' => '' ),
- '_multiwidget' => 1,
- )
- );
- update_option(
- 'widget_recent-posts',
- array(
- 2 => array(
- 'title' => '',
- 'number' => 5,
- ),
- '_multiwidget' => 1,
- )
- );
- update_option(
- 'widget_recent-comments',
- array(
- 2 => array(
- 'title' => '',
- 'number' => 5,
- ),
- '_multiwidget' => 1,
- )
- );
- update_option(
- 'widget_archives',
- array(
- 2 => array(
- 'title' => '',
- 'count' => 0,
- 'dropdown' => 0,
- ),
- '_multiwidget' => 1,
- )
- );
- update_option(
- 'widget_categories',
- array(
- 2 => array(
- 'title' => '',
- 'count' => 0,
- 'hierarchical' => 0,
- 'dropdown' => 0,
- ),
- '_multiwidget' => 1,
- )
- );
- update_option(
- 'widget_meta',
- array(
- 2 => array( 'title' => '' ),
+ 2 => array( 'content' => '' ),
+ 3 => array( 'content' => '
' . __( 'Recent Posts' ) . '
' ),
+ 4 => array( 'content' => '' . __( 'Recent Comments' ) . '
' ),
+ 5 => array( 'content' => '' . __( 'Archives' ) . '
' ),
+ 6 => array( 'content' => '' . __( 'Categories' ) . '
' ),
'_multiwidget' => 1,
)
);
@@ -464,18 +418,18 @@ function wp_install_defaults( $user_id ) {
array(
'wp_inactive_widgets' => array(),
'sidebar-1' => array(
- 0 => 'search-2',
- 1 => 'recent-posts-2',
- 2 => 'recent-comments-2',
+ 0 => 'block-2',
+ 1 => 'block-3',
+ 2 => 'block-4',
),
'sidebar-2' => array(
- 0 => 'archives-2',
- 1 => 'categories-2',
- 2 => 'meta-2',
+ 0 => 'block-5',
+ 1 => 'block-6',
),
'array_version' => 3,
)
);
+
if ( ! is_multisite() ) {
update_user_meta( $user_id, 'show_welcome_panel', 1 );
} elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) ) {
diff --git a/wp-content/themes/twentytwentyone/assets/css/ie.css b/wp-content/themes/twentytwentyone/assets/css/ie.css
index 91eaa1e2914..f2d07ee480b 100644
--- a/wp-content/themes/twentytwentyone/assets/css/ie.css
+++ b/wp-content/themes/twentytwentyone/assets/css/ie.css
@@ -7360,12 +7360,60 @@ h1.page-title {
clear: both;
}
-.widget-title {
- font-size: 1.125rem;
+.widget h1 {
+ font-weight: 700;
+ line-height: 1.4;
+}
+
+.widget h2 {
+ font-weight: 700;
+ line-height: 1.4;
+}
+
+.widget h3 {
+ font-weight: 700;
+ line-height: 1.4;
+}
+
+.widget h4 {
+ font-weight: 700;
+ line-height: 1.4;
+}
+
+.widget h5 {
font-weight: 700;
line-height: 1.4;
}
+.widget h6 {
+ font-weight: 700;
+ line-height: 1.4;
+}
+
+.widget h1 {
+ font-size: 1.25rem;
+}
+
+.widget h2 {
+ font-size: 1.125rem;
+}
+
+.widget h3 {
+ font-size: 1rem;
+}
+
+.widget h4 {
+ font-size: 1rem;
+}
+
+.widget h5 {
+ font-size: 1rem;
+}
+
+.widget h6 {
+ font-size: 1rem;
+}
+
.search-form {
display: flex;
flex-wrap: wrap;
diff --git a/wp-content/themes/twentytwentyone/assets/sass/06-components/widgets.scss b/wp-content/themes/twentytwentyone/assets/sass/06-components/widgets.scss
index 2c9e9ccc048..5fb85df9fd3 100644
--- a/wp-content/themes/twentytwentyone/assets/sass/06-components/widgets.scss
+++ b/wp-content/themes/twentytwentyone/assets/sass/06-components/widgets.scss
@@ -75,10 +75,41 @@
}
}
-.widget-title {
- font-size: var(--global--font-size-sm);
- font-weight: var(--widget--font-weight-title);
- line-height: var(--widget--line-height-title);
+.widget {
+
+ h1,
+ h2,
+ h3,
+ h4,
+ h5,
+ h6 {
+ font-weight: var(--widget--font-weight-title);
+ line-height: var(--widget--line-height-title);
+ }
+
+ h1 {
+ font-size: var(--global--font-size-md);
+ }
+
+ h2 {
+ font-size: var(--global--font-size-sm);
+ }
+
+ h3 {
+ font-size: var(--global--font-size-xs);
+ }
+
+ h4 {
+ font-size: var(--global--font-size-xs);
+ }
+
+ h5 {
+ font-size: var(--global--font-size-xs);
+ }
+
+ h6 {
+ font-size: var(--global--font-size-xs);
+ }
}
// Search widget styles
diff --git a/wp-content/themes/twentytwentyone/style-rtl.css b/wp-content/themes/twentytwentyone/style-rtl.css
index 7c3ce0b6826..5298ba21f2c 100644
--- a/wp-content/themes/twentytwentyone/style-rtl.css
+++ b/wp-content/themes/twentytwentyone/style-rtl.css
@@ -5444,12 +5444,40 @@ h1.page-title {
clear: both;
}
-.widget-title {
- font-size: var(--global--font-size-sm);
+.widget h1,
+.widget h2,
+.widget h3,
+.widget h4,
+.widget h5,
+.widget h6 {
font-weight: var(--widget--font-weight-title);
line-height: var(--widget--line-height-title);
}
+.widget h1 {
+ font-size: var(--global--font-size-md);
+}
+
+.widget h2 {
+ font-size: var(--global--font-size-sm);
+}
+
+.widget h3 {
+ font-size: var(--global--font-size-xs);
+}
+
+.widget h4 {
+ font-size: var(--global--font-size-xs);
+}
+
+.widget h5 {
+ font-size: var(--global--font-size-xs);
+}
+
+.widget h6 {
+ font-size: var(--global--font-size-xs);
+}
+
.search-form {
display: flex;
flex-wrap: wrap;
diff --git a/wp-content/themes/twentytwentyone/style.css b/wp-content/themes/twentytwentyone/style.css
index 22294f1e308..6dcc4045d97 100644
--- a/wp-content/themes/twentytwentyone/style.css
+++ b/wp-content/themes/twentytwentyone/style.css
@@ -5480,12 +5480,40 @@ h1.page-title {
clear: both;
}
-.widget-title {
- font-size: var(--global--font-size-sm);
+.widget h1,
+.widget h2,
+.widget h3,
+.widget h4,
+.widget h5,
+.widget h6 {
font-weight: var(--widget--font-weight-title);
line-height: var(--widget--line-height-title);
}
+.widget h1 {
+ font-size: var(--global--font-size-md);
+}
+
+.widget h2 {
+ font-size: var(--global--font-size-sm);
+}
+
+.widget h3 {
+ font-size: var(--global--font-size-xs);
+}
+
+.widget h4 {
+ font-size: var(--global--font-size-xs);
+}
+
+.widget h5 {
+ font-size: var(--global--font-size-xs);
+}
+
+.widget h6 {
+ font-size: var(--global--font-size-xs);
+}
+
.search-form {
display: flex;
flex-wrap: wrap;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c813b6bce88..dbfb0b2a103 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
-$wp_version = '5.8-alpha-51087';
+$wp_version = '5.8-alpha-51088';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.