Merge pull request #9682 from iamtakashi/twentysixteen

[2.4] Edit for Twnety Sixteen

assets/css/woocommerce-layout.scss

@@ -443,3 +443,60 @@
 		}
 	}
 }
+
+/**
+ * Twenty Sixteen specific styles
+ */
+.twentysixteen {
+	.site-main {
+		margin-right: 7.6923%;
+		margin-left: 7.6923%;
+	}
+
+	.entry-summary {
+		margin-right: 0;
+		margin-left: 0;
+	}
+}
+
+#content {
+	.twentysixteen {
+		div.product {
+			div.images,
+			div.summary {
+				width: 46.42857%;
+			}
+		}
+	}
+}
+
+@media screen and (min-width: 44.375em) {
+	.twentysixteen {
+		.site-main {
+			margin-right: 23.0769%;
+		}
+	}
+}
+
+@media screen and (min-width: 56.875em) {
+	.twentysixteen {
+		.site-main {
+			margin-right: 0;
+			margin-left: 0;
+		}
+	}
+
+	.no-sidebar {
+		.twentysixteen {
+			.site-main {
+				margin-right: 15%;
+				margin-left: 15%;
+			}
+
+			.entry-summary {
+				margin-right: 0;
+				margin-left: 0;
+			}
+		}
+	}
+}

assets/css/woocommerce.scss

@@ -1960,3 +1960,23 @@ p.demo_store {
 		}
 	}
 }
+
+/**
+ * Twenty Sixteen specific styles
+ */
+body:not(.search-results) {
+	.twentysixteen {
+		.entry-summary {
+			color: inherit;
+			font-size: inherit;
+			line-height: inherit;
+		}
+	}
+}
+
+.twentysixteen {
+	.price ins {
+		background: inherit;
+		color: inherit;
+	}
+}

includes/wc-core-functions.php

@@ -689,7 +689,7 @@ add_filter( 'mod_rewrite_rules', 'wc_ms_protect_download_rewite_rules' );
  * @return string[]
  */
 function wc_get_core_supported_themes() {
-	return array( 'twentyfifteen', 'twentyfourteen', 'twentythirteen', 'twentyeleven', 'twentytwelve', 'twentyten' );
+	return array( 'twentysixteen', 'twentyfifteen', 'twentyfourteen', 'twentythirteen', 'twentyeleven', 'twentytwelve', 'twentyten' );
 }
 
 /**

templates/global/wrapper-end.php

@@ -38,6 +38,9 @@ switch( $template ) {
 	case 'twentyfifteen' :
 		echo '</div></div>';
 		break;
+	case 'twentysixteen' :
+		echo '</div></main>';
+		break;
 	default :
 		echo '</div></div>';
 		break;

templates/global/wrapper-start.php

@@ -37,6 +37,9 @@ switch( $template ) {
 	case 'twentyfifteen' :
 		echo '<div id="primary" role="main" class="content-area twentyfifteen"><div id="main" class="site-main t15wc">';
 		break;
+	case 'twentysixteen' :
+		echo '<div id="primary" class="content-area twentysixteen"><main id="main" class="site-main" role="main">';
+		break;
 	default :
 		echo '<div id="container"><div id="content" role="main">';
 		break;

tests/unit-tests/util/core-functions.php

@@ -135,7 +135,7 @@ class Core_Functions extends \WC_Unit_Test_Case {
 	 */
 	public function test_wc_get_core_supported_themes() {
 
-		$expected_themes = array( 'twentyfifteen', 'twentyfourteen', 'twentythirteen', 'twentyeleven', 'twentytwelve', 'twentyten' );
+		$expected_themes = array( 'twentysixteen', 'twentyfifteen', 'twentyfourteen', 'twentythirteen', 'twentyeleven', 'twentytwelve', 'twentyten' );
 
 		$this->assertEquals( $expected_themes, wc_get_core_supported_themes() );
 	}