Merge branch 'trunk' into update/blank-canvas-patterns

blank-canvas/style.css

@@ -47,14 +47,6 @@ Used as block pattern image.
 
 @import "variables.css";
 
-/* Remove outside padding on single post pages. */
-
-.single .site-main,
-.page .site-main {
-	padding-top: 0;
-	padding-bottom: 0;
-}
-
 /* Remove extra margin from articles on single post pages. */
 
 .single .site-main > article,
@@ -62,11 +54,17 @@ Used as block pattern image.
 	margin-bottom: 0;
 }
 
-/* Add some top padding if the first block on the page is not full-width or a spacer. */
-
-.single .entry-content > *:first-child:not(.alignfull):not(.wp-block-spacer),
-.page .entry-content > *:first-child:not(.alignfull):not(.wp-block-spacer) {
-	padding-top: var(--global--spacing-vertical);
+/* Add some top padding if the first block on the page is a full-width image, cover, media & text, or group block. */
+
+.single .entry-content > .wp-block-image.alignfull:first-child,
+.page .entry-content > .wp-block-image.alignfull:first-child,
+.single .entry-content > .wp-block-cover.alignfull:first-child,
+.page .entry-content > .wp-block-cover.alignfull:first-child,
+.single .entry-content > .wp-block-media-text.alignfull:first-child,
+.page .entry-content > .wp-block-media-text.alignfull:first-child
+.single .entry-content > .wp-block-group.has-background.alignfull:first-child,
+.page .entry-content > .wp-block-group.has-background.alignfull:first-child {
+	margin-top: calc(-1 * var(--global--spacing-vertical));
 }
 
 /* Add some top padding for archive pages. */
@@ -97,4 +95,4 @@ body:not(.single):not(.page) .site-content {
 .entry-footer,
 .site-info {
 	text-align: center;
-}
+}

seedlet/assets/css/style-navigation-rtl.css

@@ -15,6 +15,7 @@
 	.menu-button-container {
 		display: block;
 		margin: 0;
+		width: auto;
 	}
 }
 
@@ -46,6 +47,10 @@
 	top: calc(var(--wpadmin-bar--height) + var(--wpcom-marketing-bar--height));
 }
 
+#site-navigation + .menu-button-container {
+	left: 0;
+}
+
 .menu-button-container .button,
 .primary-navigation .button,
 .woo-navigation .button {
@@ -136,12 +141,6 @@
 	overflow: hidden;
 }
 
-.primary-navigation-open .menu-button-container #primary-open-menu, .primary-navigation-open
-.primary-navigation #primary-open-menu, .primary-navigation-open
-.woo-navigation #primary-open-menu {
-	display: none;
-}
-
 .primary-navigation-open .menu-button-container #primary-close-menu, .primary-navigation-open
 .primary-navigation #primary-close-menu, .primary-navigation-open
 .woo-navigation #primary-close-menu {
@@ -151,12 +150,6 @@
 	margin-left: calc(0.25 * var(--global--spacing-unit));
 }
 
-.woo-navigation-open .menu-button-container #woo-open-menu, .woo-navigation-open
-.primary-navigation #woo-open-menu, .woo-navigation-open
-.woo-navigation #woo-open-menu {
-	display: none;
-}
-
 .woo-navigation-open .menu-button-container #woo-close-menu, .woo-navigation-open
 .primary-navigation #woo-close-menu, .woo-navigation-open
 .woo-navigation #woo-close-menu {
@@ -166,6 +159,18 @@
 	margin-left: calc(0.25 * var(--global--spacing-unit));
 }
 
+.woo-navigation-open .menu-button-container #primary-open-menu,
+.woo-navigation-open .menu-button-container #woo-open-menu,
+.primary-navigation-open .menu-button-container #primary-open-menu,
+.primary-navigation-open .menu-button-container #woo-open-menu {
+	display: none;
+}
+
+.woo-navigation-open .primary-navigation #primary-open-menu,
+.primary-navigation-open .primary-navigation #primary-open-menu {
+	display: none;
+}
+
 .primary-navigation,
 .woo-navigation {
 	position: absolute;

seedlet/assets/css/style-navigation.css

@@ -15,6 +15,7 @@
 	.menu-button-container {
 		display: block;
 		margin: 0;
+		width: auto;
 	}
 }
 
@@ -46,6 +47,10 @@
 	top: calc(var(--wpadmin-bar--height) + var(--wpcom-marketing-bar--height));
 }
 
+#site-navigation + .menu-button-container {
+	right: 0;
+}
+
 .menu-button-container .button,
 .primary-navigation .button,
 .woo-navigation .button {
@@ -136,12 +141,6 @@
 	overflow: hidden;
 }
 
-.primary-navigation-open .menu-button-container #primary-open-menu, .primary-navigation-open
-.primary-navigation #primary-open-menu, .primary-navigation-open
-.woo-navigation #primary-open-menu {
-	display: none;
-}
-
 .primary-navigation-open .menu-button-container #primary-close-menu, .primary-navigation-open
 .primary-navigation #primary-close-menu, .primary-navigation-open
 .woo-navigation #primary-close-menu {
@@ -151,12 +150,6 @@
 	margin-right: calc(0.25 * var(--global--spacing-unit));
 }
 
-.woo-navigation-open .menu-button-container #woo-open-menu, .woo-navigation-open
-.primary-navigation #woo-open-menu, .woo-navigation-open
-.woo-navigation #woo-open-menu {
-	display: none;
-}
-
 .woo-navigation-open .menu-button-container #woo-close-menu, .woo-navigation-open
 .primary-navigation #woo-close-menu, .woo-navigation-open
 .woo-navigation #woo-close-menu {
@@ -166,6 +159,18 @@
 	margin-right: calc(0.25 * var(--global--spacing-unit));
 }
 
+.woo-navigation-open .menu-button-container #primary-open-menu,
+.woo-navigation-open .menu-button-container #woo-open-menu,
+.primary-navigation-open .menu-button-container #primary-open-menu,
+.primary-navigation-open .menu-button-container #woo-open-menu {
+	display: none;
+}
+
+.woo-navigation-open .primary-navigation #primary-open-menu,
+.primary-navigation-open .primary-navigation #primary-open-menu {
+	display: none;
+}
+
 .primary-navigation,
 .woo-navigation {
 	position: absolute;

seedlet/assets/css/style-woocommerce-rtl.css

@@ -1409,6 +1409,11 @@ body[class*="woocommerce"] #page .woocommerce-customer-details > *:empty {
 /**
  * Cart page
  */
+body[class*="woocommerce"] #page table.shop_table th,
+body[class*="woocommerce"] #page table.shop_table td {
+	word-break: unset;
+}
+
 body[class*="woocommerce"] #page table.shop_table td.product-remove {
 	border-width: 0;
 }

seedlet/assets/css/style-woocommerce.css

@@ -1409,6 +1409,11 @@ body[class*="woocommerce"] #page .woocommerce-customer-details > *:empty {
 /**
  * Cart page
  */
+body[class*="woocommerce"] #page table.shop_table th,
+body[class*="woocommerce"] #page table.shop_table td {
+	word-break: unset;
+}
+
 body[class*="woocommerce"] #page table.shop_table td.product-remove {
 	border-width: 0;
 }

seedlet/assets/sass/components/navigation/_style.scss

@@ -13,6 +13,7 @@
 	@include media( $navigation-max-break-point ){
 		display: block;
 		margin: 0;
+		width: auto;
 	}
 
 	// Adjust button postion when scrolling is locked
@@ -42,6 +43,10 @@
 	.admin-bar.has-marketing-bar:not(.primary-navigation-open) & {
 		top: calc(var(--wpadmin-bar--height) + var(--wpcom-marketing-bar--height));
 	}
+
+	#site-navigation + & {
+		right: 0;
+	}
 }
 
 .menu-button-container,
@@ -112,9 +117,6 @@
 	}
 
 	.primary-navigation-open & {
-		#primary-open-menu {
-			display: none;
-		}
 		#primary-close-menu {
 			display: flex;
 			padding: calc(var(--button--padding-vertical) - (0.25 * var(--global--spacing-unit))) calc(var(--button--padding-horizontal) - (0.25 * var(--global--spacing-unit)));
@@ -123,9 +125,6 @@
 		}
 	}
 	.woo-navigation-open & {
-		#woo-open-menu {
-			display: none;
-		}
 		#woo-close-menu {
 			display: flex;
 			padding: calc(var(--button--padding-vertical) - (0.25 * var(--global--spacing-unit))) calc(var(--button--padding-horizontal) - (0.25 * var(--global--spacing-unit)));
@@ -135,6 +134,20 @@
 	}
 }
 
+.woo-navigation-open,
+.primary-navigation-open {
+	.menu-button-container {
+		#primary-open-menu,
+		#woo-open-menu {
+			display: none;
+		}
+	}
+
+	.primary-navigation #primary-open-menu {
+		display: none;
+	}
+}
+
 .primary-navigation,
 .woo-navigation {
 	position: absolute;

seedlet/assets/sass/vendors/woocommerce/pages/_cart.scss

@@ -2,6 +2,10 @@
  * Cart page
  */
 body[class*="woocommerce"] #page { // adding #page here to override default wc styles without !important
+	table.shop_table th,
+	table.shop_table td {
+		word-break: unset;
+	}
 
 	table.shop_table td.product-remove {
 		border-width: 0;

spearhead/assets/sass/_block-extends.scss

@@ -6,3 +6,4 @@
 @import "block-extends/related-posts";
 @import "block-extends/blog-posts";
 @import "block-extends/search";
+@import "block-extends/woocommerce";

spearhead/assets/sass/_woocommerce.scss

@@ -0,0 +1,33 @@
+#content .wc-block-grid .wc-block-grid__product-onsale {
+	font-family: var(--global--font-secondary);
+}
+
+body[class*="woocommerce"] #page {
+	span {
+		&.onsale {
+			background-color: var(--global--color-background);
+			border: 1px solid var(--global--color-foreground);
+			border-radius: 0;
+			font-family: var(--global--font-secondary);
+			line-height: 1.6;
+			min-width: 0;
+			min-height: 0;
+			padding: 1em;
+
+			@media ( prefers-color-scheme: dark ) {
+				background-color: var(--global--color-foreground);
+				border: 1px solid var(--global--color-background);
+			}
+		}
+	}
+}
+
+#woocommerce-wrapper {
+	ul.products {
+		li.product {
+			.price {
+				color: var(--global--color-foreground);
+			}
+		}
+	}
+}

spearhead/assets/sass/block-extends/_woocommerce.scss

@@ -0,0 +1,16 @@
+#content .wc-block-grid{
+	.wc-block-grid__product {
+		.wc-block-grid__product-onsale {
+			top: -0.5em;
+			right: -0.5em;
+		}
+	}
+
+	.wc-block-grid__product-title{
+		font-family: var(--global--font-secondary);
+	}
+
+	.wc-block-grid__product-price {
+		color: var(--global--color-foreground);
+	}
+}

spearhead/assets/sass/style.scss

@@ -27,3 +27,4 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 @import "block-extends";
 @import "search";
 @import "meta";
+@import "woocommerce";

spearhead/functions.php

@@ -21,7 +21,6 @@ if ( ! function_exists( 'spearhead_setup' ) ) :
 
 		// Add support for editor styles.
 		add_theme_support( 'editor-styles' );
-		add_theme_support( 'dark-editor-style' );
 
 		// Enqueue editor styles.
 		add_editor_style(

spearhead/style-rtl.css

@@ -665,6 +665,19 @@ ul.wp-block-categories,
 	border-bottom: var(--form--border-width) solid var(--form--border-color);
 }
 
+#content .wc-block-grid .wc-block-grid__product .wc-block-grid__product-onsale {
+	top: -0.5em;
+	left: -0.5em;
+}
+
+#content .wc-block-grid .wc-block-grid__product-title {
+	font-family: var(--global--font-secondary);
+}
+
+#content .wc-block-grid .wc-block-grid__product-price {
+	color: var(--global--color-foreground);
+}
+
 .screen-reader-text, .search-form input[type="submit"] {
 	/* Text meant only for screen readers. */
 	border: 0;
@@ -773,4 +786,30 @@ ul.wp-block-categories,
 
 .widget ul {
 	padding: 0;
+}
+
+#content .wc-block-grid .wc-block-grid__product-onsale {
+	font-family: var(--global--font-secondary);
+}
+
+body[class*="woocommerce"] #page span.onsale {
+	background-color: var(--global--color-background);
+	border: 1px solid var(--global--color-foreground);
+	border-radius: 0;
+	font-family: var(--global--font-secondary);
+	line-height: 1.6;
+	min-width: 0;
+	min-height: 0;
+	padding: 1em;
+}
+
+@media (prefers-color-scheme: dark) {
+	body[class*="woocommerce"] #page span.onsale {
+		background-color: var(--global--color-foreground);
+		border: 1px solid var(--global--color-background);
+	}
+}
+
+#woocommerce-wrapper ul.products li.product .price {
+	color: var(--global--color-foreground);
 }

spearhead/style.css

@@ -665,6 +665,19 @@ ul.wp-block-categories,
 	border-bottom: var(--form--border-width) solid var(--form--border-color);
 }
 
+#content .wc-block-grid .wc-block-grid__product .wc-block-grid__product-onsale {
+	top: -0.5em;
+	right: -0.5em;
+}
+
+#content .wc-block-grid .wc-block-grid__product-title {
+	font-family: var(--global--font-secondary);
+}
+
+#content .wc-block-grid .wc-block-grid__product-price {
+	color: var(--global--color-foreground);
+}
+
 .screen-reader-text, .search-form input[type="submit"] {
 	/* Text meant only for screen readers. */
 	border: 0;
@@ -775,4 +788,30 @@ ul.wp-block-categories,
 	padding: 0;
 }
 
+#content .wc-block-grid .wc-block-grid__product-onsale {
+	font-family: var(--global--font-secondary);
+}
+
+body[class*="woocommerce"] #page span.onsale {
+	background-color: var(--global--color-background);
+	border: 1px solid var(--global--color-foreground);
+	border-radius: 0;
+	font-family: var(--global--font-secondary);
+	line-height: 1.6;
+	min-width: 0;
+	min-height: 0;
+	padding: 1em;
+}
+
+@media (prefers-color-scheme: dark) {
+	body[class*="woocommerce"] #page span.onsale {
+		background-color: var(--global--color-foreground);
+		border: 1px solid var(--global--color-background);
+	}
+}
+
+#woocommerce-wrapper ul.products li.product .price {
+	color: var(--global--color-foreground);
+}
+
 /*# sourceMappingURL=style.css.map */

spearhead/template-parts/header/navigation.php

@@ -71,9 +71,9 @@
 			esc_html__( 'collapsed', 'spearhead' ),
 			is_cart() ? 'current-menu-item' : '',
 			esc_attr__( 'View your shopping cart', 'spearhead' ),
-			spearhead_cart_link(),
+			seedlet_cart_link(),
 			esc_attr__( 'View your shopping list', 'spearhead' ),
-			spearhead_cart_widget()
+			seedlet_cart_widget()
 		) );
 		?>
 	</nav><!-- .woo-navigation -->
@@ -86,4 +86,4 @@
 			<span class="hide-visually expanded-text"><?php esc_html__( 'expanded', 'spearhead' ); ?></span>
 		</button>
 	<?php endif; ?>
-</div>
+</div>