Merge pull request #9682 from iamtakashi/twentysixteen

[2.4] Edit for Twnety Sixteen
woocommerce · Nov 23, 2015 · 4b47f98 · 4b47f98
2 parents 8684ea0 + d88ba80
commit 4b47f98
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 4 deletions.
diff --git a/assets/css/woocommerce-layout.css b/assets/css/woocommerce-layout.css
diff --git a/assets/css/woocommerce-layout.scss b/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;
+			}
+		}
+	}
+}
diff --git a/assets/css/woocommerce.css b/assets/css/woocommerce.css
diff --git a/assets/css/woocommerce.scss b/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;
+	}
+}
diff --git a/includes/wc-core-functions.php b/includes/wc-core-functions.php
@@ -689,7 +689,7 @@ function wc_ms_protect_download_rewite_rules( $rewrite ) {
  * @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' );
 }
 
 /**

diff --git a/templates/global/wrapper-end.php b/templates/global/wrapper-end.php
@@ -38,6 +38,9 @@
 	case 'twentyfifteen' :
 		echo '</div></div>';
 		break;
+	case 'twentysixteen' :
+		echo '</div></main>';
+		break;
 	default :
 		echo '</div></div>';
 		break;

diff --git a/templates/global/wrapper-start.php b/templates/global/wrapper-start.php
@@ -37,6 +37,9 @@
 	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;

diff --git a/tests/unit-tests/util/core-functions.php b/tests/unit-tests/util/core-functions.php
@@ -135,7 +135,7 @@ public function test_wc_get_log_file_path() {
 	 */
 	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() );
 	}