Merge branch 'master' into enhancement/add-wc-support-maywood-v2

rockfield/sass/_config-child-theme-deep.scss

@@ -100,7 +100,7 @@ $config-global: (
 	/* Spacing */
 	"spacing": (
 		"unit": (2 * $baseline-unit), // 16px
-		"measure": inherit, // Use ch units here. ie: 60ch = 60 character max-width
+		"measure": unset, // Use ch units here. ie: 60ch = 60 character max-width
 		"horizontal": (2 * $baseline-unit), // 16px
 		"vertical": (4 * $baseline-unit), // 32px matches default spacing in the editor.
 	),

rockfield/style-rtl.css

@@ -11,7 +11,7 @@ License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
 Text Domain: rockfield
-Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, auto-loading-homepage, a8c-global-styles
+Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, auto-loading-homepage, jetpack-global-styles
 
 This theme, like WordPress, is licensed under the GPL.
 Use it to make something cool, have fun, and share what you've learned with others.
@@ -694,7 +694,7 @@ a {
 header *,
 main *,
 footer * {
-	max-width: inherit;
+	max-width: unset;
 }
 
 html,
@@ -3011,7 +3011,7 @@ body:not(.fse-enabled) .footer-menu a {
 	line-height: 1.125;
 	margin-bottom: 4px;
 	padding-left: 40px;
-  max-width: calc(100% - 48px);
+	max-width: calc(100% - 48px);
 }
 
 @media only screen and (min-width: 560px) {

rockfield/style.css

@@ -11,7 +11,7 @@ License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
 Text Domain: rockfield
-Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, auto-loading-homepage, a8c-global-styles
+Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, auto-loading-homepage, jetpack-global-styles
 
 This theme, like WordPress, is licensed under the GPL.
 Use it to make something cool, have fun, and share what you've learned with others.
@@ -694,7 +694,7 @@ a {
 header *,
 main *,
 footer * {
-	max-width: inherit;
+	max-width: unset;
 }
 
 html,
@@ -3028,7 +3028,7 @@ body:not(.fse-enabled) .footer-menu a {
 	line-height: 1.125;
 	margin-bottom: 4px;
 	padding-right: 40px;
-  max-width: calc(100% - 48px);
+	max-width: calc(100% - 48px);
 }
 
 @media only screen and (min-width: 560px) {

varia/functions.php

@@ -50,7 +50,7 @@ if ( ! function_exists( 'varia_setup' ) ) :
 		 *
 		 * @link https://developer.wordpress.org/themes/functionality/featured-images-post-thumbnails/
 		 */
-		add_theme_support( 'post-thumbnails', array( 'post' ) );
+		add_theme_support( 'post-thumbnails' );
 		set_post_thumbnail_size( 1568, 9999 );
 
 		// This theme uses wp_nav_menu() in two locations.
@@ -88,7 +88,7 @@ if ( ! function_exists( 'varia_setup' ) ) :
 				'height'      => 96,
 				'width'       => 100,
 				'flex-width'  => true,
-				'flex-height' => false,
+				'flex-height' => true,
 				'header-text' => array( 'site-title', 'site-description' ),
 			)
 		);

varia/inc/template-tags.php

@@ -201,8 +201,7 @@ if ( ! function_exists( 'varia_post_thumbnail' ) ) :
 	/**
 	 * Displays an optional post thumbnail.
 	 *
-	 * Wraps the post thumbnail in an anchor element on index views, or a div
-	 * element when on single views.
+	 * Wraps the post thumbnail in an anchor element on index views
 	 */
 	function varia_post_thumbnail() {
 		if ( ! varia_can_show_post_thumbnail() ) {

varia/sass/vendors/_jetpack.scss

@@ -137,3 +137,13 @@ body {
 #wp-block-jetpack-mailchimp_consent-text {
 	font-size: #{map-deep-get($config-global, "font", "size", "sm")};
 }
+
+/**
+ * Business Hours
+ */
+
+.jetpack-business-hours {
+	dd {
+		padding-left: 0;
+	}
+}

varia/style-rtl.css

@@ -3679,6 +3679,13 @@ body.admin-bar .widget_eu_cookie_law_widget.widget.top {
 	font-size: 0.83333rem;
 }
 
+/**
+ * Business Hours
+ */
+.jetpack-business-hours dd {
+	padding-right: 0;
+}
+
 /**
  * Full Site Editing
  * - Full Site Editing overrides

varia/style.css

@@ -3708,6 +3708,13 @@ body.admin-bar .widget_eu_cookie_law_widget.widget.top {
 	font-size: 0.83333rem;
 }
 
+/**
+ * Business Hours
+ */
+.jetpack-business-hours dd {
+	padding-left: 0;
+}
+
 /**
  * Full Site Editing
  * - Full Site Editing overrides