Merge c38f422 into f0227eb

tomusborne · Jul 2, 2024 · 6e4077c · 6e4077c
2 parents f0227eb + c38f422
commit 6e4077c
Show file tree

Hide file tree

Showing 35 changed files with 273 additions and 263 deletions.
diff --git a/assets/dist/block-editor.asset.php b/assets/dist/block-editor.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-data', 'wp-dom-ready', 'wp-element', 'wp-plugins'), 'version' => '166c384f313c8f5d9914');
+<?php return array('dependencies' => array('wp-data', 'wp-dom-ready', 'wp-element', 'wp-plugins'), 'version' => '84a1d122a78a50ec2ab4');
diff --git a/assets/dist/block-editor.js b/assets/dist/block-editor.js
diff --git a/assets/dist/customizer.asset.php b/assets/dist/customizer.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-components', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => '42a74b551d83e1b85238');
+<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-components', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => 'd65749464108d6bdd25b');
diff --git a/assets/dist/customizer.js b/assets/dist/customizer.js
diff --git a/assets/dist/dashboard.asset.php b/assets/dist/dashboard.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => 'dbc22cbe57941af36094');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => '08d46d7f19ed3bf6e3b9');
diff --git a/assets/dist/dashboard.js b/assets/dist/dashboard.js
diff --git a/assets/dist/modal.asset.php b/assets/dist/modal.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'b4d4871691423abff87b');
+<?php return array('dependencies' => array(), 'version' => '8b4cabf5d14f1f64f94a');
diff --git a/assets/dist/modal.js b/assets/dist/modal.js
diff --git a/assets/dist/style-dashboard.css b/assets/dist/style-dashboard.css
diff --git a/footer-min.php b/footer-min.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * The template for displaying the footer.
+ *
+ * @package GeneratePress
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly.
+}
+
+/**
+ * generate_after_footer hook.
+ *
+ * @since 2.1
+ */
+do_action( 'generate_minimal_footer' );
+
+wp_footer();
+?>
+
+</body>
+</html>
diff --git a/functions.php b/functions.php
@@ -12,7 +12,7 @@
 }
 
 // Set our theme version.
-define( 'GENERATE_VERSION', '3.4.0' );
+define( 'GENERATE_VERSION', '3.5.0-alpha.1' );
 
 if ( ! function_exists( 'generate_setup' ) ) {
 	add_action( 'after_setup_theme', 'generate_setup' );

diff --git a/header-min.php b/header-min.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * The template for displaying the header.
+ *
+ * @package GeneratePress
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly.
+}
+
+?><!DOCTYPE html>
+<html <?php language_attributes(); ?>>
+<head>
+	<meta charset="<?php bloginfo( 'charset' ); ?>">
+	<?php wp_head(); ?>
+</head>
+
+<body <?php body_class(); ?>>
+	<?php
+	/**
+	 * wp_body_open hook.
+	 *
+	 * @since 2.3
+	 */
+	do_action( 'wp_body_open' ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound -- core WP hook.
+
+	do_action( 'generate_minimal_header' );
diff --git a/inc/block-editor.php b/inc/block-editor.php
@@ -264,23 +264,23 @@ function generate_do_inline_block_editor_css( $for = 'block-content' ) {
 
 	if ( 'never' !== $underline_links ) {
 		if ( 'always' === $underline_links ) {
-			$css->set_selector( '.wp-block a' );
+			$css->set_selector( ':where(.wp-block a)' );
 			$css->add_property( 'text-decoration', 'underline' );
 		}
 
 		if ( 'hover' === $underline_links ) {
-			$css->set_selector( '.wp-block a' );
+			$css->set_selector( ':where(.wp-block a)' );
 			$css->add_property( 'text-decoration', 'none' );
 
-			$css->set_selector( '.wp-block a:hover, .wp-block a:focus' );
+			$css->set_selector( ':where(.wp-block a:hover), :where(.wp-block a:focus)' );
 			$css->add_property( 'text-decoration', 'underline' );
 		}
 
 		if ( 'not-hover' === $underline_links ) {
-			$css->set_selector( '.wp-block a' );
+			$css->set_selector( ':where(.wp-block a)' );
 			$css->add_property( 'text-decoration', 'underline' );
 
-			$css->set_selector( '.wp-block a:hover, .wp-block a:focus' );
+			$css->set_selector( ':where(.wp-block a:hover), :where(.wp-block a:focus)' );
 			$css->add_property( 'text-decoration', 'none' );
 		}
 
@@ -501,7 +501,7 @@ function generate_do_inline_block_editor_css( $for = 'block-content' ) {
 		}
 	}
 
-	$css->set_selector( 'a, a:visited' );
+	$css->set_selector( 'a' );
 
 	if ( $color_settings['content_link_color'] ) {
 		$css->add_property( 'color', $color_settings['content_link_color'] );

diff --git a/inc/class-dashboard.php b/inc/class-dashboard.php
@@ -154,11 +154,12 @@ public static function navigation() {
 			<?php
 			foreach ( $tabs as $tab ) {
 				printf(
-					'<a href="%1$s" class="%2$s"%4$s>%3$s</a>',
+					'<a href="%1$s" class="%2$s"%4$s%5$s>%3$s</a>',
 					esc_url( $tab['url'] ),
 					esc_attr( $tab['class'] ),
 					esc_html( $tab['name'] ),
-					! empty( $tab['external'] ) ? 'target="_blank" rel="noreferrer noopener"' : ''
+					! empty( $tab['external'] ) ? 'target="_blank" rel="noreferrer noopener"' : '',
+					esc_attr( ! empty( $tab['id'] ) ? 'id=' . $tab['id'] : '' )
 				);
 			}
 			?>

diff --git a/inc/customizer/class-customize-field.php b/inc/customizer/class-customize-field.php
@@ -53,7 +53,7 @@ public static function add_wrapper( $id, $control_args = array() ) {
 		$control_args['type'] = 'generate-wrapper-control';
 
 		$wp_customize->add_control(
-			new GeneratePress_Customize_React_Control(
+			new GeneratePress_Customize_Wrapper_Control(
 				$wp_customize,
 				$id,
 				$control_args