Merge branch 'master' into jetpack_infinite_scroll_wc_products_fixes

apostrophe-2/inc/template-tags.php

@@ -33,7 +33,7 @@ function apostrophe_2_posted_on() {
 		esc_html_x( '%s', 'post author', 'apostrope-2' ),
 		'<span class="author vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '">' . esc_html( get_the_author() ) . '</a></span>'
 	);
-	if ( is_sticky() && ! is_single() && ! is_archive() ) {
+	if ( is_sticky() && ! is_single() && ! is_archive() && ! is_paged() ) {
 		echo '<a href="' . esc_url( get_permalink() ) . '" rel="bookmark">' . esc_html__( 'Featured', 'apostrophe-2' ) . '</a><span class="byline"> ' . $byline . '</span>'; // WPCS: XSS OK.
 	} else {
 		echo '<span class="posted-on">' . $posted_on . '</span><span class="byline"> ' . $byline . '</span>'; // WPCS: XSS OK.

apostrophe-2/style.css

@@ -1436,6 +1436,10 @@ a:active {
 	width: auto;
 }
 
+.site-footer .widget-area input.search-field {
+	margin: 0 auto;
+}
+
 .site-footer .site-info {
 	border-top: 2px solid #ccc;
 	font-size: 16px;

dara/inc/jetpack.php

@@ -89,7 +89,7 @@ if ( function_exists( 'jetpack_is_mobile' ) && class_exists( 'Jetpack_User_Agent
  * Custom render function for Infinite Scroll.
  */
 function dara_infinite_scroll_render() {
-	if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( dara_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
 		dara_woocommerce_product_columns_wrapper();
 		woocommerce_product_loop_start();
 	}
@@ -100,14 +100,14 @@ function dara_infinite_scroll_render() {
 			get_template_part( 'components/post/content', 'search' );
 		elseif ( is_post_type_archive( 'jetpack-testimonial' ) ) :
 			get_template_part( 'components/testimonials/content', 'testimonial' );
-		elseif ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) :
+		elseif ( class_exists( 'WooCommerce' ) && ( dara_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) :
 			wc_get_template_part( 'content', 'product' );
 		else :
 			get_template_part( 'components/post/content', get_post_format() );
 		endif;
 	}
 
-	if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( dara_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
 		woocommerce_product_loop_end();
 		dara_woocommerce_product_columns_wrapper_close();
 	}

dara/inc/style-wpcom.css

@@ -47,6 +47,10 @@
 .widget_authors > ul > li ul a {
 	text-align: left;
 }
+.widget_authors > ul > li strong {
+	display: block;
+	text-align: center; 
+}
 .widget_authors li:before,
 .widget_authors li:after {
 	content: "";

dara/inc/woocommerce.php

@@ -16,7 +16,6 @@
  * @return void
  */
 function dara_woocommerce_setup() {
-	// Declare WooCommerce support.
 	add_theme_support( 'woocommerce', apply_filters( 'dara_woocommerce_args', array(
 		'single_image_width'    => 624,
 		'thumbnail_image_width' => 300,
@@ -97,8 +96,6 @@ add_filter( 'body_class', 'dara_woocommerce_active_body_class' );
 function dara_woocommerce_products_per_page() {
 	return 12;
 }
-
-// Legacy WooCommerce products per page filter.
 if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
 	add_filter( 'loop_shop_per_page', 'dara_woocommerce_products_per_page' );
 }
@@ -109,7 +106,7 @@ if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
  * @return integer number of columns.
  */
 function dara_woocommerce_thumbnail_columns() {
-	return 4;
+	return absint( apply_filters( 'dara_woocommerce_product_thumbnail_columns', 4 ) );
 }
 add_filter( 'woocommerce_product_thumbnails_columns', 'dara_woocommerce_thumbnail_columns' );
 
@@ -119,7 +116,7 @@ add_filter( 'woocommerce_product_thumbnails_columns', 'dara_woocommerce_thumbnai
  * @return integer products per row.
  */
 function dara_woocommerce_loop_columns() {
-	return 4;
+	return absint( apply_filters( 'dara_woocommerce_loop_columns', 4 ) );
 }
 
 // Legacy WooCommerce columns filter.
@@ -166,11 +163,9 @@ if ( ! function_exists( 'dara_loop_columns' ) ) {
 	 */
 	function dara_loop_columns() {
 		$columns = 4; // 4 products per row
-
 		if ( function_exists( 'wc_get_default_products_per_row' ) ) {
 			$columns = wc_get_default_products_per_row();
 		}
-
 		return apply_filters( 'dara_loop_columns', $columns );
 	}
 }
@@ -332,19 +327,4 @@ function dara_woocommerce_is_shop_page() {
 	}
 
 	return $is_shop_page;
-}
-
-/**
- * Override number of products per page in Jetpack infinite scroll.
- *
- * @param  array $args infinite scroll args.
- * @return array       infinite scroll args.
- */
-function dara_woocommerce_jetpack_products_per_page( $args ) {
-	if ( is_array( $args ) && ( dara_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
-		 $args['posts_per_page'] = dara_woocommerce_products_per_page();
-	}
-
-	return $args;
-}
-add_filter( 'infinite_scroll_settings', 'dara_woocommerce_jetpack_products_per_page' );
+}

dara/style.css

@@ -4,7 +4,7 @@ Theme URI: http://wordpress.com/themes/dara/
 Author: Automattic
 Author URI: http://wordpress.com/themes/
 Description: With bold featured images and bright, cheerful colors, Dara is ready to get to work for your business.
-Version: 1.2.3-wpcom
+Version: 1.2.4-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: dara

dara/woocommerce-rtl.css

@@ -614,6 +614,8 @@ ul.products li.product .woocommerce-loop-category__title {
 }
 
 ul.products li.product a {
+  display: block;
+  max-width: 300px;
   text-decoration: none;
 }
 
@@ -634,6 +636,7 @@ ul.products li.product .star-rating {
 }
 
 ul.products li.product .button {
+  display: inline-block;
   margin-top: 1em;
   max-width: 100%;
   white-space: normal;
@@ -1306,6 +1309,7 @@ table.woocommerce-MyAccount-downloads th .woocommerce-MyAccount-downloads-file::
 }
 
 td.product-name dl.variation, td.product-name .wc-item-meta {
+  font-size: .875em;
   list-style: none outside;
 }
 
@@ -1403,6 +1407,7 @@ ul.cart_list li dl dd,
 ul.product_list_widget li dl dt,
 ul.product_list_widget li dl dd {
   display: inline-block;
+  font-size: .875em;
   float: right;
   margin-bottom: 1em;
 }
@@ -1417,7 +1422,8 @@ ul.product_list_widget li dl dt {
 
 ul.cart_list li dl dd,
 ul.product_list_widget li dl dd {
-  padding: 0 0 0.25em;
+  padding: 0;
+  margin: 0;
 }
 
 ul.cart_list li dl dd p:last-child,
@@ -2776,8 +2782,8 @@ ul.order_details li:last-of-type {
     display: inline-block;
   }
   /**
-	 * Header cart
-	 */
+   * Header cart
+   */
   .site-header-cart li:first-child:before {
     color: rgba(0, 0, 0, 0.15);
     content: " \2022";
@@ -3174,7 +3180,6 @@ form .form-row-last {
 
 form .form-row-first {
   float: right;
-		float: right;
 }
 
 form .form-row-last {
@@ -3233,7 +3238,7 @@ form .form-row-wide {
     display: block;
   }
   .woocommerce-account .woocommerce-MyAccount-navigation ul {
-	margin-bottom: 1em;
+    margin-bottom: 1em;
     margin-right: 0;
   }
   .woocommerce-account .woocommerce-MyAccount-navigation ul li {
@@ -3325,16 +3330,16 @@ form .form-row-wide {
     margin: 0.125em 0 0.125em 0.25em;
   }
   /**
-	 * General layout
-	 */
+   * General layout
+   */
   .col2-set .col-1,
   .col2-set .col-2 {
     float: none;
     width: 100%;
   }
   /**
-	 * Products
-	 */
+   * Products
+   */
   .woocommerce-page ul.products li.product, .woocommerce-page[class*='columns-'] ul.products li.product {
     width: 48%;
     float: right;
@@ -3346,8 +3351,8 @@ form .form-row-wide {
     clear: none !important;
   }
   /**
-	 * Product Details
-	 */
+   * Product Details
+   */
   div.product div.images,
   div.product div.summary,
   #content div.product div.images,
@@ -3356,8 +3361,8 @@ form .form-row-wide {
     width: 100%;
   }
   /**
-	 * Cart
-	 */
+   * Cart
+   */
   table.cart .product-thumbnail,
   #content table.cart .product-thumbnail {
     display: none;
@@ -3409,9 +3414,16 @@ form .form-row-wide {
     float: none;
     text-align: right;
   }
+
+  dl.variation dd,
+  dl.variation p {
+    margin: 0;
+    padding: 0;
+  }
+
   /**
-	 * Checkout
-	 */
+   * Checkout
+   */
   .woocommerce-checkout form.login .form-row {
     width: 100%;
     float: none;
@@ -3427,8 +3439,8 @@ form .form-row-wide {
     margin-bottom: 1em;
   }
   /**
-	 * Account
-	 */
+   * Account
+   */
   .lost_reset_password .form-row-first,
   .lost_reset_password .form-row-last {
     width: 100%;

dara/woocommerce.css

@@ -614,7 +614,9 @@ ul.products li.product .woocommerce-loop-category__title {
 }
 
 ul.products li.product a {
+  display: block;
   text-decoration: none;
+  max-width: 300px;
 }
 
 ul.products li.product a img {
@@ -634,6 +636,7 @@ ul.products li.product .star-rating {
 }
 
 ul.products li.product .button {
+  display: inline-block;
   margin-top: 1em;
   max-width: 100%;
   white-space: normal;
@@ -1306,6 +1309,7 @@ table.woocommerce-MyAccount-downloads th .woocommerce-MyAccount-downloads-file::
 }
 
 td.product-name dl.variation, td.product-name .wc-item-meta {
+  font-size: .875em;
   list-style: none outside;
 }
 
@@ -1403,6 +1407,7 @@ ul.cart_list li dl dd,
 ul.product_list_widget li dl dt,
 ul.product_list_widget li dl dd {
   display: inline-block;
+  font-size: .875em;
   float: left;
   margin-bottom: 1em;
 }
@@ -1417,7 +1422,8 @@ ul.product_list_widget li dl dt {
 
 ul.cart_list li dl dd,
 ul.product_list_widget li dl dd {
-  padding: 0 0 0.25em;
+  padding: 0;
+  margin: 0;
 }
 
 ul.cart_list li dl dd p:last-child,
@@ -2777,8 +2783,8 @@ ul.order_details li:last-of-type {
     display: inline-block;
   }
   /**
-	 * Header cart
-	 */
+  * Header cart
+  */
   .site-header-cart li:first-child:before {
     color: rgba(0, 0, 0, 0.15);
     content: " \2022";
@@ -3175,9 +3181,10 @@ form .form-row-last {
 
 form .form-row-first {
   float: left;
-  /*rtl:raw:
-		float: right;
-		*/
+/*
+  rtl:raw:
+  float: right;
+*/
 }
 
 form .form-row-last {
@@ -3236,7 +3243,7 @@ form .form-row-wide {
     display: block;
   }
   .woocommerce-account .woocommerce-MyAccount-navigation ul {
-	margin-bottom: 1em;
+    margin-bottom: 1em;
     margin-left: 0;
   }
   .woocommerce-account .woocommerce-MyAccount-navigation ul li {
@@ -3328,16 +3335,16 @@ form .form-row-wide {
     margin: 0.125em 0.25em 0.125em 0;
   }
   /**
-	 * General layout
-	 */
+   * General layout
+   */
   .col2-set .col-1,
   .col2-set .col-2 {
     float: none;
     width: 100%;
   }
   /**
-	 * Products
-	 */
+   * Products
+   */
   .woocommerce-page ul.products li.product, .woocommerce-page[class*='columns-'] ul.products li.product {
     width: 48%;
     float: left;
@@ -3349,8 +3356,8 @@ form .form-row-wide {
     clear: none !important;
   }
   /**
-	 * Product Details
-	 */
+   * Product Details
+   */
   div.product div.images,
   div.product div.summary,
   #content div.product div.images,
@@ -3359,8 +3366,8 @@ form .form-row-wide {
     width: 100%;
   }
   /**
-	 * Cart
-	 */
+   * Cart
+   */
   table.cart .product-thumbnail,
   #content table.cart .product-thumbnail {
     display: none;
@@ -3412,9 +3419,16 @@ form .form-row-wide {
     float: none;
     text-align: left;
   }
+
+  dl.variation dd,
+  dl.variation p {
+    margin: 0;
+    padding: 0;
+  }
+
   /**
-	 * Checkout
-	 */
+   * Checkout
+   */
   .woocommerce-checkout form.login .form-row {
     width: 100%;
     float: none;
@@ -3430,8 +3444,8 @@ form .form-row-wide {
     margin-bottom: 1em;
   }
   /**
-	 * Account
-	 */
+   * Account
+   */
   .lost_reset_password .form-row-first,
   .lost_reset_password .form-row-last {
     width: 100%;

dyad-2/inc/jetpack.php

@@ -57,19 +57,19 @@ add_action( 'after_setup_theme', 'dyad_2_jetpack' );
  * Custom render function for Infinite Scroll.
  */
 function dyad_2_infinite_scroll_render() {
-	if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( dyad_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
 		dyad_2_woocommerce_product_columns_wrapper();
 		woocommerce_product_loop_start();
 	}
 	while ( have_posts() ) {
 		the_post();
-		if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) :
+		if ( class_exists( 'WooCommerce' ) && ( dyad_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) :
 			wc_get_template_part( 'content', 'product' );
 		else :
 			get_template_part( 'template-parts/content', 'blocks' );
 		endif;
 	}
-	if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( dyad_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
 		woocommerce_product_loop_end();
 		dyad_2_woocommerce_product_columns_wrapper_close();
 	}

dyad-2/inc/woocommerce.php

@@ -356,20 +356,6 @@ function dyad_2_woocommerce_is_shop_page() {
 	return $is_shop_page;
 }
 
-/**
- * Override number of products per page in Jetpack infinite scroll.
- *
- * @param  array $args infinite scroll args.
- * @return array       infinite scroll args.
- */
-function dyad_2_woocommerce_jetpack_products_per_page( $args ) {
-	if ( is_array( $args ) && ( dyad_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
-		 $args['posts_per_page'] = dyad_2_woocommerce_products_per_page();
-	}
-	return $args;
-}
-add_filter( 'infinite_scroll_settings', 'dyad_2_woocommerce_jetpack_products_per_page' );
-
 /**
  * Move the sale flash badge
  */

dyad-2/style.css

@@ -4,7 +4,7 @@ Theme URI: http://wordpress.com/themes/dyad-2/
 Author: Automattic
 Author URI: http://wordpress.com/themes
 Description: Dyad pairs your written content and images together in perfect balance. The theme is geared towards photographers, foodies, artists, and anyone who is looking for a strong photographic presence on their website.
-Version: 2.0.5-wpcom
+Version: 2.0.6-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: art, artwork, blog, blue, classic-menu, custom-colors, custom-header, custom-menu, dark, design, editor-style, featured-images, food, grid-layout, infinite-scroll, photoblogging, photography, post-slider, responsive-layout, rtl-language-support, site-logo, social-menu, sticky-post, threaded-comments, translation-ready, yellow
@@ -584,7 +584,6 @@ td, th {
 th {
 	font-size: 85%;
 	letter-spacing: 0.1em;
-	padding: ;
 	text-transform: uppercase;
 }
 
@@ -2004,7 +2003,7 @@ footer.comment-footer:after,
 	padding: 13.5rem 0 0;
 }
 
-.is-singular .site-content:before.
+.is-singular .site-content:before,
 .is-singular .site-content:after {
 	content: "";
 }
@@ -2100,7 +2099,7 @@ body:not(.has-post-thumbnail).is-singular .entry-inner,
 	padding-top: 3rem;
 }
 
-.is-singular:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header {
+.is-singular:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header {
 	font-style: italic;
 }
 
@@ -2111,7 +2110,7 @@ body:not(.has-post-thumbnail).is-singular .entry-inner,
 	text-align: center;
 }
 
-.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header {
+.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header {
 	background: rgba(0,0,0,0.4);
 	border-top: 1px solid rgba(255,255,255,0.2);
 	bottom: 0;
@@ -2123,34 +2122,34 @@ body:not(.has-post-thumbnail).is-singular .entry-inner,
 	width: 50%;
 }
 
-.page.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header {
+.page.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header {
 	padding-bottom: 8rem;
 	padding-top: 4rem;
 }
 
 
-.is-singular:not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header h1 {
+.is-singular:not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header h1 {
 	font-style: normal;
 	margin-top: 1rem;
 }
 
-.is-singular:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header a {
+.is-singular:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header a {
 	font-style: normal;
 	letter-spacing: 0.1em;
 	text-transform: uppercase;
 }
 
-.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header h1,
-.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header a {
+.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header h1,
+.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header a {
 	color: #fff;
 }
 
-.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-meta {
+.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-meta {
 	font-size: 1.5rem;
 	top: -20px;
 }
 
-.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-meta {
+.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-meta {
 	position: relative;
 	width: 100%;
 }
@@ -2183,11 +2182,11 @@ body:not(.has-post-thumbnail).is-singular .entry-inner,
 	padding: 1.5em 0 0;
 }
 
-.is-singular.has-post-thumbnail:not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-posted .posted-info {
+.is-singular.has-post-thumbnail:not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-posted .posted-info {
 	float: left;
 }
 
-.is-singular.has-post-thumbnail:not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-posted .edit-link {
+.is-singular.has-post-thumbnail:not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-posted .edit-link {
 	float: right;
 }
 
@@ -2210,7 +2209,7 @@ body:not(.has-post-thumbnail).is-singular .entry-inner,
 
 /* entry content */
 
-.is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-content {
+.is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-content {
 	padding-top: 4em;
 }
 
@@ -2277,7 +2276,7 @@ body:not(.has-post-thumbnail).is-singular .entry-inner,
 	width: 12px;
 }
 
-.is-singular:not(.page-template-eventbrite-index):not(.woocommerce-active) .post-navigation .nav-links:before {
+.is-singular:not(.page-template-eventbrite-index):not(.woocommerce-page) .post-navigation .nav-links:before {
 	border-top: 1px solid #e0e0e0;
 	left: 37.5%;
 	right: 37.5%;
@@ -2959,7 +2958,7 @@ object {
 	position: relative;
 }
 
-.is-singular.has-post-thumbnail:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-active) .widget-area {
+.is-singular.has-post-thumbnail:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-page) .widget-area {
 	max-width: calc(72% + 4em);
 }
 
@@ -2971,13 +2970,13 @@ object {
 }
 
 .widget-area.widget-one .widget,
-.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .widget-area.widget-one .widget {
+.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .widget-area.widget-one .widget {
 	width: 100%;
 }
 
 .widget-area.widgets-two .widget,
-.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .widget-area .widget,
-.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .widget-area.widgets-three .widget {
+.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .widget-area .widget,
+.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .widget-area.widgets-three .widget {
 	width: 49.5%;
 }
 
@@ -3626,11 +3625,11 @@ object {
 		padding-top: 10px;
 	}
 
-	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header {
+	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header {
 		padding: 0 4rem 3rem;
 	}
 
-	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .widget-area .widget {
+	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .widget-area .widget {
 		width: 100%;
 	}
 }
@@ -3797,7 +3796,7 @@ object {
 	 /* site inner */
 
 
-	.is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .site-inner {
+	.is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .site-inner {
 		width: 65%;
 	}
 
@@ -3815,14 +3814,14 @@ object {
 	/* entry header */
 
 	.is-singular .entry-header,
-	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce) .entry-header,
+	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header,
 	.page-template-eventbrite-index .page-header,
 	.single-event .entry-header {
 		padding: 3em 0 0;
 		text-align: center;
 	}
 
-	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header {
+	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header {
 		background: transparent;
 		color: #6a6c6e;
 		position: relative;
@@ -3839,12 +3838,12 @@ object {
 		font-size: 3rem;
 	}
 
-	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header h1 {
+	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header h1 {
 		color: #1a1c1e;
 	}
 
-	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header a,
-	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header .cat-links {
+	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header a,
+	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header .cat-links {
 		color: #6a6c6e;
 	}
 
@@ -3859,12 +3858,12 @@ object {
 		font-size: 1.5rem;
 	}
 
-	.is-singular.has-post-thumbnail:not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-posted .posted-info,
-	.is-singular.has-post-thumbnail:not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-posted .edit-link {
+	.is-singular.has-post-thumbnail:not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-posted .posted-info,
+	.is-singular.has-post-thumbnail:not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-posted .edit-link {
 		float: none;
 	}
 
-	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-meta {
+	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-meta {
 		top: auto;
 	}
 
@@ -3876,13 +3875,13 @@ object {
 	/* entry content */
 
 	.is-singular .entry-content,
-	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-content  {
+	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-content  {
 		padding-top: 3rem;
 	}
 
 	/* entry media */
 
-	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-media {
+	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-media {
 		width: 35%;
 	}
 
@@ -4086,7 +4085,7 @@ object {
 	/* site inner */
 
 	 .is-singular:not(.home) .site-inner,
-	 .is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .site-inner {
+	 .is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .site-inner {
 		width: 100%;
 	}
 
@@ -4131,7 +4130,7 @@ object {
 
 	.is-singular .entry-media,
 	.is-singular:not(.home) .entry-media,
-	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-media {
+	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-media {
 		background: none !important;
 		height: auto;
 		margin: 0 0 5.5rem;
@@ -4186,7 +4185,7 @@ object {
 
 	/* widgets */
 
-	.is-singular.has-post-thumbnail:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-active) .widget-area .widget {
+	.is-singular.has-post-thumbnail:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-page) .widget-area .widget {
 		width: 49.5%;
 	}
 
@@ -4477,7 +4476,7 @@ object {
 
 	.is-singular .entry-content,
 	.is-singular:not(.home) .entry-content,
-	.is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-content {
+	.is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-content {
 		padding-top: 2rem;
 	}
 
@@ -4513,9 +4512,9 @@ object {
 	.widget-area.widgets-two .widget,
 	.widget-area.widgets-three .widget,
 	.is-singular:not(.home) .widget-area .widget,
-	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .widget-area .widget,
-	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .widget-area.widgets-three .widget,
-	.is-singular.has-post-thumbnail:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-active) .widget-area .widget,
+	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .widget-area .widget,
+	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .widget-area.widgets-three .widget,
+	.is-singular.has-post-thumbnail:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-page) .widget-area .widget,
 	.has-post-thumbnail.is-singular.single-format-image .widget-area .widget,
 	.has-post-thumbnail.is-singular.single-format-image .widget-area .widget,
 	.is-singular.single-format-image .widget-area .widget,
@@ -4626,7 +4625,7 @@ object {
 		padding-top: 0 !important;
 	}
 
-	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header,
+	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header,
 	.is-singular .entry-media-thumb {
 		padding: 0 !important;
 	}
@@ -4638,7 +4637,7 @@ object {
 		margin: 0 !important;
 	}
 
-	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-media {
+	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-media {
 		height: 100% !important;
 		position: relative !important;
 		top: 0 !important;
@@ -4649,11 +4648,11 @@ object {
 		max-width: 100% !important;
 	}
 
-	.is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .site-inner {
+	.is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .site-inner {
 		width: 100%;
 	}
 
-	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header {
+	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header {
 		bottom: auto;
 		left: auto;
 		position: relative;

dyad-2/woocommerce-rtl.css

@@ -286,6 +286,7 @@ p.no-comments {
 .woocommerce-noreviews .button,
 p.no-comments .button {
 	float: left;
+	margin-left: 0;
 	margin-right: 2em;
 }
 
@@ -314,6 +315,7 @@ p.no-comments .button {
 .product_list_widget a img {
 	float: right;
 	margin-left: 1em;
+	margin-right: 0;
 }
 
 /***
@@ -323,9 +325,6 @@ p.no-comments .button {
 	text-align: right;
 }
 
-
-
-
 /**
  * My Account
  **/
@@ -336,3 +335,13 @@ p.no-comments .button {
 .woocommerce-account .woocommerce-MyAccount-navigation ul {
 	margin-right: 0;
 }
+
+/**
+ * Checkout
+ */
+.woocommerce-cart #payment ul.payment_methods,
+.woocommerce #payment ul.payment_methods,
+#add_payment_method #payment ul.payment_methods,
+#shipping_method {
+	margin-right: 0;
+}

dyad-2/woocommerce.css

@@ -60,6 +60,17 @@ table.shop_table td.actions .coupon input[type=text] {
 	padding: 0.875em;
 }
 
+table.shop_table tbody .wc-item-meta {
+	font-size: .875em;
+	margin: .875em 0 0 0;
+	list-style: none;
+}
+
+table.shop_table tbody .wc-item-meta p {
+	margin: 0;
+	padding: 0;
+}
+
 @media only screen and (max-width: 1200px) {
 	.has-post-thumbnail .shop_table .actions .coupon {
 		width: 50%;
@@ -166,14 +177,12 @@ table.shop_table_responsive tr td.download-actions .button {
 }
 
 @media only screen and (min-width: 1200px) {
-	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index) .entry-header,
-	.page-template-eventbrite-index .page-header,
-	.single-event .entry-header {
+	.woocommerce-page.has-post-thumbnail.is-singular:not(.home):not(.single-format-image) .entry-header {
 		padding: 3em 0 0;
 		text-align: center;
 	}
 
-	.has-post-thumbnail .entry-content {
+	.woocommerce-page.has-post-thumbnail .entry-content {
 		padding-top: 3rem;
 	}
 }
@@ -277,6 +286,17 @@ ul.products li.product .button {
 	display: table;
 }
 
+dl.variation {
+	font-size: .875em;
+	margin: .875em 0 0 0;
+}
+
+dl.variation dd,
+dl.variation p {
+	margin: 0;
+	padding: 0;
+}
+
 @media screen and (min-width: 768px) {
 	body.woocommerce .products {
 		margin: 0 auto;
@@ -571,9 +591,10 @@ ul.products li.product .button {
 }
 
 .single-product .woocommerce-review-link {
-	display: inline-block;
+	display: block;
 	font-style: italic;
 	line-height: 1.618;
+	margin-bottom: 1em;
 	vertical-align: top;
 }
 
@@ -761,28 +782,28 @@ ul.order_details li strong {
  * General layout styles
  */
 .col2-set {
-  zoom: 1;
-  width: 100%;
+	zoom: 1;
+	width: 100%;
 }
 
 .col2-set::before,
 .col2-set::after {
-  content: ' ';
-  display: table;
+	content: ' ';
+	display: table;
 }
 
 .col2-set::after {
-  clear: both;
+	clear: both;
 }
 
 .col2-set .col-1 {
-  float: left;
-  width: 48%;
+	float: left;
+	width: 48%;
 }
 
 .col2-set .col-2 {
-  float: right;
-  width: 48%;
+	float: right;
+	width: 48%;
 }
 
 @media screen and (min-width: 768px) {
@@ -1087,13 +1108,13 @@ nav.woocommerce-pagination {
 }
 
 nav.woocommerce-pagination ul {
-  clear: both;
-  margin: 1em auto 2em auto;
+	clear: both;
+	margin: 1em auto 2em auto;
 }
 
 nav.woocommerce-pagination ul li {
-  display: inline-block;
-  padding: 0 0.25em;
+	display: inline-block;
+	padding: 0 0.25em;
 }
 
 nav.woocommerce-pagination ul li span.current {
@@ -1116,6 +1137,7 @@ nav.woocommerce-pagination ul li a:focus {
 	font-weight: 400;
 	height: 1.618em;
 	line-height: 1.618;
+	margin: 0 auto 1em;
 	overflow: hidden;
 	position: relative;
 	vertical-align: bottom;
@@ -1148,6 +1170,19 @@ nav.woocommerce-pagination ul li a:focus {
 	color: #678db8;
 }
 
+#reviews .star-rating,
+.summary .star-rating {
+	margin-bottom: 0;
+}
+
+.products .star-rating {
+	display: block;
+}
+
+.widget .star-rating {
+	margin: 0;
+}
+
 p.stars a {
 	position: relative;
 	height: 1em;
@@ -1301,6 +1336,10 @@ p.stars.selected a:not(.active):before {
 	padding-top: 0 !important;
 }
 
+.is-singular div.product .woocommerce-tabs .entry-content .shop_attributes p {
+	padding: 0;
+}
+
 .woocommerce-tabs .panel h2:first-of-type {
 	margin-bottom: 1em;
 }
@@ -1404,6 +1443,10 @@ p.no-comments {
 	position: relative;
 }
 
+.woocommerce-noreviews {
+	padding: 1em 2em 1em 2em;
+}
+
 @media screen and (max-width: 1080px) {
 	.woocommerce-message,
 	.woocommerce-info,
@@ -1544,6 +1587,13 @@ p.no-comments .button {
 	height: 100%;
 }
 
+.widget_rating_filter .wc-layered-nav-rating .star-rating {
+	display: inline-block;
+	height: 1em;
+	line-height: 1;
+	margin-bottom: 0.4em;
+}
+
 .product_list_widget li {
 	clear: both;
 }

independent-publisher-2/inc/jetpack.php

@@ -58,7 +58,7 @@ add_action( 'after_setup_theme', 'independent_publisher_2_jetpack_setup' );
  */
 function independent_publisher_2_infinite_scroll_render() {
 
-	if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( ip_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
 		ip_woocommerce_product_columns_wrapper();
 		woocommerce_product_loop_start();
 	}
@@ -67,14 +67,14 @@ function independent_publisher_2_infinite_scroll_render() {
 		the_post();
 		if ( is_search() ) :
 			get_template_part( 'template-parts/content', 'search' );
-		elseif ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) :
+		elseif ( class_exists( 'WooCommerce' ) && ( ip_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) :
 			wc_get_template_part( 'content', 'product' );
 		else :
 			get_template_part( 'template-parts/content', get_post_format() );
 		endif;
 	}
 
-	if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( ip_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
 		woocommerce_product_loop_end();
 		ip_woocommerce_product_columns_wrapper_close();
 	}

independent-publisher-2/inc/woocommerce.php

@@ -323,21 +323,6 @@ function ip_woocommerce_is_shop_page() {
 	return $is_shop_page;
 }
 
-
-/**
- * Override number of products per page in Jetpack infinite scroll.
- *
- * @param  array $args infinite scroll args.
- * @return array       infinite scroll args.
- */
-function ip_woocommerce_jetpack_products_per_page( $args ) {
-	if ( is_array( $args ) && ( ip_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
-		 $args['posts_per_page'] = ip_woocommerce_products_per_page();
-	}
-	return $args;
-}
-add_filter( 'infinite_scroll_settings', 'ip_woocommerce_jetpack_products_per_page' );
-
 /**
  * ip_woocommerce_image_dimensions Defines WC image sizes
  * @return void

independent-publisher-2/style.css

@@ -1,7 +1,7 @@
 /*
 Theme Name: Independent Publisher 2
 Theme URI: http://wordpress.com/themes/independent-publisher-2
-Version: 2.1.3-wpcom
+Version: 2.1.4-wpcom
 Description: Independent Publisher 2 is a clean and polished theme with a light color scheme, bold typography, and full-width images.
 Author: Raam Dev
 Author URI: http://raamdev.com/
@@ -2171,7 +2171,6 @@ p.no-comments {
 .custom-logo {
 	display: block;
 	width: auto;
-	max-width: 750px;
 	height: auto;
 	max-height: 150px;
 	margin: 0 auto .875em;
@@ -3152,7 +3151,10 @@ time.published + .updated {
 --------------------------------------------------------------*/
 
 @media screen and (min-width: 48.9375em) {
-
+	
+	.custom-logo {
+		max-width: 750px;
+	}
 	.comment-form input[type="text"],
 	.comment-form input[type="password"],
 	.comment-form input[type="email"],

independent-publisher-2/woocommerce-rtl.css

@@ -436,6 +436,8 @@ ul.products {
   box-shadow: none;
   background: url("../../plugins/woocommerce/assets/css/photoswipe/default-skin/default-skin.png") 100% 0 no-repeat;
   background-size: 264px 88px; }
+  .single-product div.pswp div.pswp__scroll-wrap div.pswp__ui div.pswp__top-bar button.pswp__button:hover {
+    opacity: 1; }
   .single-product div.pswp div.pswp__scroll-wrap div.pswp__ui div.pswp__top-bar button.pswp__button.pswp__button--close {
     background-position: 100% -44px; }
   .single-product div.pswp div.pswp__scroll-wrap div.pswp__ui div.pswp__top-bar button.pswp__button.pswp__button--zoom {
@@ -826,6 +828,34 @@ ul#shipping_method {
     margin: 0;
     padding: 0; }
 
+  .site-header-cart dl.variation,
+  table.shop_table_responsive dl.variation {
+    font-size: .875em;
+    margin: .875em 0 0; }
+
+  .site-header-cart .widget_shopping_cart span.quantity,
+  table.shop_table_responsive .quantity {
+    display: block;
+    margin: .875em 0; }
+
+  .site-header-cart dl.variation dd,
+  table.shop_table_responsive dl.variation dd,
+  .site-header-cart dl.variation p,
+  table.shop_table_responsive dl.variation p {
+    margin: 0; }
+
+  .site-header-cart dl.variation p,
+  table.shop_table_responsive dl.variation p {
+    font-weight: normal; }
+
+  .wc-item-meta {
+    font-size: .875em;
+    list-style: none; }
+
+  .wc-item-meta,
+  .wc-item-meta p {
+    margin: 0; }
+
 /**
  * Breadcrumbs
  */
@@ -863,6 +893,11 @@ ul#shipping_method {
 .infinite-scroll .woocommerce-pagination {
   display: none; }
 
+.woocommerce-page .infinite-wrap {
+  border-top: none;
+  margin-top: 0;
+  padding-top: 0; }
+
 /**
  * Onsale
  */
@@ -1357,17 +1392,17 @@ a.added_to_cart {
   .widget.woocommerce ul.product_list_widget li .remove {
     display: block;
     font-size: 1.5em;
-    line-height: 1;
+    line-height: .75;
     color: #333;
     border-radius: 100%;
     text-decoration: none;
     font-weight: 700;
     box-shadow: none;
     opacity: .5;
-    text-align: center;
-    margin: .65rem 0 1rem .75rem;
-    height: 1em;
-    width: 1em;
+    text-align: right;
+    margin: 0 0 0 .5rem;
+    height: .75em;
+    width: .75em;
     float: right; }
 
 /**
@@ -1500,6 +1535,7 @@ a.added_to_cart {
     .widget_shopping_cart ul.woocommerce-mini-cart li.woocommerce-mini-cart-item a {
       color: #404040;
       width: auto;
+      margin-right: 1em;
       padding: 0; }
 
 .widget_shopping_cart .total {

independent-publisher-2/woocommerce.css

@@ -436,6 +436,8 @@ ul.products {
   box-shadow: none;
   background: url("../../plugins/woocommerce/assets/css/photoswipe/default-skin/default-skin.png") 0 0 no-repeat;
   background-size: 264px 88px; }
+  .single-product div.pswp div.pswp__scroll-wrap div.pswp__ui div.pswp__top-bar button.pswp__button:hover {
+	opacity: 1; }
   .single-product div.pswp div.pswp__scroll-wrap div.pswp__ui div.pswp__top-bar button.pswp__button.pswp__button--close {
     background-position: 0 -44px; }
   .single-product div.pswp div.pswp__scroll-wrap div.pswp__ui div.pswp__top-bar button.pswp__button.pswp__button--zoom {
@@ -826,6 +828,33 @@ ul#shipping_method {
     margin: 0;
     padding: 0; }
 
+  .site-header-cart dl.variation,
+  table.shop_table_responsive dl.variation {
+    font-size: .875em;
+    margin: .875em 0 0; }
+
+  .site-header-cart .widget_shopping_cart span.quantity,
+  table.shop_table_responsive .quantity {
+  display: block;
+  margin: .875em 0; }
+
+  .site-header-cart dl.variation dd,
+  table.shop_table_responsive dl.variation dd,
+  .site-header-cart dl.variation p,
+  table.shop_table_responsive dl.variation p {
+    margin: 0; }
+  .site-header-cart dl.variation p,
+  table.shop_table_responsive dl.variation p {
+  font-weight: normal; }
+
+.wc-item-meta {
+   font-size: .875em;
+   list-style: none; }
+  .wc-item-meta,
+  .wc-item-meta p {
+    margin: 0; }
+
+
 /**
  * Breadcrumbs
  */
@@ -866,8 +895,7 @@ ul#shipping_method {
 .woocommerce-page .infinite-wrap {
   border-top: none;
   margin-top: 0;
-  padding-top: 0;
-}
+  padding-top: 0; }
 
 /**
  * Onsale
@@ -1363,17 +1391,17 @@ a.added_to_cart {
   .widget.woocommerce ul.product_list_widget li .remove {
     display: block;
     font-size: 1.5em;
-    line-height: 1;
+    line-height: .75;
     color: #333;
     border-radius: 100%;
     text-decoration: none;
     font-weight: 700;
     box-shadow: none;
     opacity: .5;
-    text-align: center;
-    margin: .65rem .75rem 1rem 0;
-    height: 1em;
-    width: 1em;
+    text-align: left;
+    margin: 0 .5rem 0 0;
+    height: .75em;
+    width: .75em;
     float: left; }
 
 /**
@@ -1506,6 +1534,7 @@ a.added_to_cart {
     .widget_shopping_cart ul.woocommerce-mini-cart li.woocommerce-mini-cart-item a {
       color: #404040;
       width: auto;
+      margin-left: 1em;
       padding: 0; }
 
 .widget_shopping_cart .total {

karuna/inc/custom-header.php

@@ -52,9 +52,9 @@ if ( ! function_exists( 'karuna_header_style' ) ) :
 function karuna_header_style() {
 	$header_text_color = get_header_textcolor();
 
-	// If no custom options for text are set, let's bail
-	// get_header_textcolor() options: HEADER_TEXTCOLOR is default, hide text (returns 'blank') or any hex value.
-	if ( HEADER_TEXTCOLOR == $header_text_color ) {
+	// If no custom options for text are set, let's bail.
+	// get_header_textcolor() options: add_theme_support( 'custom-header' ) is default, hide text (returns 'blank') or any hex value.
+	if ( get_theme_support( 'custom-header', 'default-text-color' ) === $header_text_color ) {
 		return;
 	}
 

karuna/style.css

@@ -4,7 +4,7 @@ Theme URI: http://wordpress.com/themes/karuna/
 Author: Automattic
 Author URI: http://wordpress.com/themes/
 Description: Karuna is a clean business theme designed with health and wellness-focused sites in mind. With bright, bold colors, prominent featured images, and support for customer testimonials, your business' brand will shine with Karuna.
-Version: 1.2.5-wpcom
+Version: 1.2.6-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: karuna
@@ -1052,11 +1052,12 @@ body {
 .front-testimonials .hentry {
 	background: rgba(0, 0, 0, 0.02);
 	margin-bottom: 3.2em;
-	padding: 1.6em;
+	padding: 1.6em 1.6em 3em;
 	position: relative;
 	font-size: 16px;
 	font-size: 1rem;
 }
+
 .front-testimonials .hentry p {
 	margin-top: 0;
 }
@@ -1849,6 +1850,7 @@ figure {
 	.front-testimonials .hentry {
 		font-size: 28px;
 		font-size: 1.75rem;
+		padding-bottom: 1.6em;
 	}
 	.front-testimonials .hentry .entry-title {
 		font-size: 18px;

libre-2/inc/jetpack.php

@@ -49,7 +49,7 @@ add_action( 'after_setup_theme', 'libre_2_jetpack_setup' );
  */
 function libre_2_infinite_scroll_render() {
 
-	if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( libre_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
 		libre_2_woocommerce_product_columns_wrapper();
 		woocommerce_product_loop_start();
 	}
@@ -58,14 +58,14 @@ function libre_2_infinite_scroll_render() {
 		the_post();
 		if ( is_search() ) :
 			get_template_part( 'template-parts/content', 'search' );
-		elseif ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) :
+		elseif ( class_exists( 'WooCommerce' ) && ( libre_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) :
 			wc_get_template_part( 'content', 'product' );
 		else :
 			get_template_part( 'template-parts/content', get_post_format() );
 		endif;
 	}
 
-	if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( libre_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
 		woocommerce_product_loop_end();
 		libre_2_woocommerce_product_columns_wrapper_close();
 	}

libre-2/inc/woocommerce.php

@@ -27,6 +27,7 @@ function libre_2_woocommerce_setup() {
 			'min_rows'        => 1
 		)
 	) ) );
+
 	add_theme_support( 'wc-product-gallery-zoom' );
 	add_theme_support( 'wc-product-gallery-lightbox' );
 	add_theme_support( 'wc-product-gallery-slider' );
@@ -43,6 +44,7 @@ function libre_2_woocommerce_scripts() {
 	wp_enqueue_style( 'genericons', get_template_directory_uri() . '/fonts/genericons/genericons.css', array(), '3.4.1' );
 
 	wp_enqueue_style( 'libre-2-woocommerce-style', get_template_directory_uri() . '/woocommerce.css' );
+	wp_style_add_data( 'libre-2-woocommerce-style', 'rtl', get_stylesheet_directory_uri() . '/woocommerce-rtl.css' );
 
 	$font_path   = WC()->plugin_url() . '/assets/fonts/';
 	$inline_font = '@font-face {
@@ -91,11 +93,7 @@ add_filter( 'body_class', 'libre_2_woocommerce_active_body_class' );
 function libre_2_woocommerce_products_per_page() {
 	return absint( apply_filters( 'libre_2_woocommerce_products_per_page', 12 ) );
 }
-if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
-	add_filter( 'loop_shop_per_page', 'libre_2_woocommerce_products_per_page' );
-}
 
-// Legacy WooCommerce products per page filter.
 if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
 	add_filter( 'loop_shop_per_page', 'libre_2_woocommerce_products_per_page' );
 }
@@ -119,7 +117,6 @@ function libre_2_woocommerce_loop_columns() {
 	return absint( apply_filters( 'libre_2_woocommerce_loop_columns', 3 ) );
 }
 
-// Legacy WooCommerce columns filter.
 if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
 	add_filter( 'loop_shop_columns', 'libre_2_woocommerce_loop_columns' );
 }
@@ -135,7 +132,6 @@ function libre_2_woocommerce_related_products_args( $args ) {
 		'posts_per_page' => 3,
 		'columns'        => 3,
 	) );
-	
 	return $args;
 }
 add_filter( 'woocommerce_output_related_products_args', 'libre_2_woocommerce_related_products_args' );
@@ -332,18 +328,4 @@ function libre_2_woocommerce_is_shop_page() {
 		$is_shop_page = is_shop();
 	}
 	return $is_shop_page;
-}
-
-/**
- * Override number of products per page in Jetpack infinite scroll.
- *
- * @param  array $args infinite scroll args.
- * @return array       infinite scroll args.
- */
-function libre_2_woocommerce_jetpack_products_per_page( $args ) {
-	if ( is_array( $args ) && ( libre_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
-		 $args['posts_per_page'] = libre_2_woocommerce_products_per_page();
-	}
-	return $args;
-}
-add_filter( 'infinite_scroll_settings', 'libre_2_woocommerce_jetpack_products_per_page' );
+}

libre-2/rtl.css

@@ -38,7 +38,7 @@ blockquote:before {
 
 blockquote blockquote {
 	margin-left: 0;
-	margin-right: auto;
+	margin-right: 0;
 }
 
 blockquote.alignright,
@@ -61,7 +61,7 @@ ol {
 li > ul,
 li > ol {
 	margin-right: .4375em;
-	margin-left: auto;
+	margin-left: 0;
 }
 
 /*--------------------------------------------------------------
@@ -74,7 +74,7 @@ input[type="url"],
 input[type="password"],
 input[type="search"] {
 	margin-left: -5px;
-	margin-right: auto;
+	margin-right: 0;
 }
 
 textarea {
@@ -200,7 +200,7 @@ td#next {
 .comment .avatar {
 	float: right;
 	margin-left: .875em;
-	margin-right: auto;
+	margin-right: 0;
 }
 
 #cancel-comment-reply-link {
@@ -209,7 +209,13 @@ td#next {
 
 .comment-form label {
 	margin-left: .875em;
-	margin-right: auto;
+	margin-right: 0;
+}
+
+.author-avatar {
+    float: left;
+    margin-right: 1.75em;
+    margin-left: 0;
 }
 
 @media screen and ( min-width: 45em ) {
@@ -233,7 +239,7 @@ td#next {
 	.main-navigation ul > li.menu-item-has-children,
 	.main-navigation ul > li.page_item_has_children {
 		margin-left: 2.625em;
-		margin-right: auto;
+		margin-right: 0;
 	}
 
 	.main-navigation ul > li.menu-item-has-children > a:after,
@@ -268,45 +274,45 @@ td#next {
 	.error404 .widget-areas .widget-area {
 		float: right;
 		margin-left: 5%;
-		margin-right: auto;
+		margin-right: 0;
 	}
 
 	.error404 .widget-areas .widget-area:last-of-type {
 		margin-left: 0;
-		margin-right: auto;
+		margin-right: 0;
 	}
 
 	.footer-widgets > div:nth-child(1):nth-last-child(3) {
 		float: right;
 		margin-left: 5%;
-		margin-right: auto;
+		margin-right: 0;
 	}
 
 	.footer-widgets > div:nth-child(2):nth-last-child(2),
 	.footer-widgets > div:nth-child(3):nth-last-child(1) {
 		float: right;
 		margin-left: 5%;
-		margin-right: auto;
+		margin-right: 0;
 	}
 
 	.footer-widgets > div:nth-child(1):nth-last-child(3):last-of-type,
 	.footer-widgets > div:nth-child(2):nth-last-child(2):last-of-type,
 	.footer-widgets > div:nth-child(3):nth-last-child(1):last-of-type {
 		margin-left: 0;
-		margin-right: auto;
+		margin-right: 0;
 	}
 
 	.footer-widgets > div:nth-child(1):nth-last-child(2),
 	.footer-widgets > div:nth-child(2):nth-last-child(1) {
 		float: right;
 		margin-left: 6%;
-		margin-right: auto;
+		margin-right: 0;
 	}
 
 	.footer-widgets > div:nth-child(1):nth-last-child(2):last-of-type,
 	.footer-widgets > div:nth-child(2):nth-last-child(1):last-of-type {
 		margin-left: 0;
-		margin-right: auto;
+		margin-right: 0;
 	}
 
 	.entry-footer span {
@@ -349,7 +355,7 @@ td#next {
 @media screen and ( min-width: 55em ) {
 	.sticking .site-logo {
 		margin-left: 0.4375em;
-		margin-right: auto;
+		margin-right: 0;
 	}
 
 	.singular .content-area {
@@ -404,7 +410,7 @@ td#next {
 
 	.sticking .site-title {
 		margin-left: 0;
-		margin-right: auto;
+		margin-right: 0;
 	}
 
 	.main-navigation {

libre-2/style.css

@@ -4,7 +4,7 @@ Theme URI: http://wordpress.com/themes/libre-2/
 Author: Automattic
 Author URI: http://wordpress.com/themes/
 Description: A stylish, classic look for your personal blog or long-form writing site. The main navigation bar stays fixed to the top while your visitors read, keeping your most important content at hand, while three footer widget areas give your secondary content a comfortable home.
-Version: 2.2.2-wpcom
+Version: 2.2.3-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: libre

libre-2/woocommerce-rtl.css

@@ -0,0 +1,614 @@
+/*
+ * Theme Name: Libre 2
+ *
+ * RTL additions
+ *
+ */
+
+table.shop_table_responsive tr td
+{
+	text-align: left;
+}
+
+table.shop_table_responsive tr td:before
+{
+	float: right;
+}
+
+/**
+ * Shop table
+ */
+table.shop_table
+{
+	text-align: right;
+}
+
+.woocommerce .shop_table tbody .wc-item-meta {
+	padding-right: 0;
+}
+
+/**
+ * Cart table
+ */
+table.cart .actions
+{
+	text-align: right;
+}
+
+.checkout_coupon .button,
+.coupon .button {
+	margin-right: .8em;
+	margin-left: 0;
+}
+
+.cart-collaterals .wc-proceed-to-checkout
+{
+	text-align: left;
+}
+
+@media screen and (min-width: 896px)
+{
+	table.shop_table_responsive tr th,
+	table.shop_table_responsive tr td
+	{
+		text-align: right;
+	}
+	table.cart .actions
+	{
+		text-align: left;
+	}
+	table.cart .coupon
+	{
+		float: right;
+	}
+}
+
+/**
+ * Products
+ */
+@media screen and (min-width: 896px)
+{
+	ul.products li.product
+	{
+		float: right;
+		margin-left: 4%;
+		margin-right: 0;
+	}
+	ul.products li.product.last
+	{
+		margin-left: 0;
+	}
+	.columns-2 ul.products li.product
+	{
+		margin-left: 4%;
+		margin-right: 0;
+	}
+	.columns-2 ul.products li.product:nth-of-type(2n) {
+		margin-left: 0;
+	}
+	.columns-3 ul.products li.product
+	{
+		margin-left: 5%;
+		margin-right: 0;
+	}
+	.columns-3 ul.products li.product:nth-of-type(3n) {
+		margin-left: 0;
+	}
+	.columns-4 ul.products li.product
+	{
+		margin-left: 4%;
+		margin-right: 0;
+	}
+	.columns-4 ul.products li.product:nth-of-type(4n) {
+		margin-left: 0;
+	}
+	.columns-5 ul.products li.product
+	{
+		margin-left: 5%;
+		margin-right: 0;
+	}
+	.columns-5 ul.products li.product:nth-of-type(5n) {
+		margin-left: 0;
+	}
+	.columns-6 ul.products li.product
+	{
+		margin-left: 2%;
+		margin-right: 0;
+	}
+	.columns-6 ul.products li.product:nth-of-type(6n) {
+		margin-left: 0;
+	}
+}
+
+/**
+ * Loop products
+ */
+ul.products li.product .button.loading:after,
+ul.products li.product .button.added:after
+{
+	margin-right: .53em;
+	margin-left: 0;
+}
+
+/**
+ * Single Product
+ */
+.single-product div.product .woocommerce-product-gallery .woocommerce-product-gallery__trigger
+{
+	left: 0;
+	right: auto;
+}
+.single-product div.product .woocommerce-product-gallery .flex-control-thumbs li
+{
+	float: right;
+}
+.single-product div.product .woocommerce-product-gallery.woocommerce-product-gallery--columns-2 .flex-control-thumbs li
+{
+	margin-left: 4%;
+	margin-right: 0;
+}
+.single-product div.product .woocommerce-product-gallery.woocommerce-product-gallery--columns-2 .flex-control-thumbs li:nth-child(2n)
+{
+	margin-left: 0;
+}
+.single-product div.product .woocommerce-product-gallery.woocommerce-product-gallery--columns-3 .flex-control-thumbs li
+{
+	margin-left: 5%;
+	margin-right: 0;
+}
+.single-product div.product .woocommerce-product-gallery.woocommerce-product-gallery--columns-3 .flex-control-thumbs li:nth-child(3n)
+{
+	margin-left: 0;
+}
+.single-product div.product .woocommerce-product-gallery.woocommerce-product-gallery--columns-4 .flex-control-thumbs li
+{
+	margin-left: 3.8%;
+	margin-right: 0;
+}
+.single-product div.product .woocommerce-product-gallery.woocommerce-product-gallery--columns-4 .flex-control-thumbs li:nth-child(4n)
+{
+	margin-left: 0;
+}
+.single-product div.product .woocommerce-product-gallery.woocommerce-product-gallery--columns-5 .flex-control-thumbs li
+{
+	margin-left: 3.8%;
+	margin-right: 0;
+}
+.single-product div.product .woocommerce-product-gallery.woocommerce-product-gallery--columns-5 .flex-control-thumbs li:nth-child(5n)
+{
+	margin-left: 0;
+}
+.single-product div.product .woocommerce-product-rating .star-rating
+{
+	margin-left: .35em;
+	margin-right: 0;
+}
+.single-product div.product form.cart div.quantity
+{
+	float: right;
+	margin-left: .5em;
+	margin-right: 0;
+}
+.single-product div.product form.cart .variations .reset_variations
+{
+	margin-right: .875em;
+	margin-left: 0;
+}
+.single-product div.product form.cart table.group_table div.quantity
+{
+	margin-left: 0;
+}
+.single-product div.product .product_meta span
+{
+	margin-left: .875em;
+	margin-right: 0;
+}
+.single-product div.product .woocommerce-tabs ul.tabs
+{
+	padding-right: 1.75em;
+	padding-right: calc(1.75em - 5px);
+	padding-left: 0;
+}
+
+/**
+ * Reviews
+ */
+#reviews #comments ol.commentlist
+{
+	margin-right: 0;
+}
+#reviews #comments ol.commentlist li img.avatar
+{
+	float: right;
+	left: auto;
+	right: 0;
+}
+#reviews #comments ol.commentlist li .comment-text
+{
+	margin: 0 70px 0 0;
+}
+#reviews #comments ol.commentlist li .star-rating
+{
+	float: left;
+}
+
+/**
+ * My account
+ */
+.woocommerce-account .woocommerce-MyAccount-navigation ul li
+{
+	margin: 0 0 0 1.75em;
+}
+.woocommerce-account .addresses .woocommerce-Address-title h3
+{
+	float: right;
+}
+.woocommerce-account .addresses .woocommerce-Address-title .edit
+{
+	float: left;
+}
+.woocommerce-account .woocommerce-order-details .order-again .button:after
+{
+	margin-left: 0;
+	margin-right: .5rem;
+}
+
+/**
+ * Checkout
+ */
+.woocommerce-form__label-for-checkbox .woocommerce-form__input-checkbox
+{
+	margin-left: .25em;
+	margin-right: 0;
+}
+.woocommerce #payment ul.payment_methods
+{
+	border-width: 1px 1px 0 1px;
+}
+.woocommerce #payment ul.payment_methods li input
+{
+	margin: 0 0 0 1em;
+}
+.woocommerce #payment ul.payment_methods li label img
+{
+	float: left;
+}
+.woocommerce #payment ul.payment_methods li.payment_method_paypal .about_paypal
+{
+	margin-right: .8em;
+	margin-left: 0;
+}
+.woocommerce #payment .form-row #place_order
+{
+	float: left;
+}
+ul#shipping_method
+{
+	margin-right: 0;
+	padding-right: 0;
+}
+
+@media screen and (min-width: 600px)
+{
+	.col2-set .form-row-first
+	{
+		float: right;
+		margin-left: 4%;
+		margin-right: 0;
+	}
+	.col2-set .form-row-last
+	{
+		float: left;
+		margin-left: 0;
+	}
+}
+
+/**
+ * WooCommerce widgets
+ */
+.widget.woocommerce ul
+{
+	margin-right: 0;
+}
+.widget.woocommerce ul.product_list_widget li img
+{
+	float: left;
+}
+.widget.woocommerce ul.product_list_widget li .remove
+{
+	float: right;
+}
+
+/**
+ * WooCommerce Cart
+ */
+.widget_shopping_cart .woocommerce-mini-cart__buttons .button.checkout
+{
+	margin-right: .55rem;
+	margin-left: 0;
+}
+
+/**
+ * WooCommerce Product Categories
+ */
+.widget_product_categories .children
+{
+	padding-right: 1.75em;
+	padding-left: 0;
+}
+
+/**
+ * WooCommerce Average Rating
+ */
+.widget_rating_filter ul li .star-rating
+{
+	float: right;
+	margin-left: .5em;
+	margin-right: 0;
+}
+
+/**
+ * WooCommerce Price Filter
+ */
+.widget_price_filter {
+	left: auto;
+	right: -1em;
+}
+.widget_price_filter .price_slider_amount
+{
+	text-align: left;
+}
+.widget_price_filter .price_slider_amount .button
+{
+	float: right;
+}
+.widget_price_filter .ui-slider
+{
+	text-align: right;
+}
+.widget_price_filter .ui-slider .ui-slider-handle
+{
+	margin-right: -1px;
+	margin-left: 0;
+}
+
+/**
+ * Header cart
+ */
+.site-header-cart
+{
+	text-align: left;
+}
+.site-header-cart .cart-contents .count
+{
+	margin-right: .25rem;
+	margin-left: 0;
+}
+.site-header-cart .cart-contents:before
+{
+	margin-left: .5rem;
+	margin-right: 0;
+}
+
+/**
+ * Pagination
+ */
+.woocommerce-pagination ul.page-numbers li
+{
+	float: right;
+	margin: 0 0 .25rem .25rem;
+}
+
+/**
+ * Sorting
+ */
+.woocommerce-result-count
+{
+	float: right;
+}
+
+.woocommerce-ordering
+{
+	float: left;
+}
+
+/**
+ * Infinite Scroll
+ */
+@media screen and (min-width: 55em) {
+	.woocommerce-page.infinite-scroll #infinite-handle span,
+	.woocommerce-page.infinite-scroll .infinite-loader {
+		margin-right: 50%;
+		margin-left: 0;
+	}
+}
+
+/**
+ * Onsale badge
+ */
+.onsale
+{
+	left: auto;
+	right: 0;
+}
+
+/**
+ * Star rating
+ */
+.star-rating:before
+{
+	right: 0;
+	float: right;
+	left: auto;
+}
+.star-rating span
+{
+	right: 0;
+	left: auto;
+	float: right;
+}
+.star-rating span:before
+{
+	right: 0;
+	left: auto;
+}
+p.stars a
+{
+	margin-left: 1px;
+	margin-right: 0;
+}
+p.stars a:before
+{
+	right: 0;
+	left: auto;
+}
+
+/**
+ * Tabs
+ */
+.woocommerce-tabs ul.tabs
+{
+	text-align: right;
+}
+
+/**
+ * Password strength meter
+ */
+.woocommerce-password-strength
+{
+	text-align: left;
+}
+
+/**
+ * Forms
+ */
+
+.checkout_coupon p {
+	float: right;
+}
+
+/**
+ * Notices
+ */
+.woocommerce-message,
+.woocommerce-info,
+.woocommerce-error,
+.woocommerce-noreviews,
+p.no-comments
+{
+	margin-right: 0;
+	padding: 1.75em 4em 1.75em 2em;
+}
+.woocommerce-message .button,
+.woocommerce-info .button,
+.woocommerce-error .button,
+.woocommerce-noreviews .button,
+p.no-comments .button
+{
+	float: left;
+	margin-right: 1em;
+	margin-left: 0;
+}
+.woocommerce-message:before,
+.woocommerce-info:before,
+.woocommerce-error:before,
+.woocommerce-noreviews:before,
+p.no-comments:before
+{
+	right: 1.8em;
+	left: auto;
+}
+.demo_store .woocommerce-store-notice__dismiss-link
+{
+	float: left;
+}
+
+/**
+ * Login form
+ */
+.woocommerce-form-login input[name='rememberme']
+{
+	margin-left: .25em;
+	margin-right: .65em;
+}
+
+@media screen and (min-width: 896px) {
+
+	/**
+	 * Header cart
+	 */
+	.site-header-cart
+	{
+		text-align: left;
+	}
+	.site-header-cart > li:first-child
+	{
+		margin: 0 1.75em 0 0;
+	}
+	.site-header-cart .cart-contents .count
+	{
+		margin-right: .25rem;
+		margin-left: 0;
+	}
+	.site-header-cart .widget_shopping_cart
+	{
+		left: 999em;
+		right: auto;
+		text-align: right;
+	}
+	.site-header-cart .widget_shopping_cart ul.product_list_widget li img
+	{
+		float: right;
+		margin: .35rem 0 0 1rem;
+	}
+	.site-header-cart .widget_shopping_cart ul.product_list_widget li .remove
+	{
+		float: left;
+		margin: .5rem .35rem 0 0;
+	}
+	.site-header-cart .widget_shopping_cart .woocommerce-mini-cart__buttons .button.checkout
+	{
+		margin-right: 0;
+	}
+	.site-header-cart:hover .widget_shopping_cart,
+	.site-header-cart.focus .widget_shopping_cart
+	{
+		left: 0;
+		right: auto;
+	}
+
+	/**
+	 * Pagination
+	 */
+	.woocommerce-pagination ul.page-numbers li
+	{
+		margin-left: .3125em;
+		margin-right: 0;
+	}
+	/**
+	 * Related products
+	 */
+	.related ul.products li.product,
+	.upsells ul.products li.product
+	{
+		margin-left: 5%;
+		margin-right: 0;
+	}
+	.related ul.products li.product:nth-of-type(3n),
+	.upsells ul.products li.product:nth-of-type(3n) {
+		margin-left: 0;
+	}
+}
+
+@media screen and ( min-width: 55em ) {
+	.woocommerce-page .content-area {
+		float: right;
+		margin: 0 0 0 -25%;
+	}
+	.woocommerce-page .site-main {
+		margin: 0 0 0 32%;
+	}
+	.woocommerce-page .site-content .widget-area {
+		float: left;
+	}
+}

libre-2/woocommerce.css

@@ -1,14 +1,10 @@
 /*
-Theme Name: Libre 2
-
-WooCommerce styles override
-*/
-/**
- * WooCommerce color variables
- */
-/**
- * Imports
+ * Theme Name: Libre 2
+ *
+ * WooCommerce styles override
+ *
  */
+
 /**
  * Fonts
  */
@@ -119,6 +115,17 @@ table.shop_table .discount th {
 	vertical-align: top;
 }
 
+.woocommerce .shop_table tbody .wc-item-meta {
+	font-size: .875em;
+	list-style: none;
+	margin: .875em 0 0 0;
+	padding-left: 0;
+}
+
+.woocommerce .shop_table tbody .wc-item-meta p {
+	margin: 0;
+}
+
 /**
  * Cart table
  */
@@ -209,6 +216,21 @@ table.cart .coupon input[type="text"],
 	font-size: 1rem;
 }
 
+dl.variation {
+	font-size: .875em;
+	margin: .875em 0 0 0;
+}
+
+dl.variation dd,
+dl.variation p {
+	margin: 0;
+}
+
+dl.variation dt,
+dl.variation dd {
+	display: inline-block;
+}
+
 /**
  * Attributes table
  */
@@ -482,9 +504,6 @@ ul.products li.product .added_to_cart
 /**
  * Single product
  */
-/**
- * Single Product
- */
 .single-product div.product
 {
 	position: relative;
@@ -1010,11 +1029,10 @@ ul.products li.product .added_to_cart
 }
 .woocommerce #payment ul.payment_methods li label img
 {
-	margin-left: .8em;
-	max-width: 200px;
-	height: auto;
-	position: relative;
-	top: 19px;
+	float: right;
+	border: 0;
+	padding: 0;
+	max-height: 1.618em;
 }
 .woocommerce #payment ul.payment_methods li.payment_method_paypal .about_paypal
 {

radcliffe-2/inc/jetpack.php

@@ -56,22 +56,24 @@ add_action( 'after_setup_theme', 'radcliffe_2_jetpack_setup' );
  * Custom render function for Infinite Scroll.
  */
 function radcliffe_2_infinite_scroll_render() {
-	if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( radcliffe_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
 		radcliffe_2_woocommerce_product_columns_wrapper();
 		woocommerce_product_loop_start();
 	}
+
 	while ( have_posts() ) {
 		the_post();
+
 		if ( is_search() ) :
 			get_template_part( 'template-parts/content', 'search' );
-		elseif ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) :
+		elseif ( class_exists( 'WooCommerce' ) && ( radcliffe_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) :
 			wc_get_template_part( 'content', 'product' );
 		else :
 			get_template_part( 'template-parts/content', get_post_format() );
 		endif;
 	}
 
-	if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( radcliffe_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
 		woocommerce_product_loop_end();
 		radcliffe_2_woocommerce_product_columns_wrapper_close();
 	}

radcliffe-2/inc/woocommerce.php

@@ -41,6 +41,7 @@ add_action( 'after_setup_theme', 'radcliffe_2_woocommerce_setup' );
  */
 function radcliffe_2_woocommerce_scripts() {
 	wp_enqueue_style( 'radcliffe-2-woocommerce-style', get_template_directory_uri() . '/woocommerce.css' );
+	wp_style_add_data( 'radcliffe-2-woocommerce-style', 'rtl', get_stylesheet_directory_uri() . '/woocommerce-rtl.css' );
 }
 
 add_action( 'wp_enqueue_scripts', 'radcliffe_2_woocommerce_scripts' );
@@ -317,6 +318,29 @@ remove_action( 'woocommerce_before_main_content', 'woocommerce_breadcrumb', 20 )
  */
 add_action( 'woocommerce_before_shop_loop', 'woocommerce_breadcrumb', 5 );
 
+/**
+ * Workaround to prevent is_shop() from failing due to WordPress core issue
+ *
+ * @link https://core.trac.wordpress.org/ticket/21790
+ * @param  array $args infinite scroll args.
+ * @return array       infinite scroll args.
+ */
+function radcliffe_2_woocommerce_is_shop_page() {
+	global $wp_query;
+
+	$front_page_id        = get_option( 'page_on_front' );
+	$current_page_id      = $wp_query->get( 'page_id' );
+	$is_static_front_page = 'page' === get_option( 'show_on_front' );
+
+	if ( $is_static_front_page && $front_page_id === $current_page_id  ) {
+		$is_shop_page = ( $current_page_id === wc_get_page_id( 'shop' ) ) ? true : false;
+	} else {
+		$is_shop_page = is_shop();
+	}
+
+	return $is_shop_page;
+}
+
 /**
  * Move the sale flash badge
  */

radcliffe-2/inc/wpcom-colors.php

@@ -166,23 +166,7 @@ add_color_rule( 'extra', '#ffffff', array(
 			.post-navigation a span,
 			.posts-navigation a,
 			.comment-header cite,
-			.comment-header span a,
-			input[type="color"],
-			input[type="date"],
-			input[type="datetime"],
-			input[type="datetime-local"],
-			input[type="email"],
-			input[type="month"],
-			input[type="number"],
-			input[type="password"],
-			input[type="range"],
-			input[type="search"],
-			input[type="tel"],
-			input[type="text"],
-			input[type="time"],
-			input[type="url"],
-			input[type="week"],
-			textarea', 'color', 'bg', 3 ),
+			.comment-header span a', 'color', 'bg', 3 ),
 
 	array( '.blog .entry-title a,
 			.blog .entry-title a:visited,
@@ -273,9 +257,6 @@ add_color_rule( 'extra', '#222222', array(
 			.contact-info-area a,
 			body,
 			button,
-			input,
-			select,
-			textarea,
 			th', 'color', 'bg' ),
 
 	array( '.button,
@@ -375,11 +356,11 @@ add_color_rule( 'extra', '#000000', array(
 			.blog:not(.style-pack-vintage) article:nth-of-type(even) .entry-header,
 			.search-results:not(.style-pack-vintage) article:nth-of-type(even) .entry-header', 'background-color', 0.4 ),
 
-	array( '.archive .entry-header:hover,
+	array( '.archive article .entry-header:hover,
 			.archive article:nth-of-type(even) .entry-header:hover,
-			.blog .entry-header:hover,
+			.blog article .entry-header:hover,
 			.blog  article:nth-of-type(even) .entry-header:hover,
-			.search-results .entry-header:hover,
+			.search-results article .entry-header:hover,
 			.search-results  article:nth-of-type(even) .entry-header:hover', 'background-color', 0.75 ),
 
 	array( '.comments-area,

radcliffe-2/rtl.css

@@ -220,342 +220,6 @@ ol.children ol.children {
 	float: right;
 }
 
-/*--------------------------------------------------------------
-# WooCommerce
---------------------------------------------------------------*/
-
-.woocommerce .site-main > .woocommerce-message {
-	text-align: right;
-}
-
-.woocommerce .site-main > .woocommerce-message .button {
-	float: left;
-}
-
-.woocommerce-sorting-wrap {
-	text-align: right;
-}
-
-table.shop_table_responsive tr td {
-	text-align: right;
-}
-
-table.shop_table_responsive tr td::before{
-	float: right;
-}
-
-table.shop_table_responsive tr td.product-remove a {
-	text-align: right;
-}
-
-table.shop_table_responsive.my_account_orders .order-actions{
-	text-align: left;
-}
-
-@media screen and (min-width: 768px) {
-
-	table.shop_table_responsive tr td {
-		text-align: left;
-	}
-
-	table.shop_table_responsive tr th,
-	table.shop_table_responsive tr td {
-		text-align: right;
-	}
-
-	table.shop_table_responsive tbody .coupon {
-		float: right;
-	}
-
-	table.shop_table_responsive tbody input[name="update_cart"] {
-		float: left;
-	}
-}
-
-ul.products li.product a.added_to_cart {
-	margin-left: 0px;
-	margin-right: 6px;
-}
-
-@media screen and (min-width: 768px) {
-
-	ul.products li.product {
-		float: right;
-		margin-left: 3.8%;
-		margin-right: 0;
-	}
-
-	ul.products li.product.last {
-		margin-left: 0;
-	}
-}
-
-.single-product div.product .onsale {
-	left: auto;
-	right: 4%;
-}
-
-.single-product div.product .woocommerce-product-gallery .woocommerce-product-gallery__trigger {
-	left: 0;
-	right: auto;
-}
-
-.single-product div.product .woocommerce-product-gallery.woocommerce-product-gallery--columns-2 .flex-control-thumbs li:nth-child(2n) {
-	margin-left: 0;
-}
-
-.single-product div.product .woocommerce-product-gallery.woocommerce-product-gallery--columns-3 .flex-control-thumbs li:nth-child(3n) {
-	margin-left: 0;
-}
-
-.single-product div.product .woocommerce-product-gallery.woocommerce-product-gallery--columns-4 .flex-control-thumbs li:nth-child(4n) {
-	margin-left: 0;
-}
-
-.single-product div.product .woocommerce-product-gallery.woocommerce-product-gallery--columns-5 .flex-control-thumbs li:nth-child(5n) {
-	margin-left: 0;
-}
-
-.single-product div.product .cart {
-	float: right;
-	margin: 0 0 3em 40px;
-}
-
-.single-product div.product .product_meta {
-	float: left;
-}
-
-@media screen and (min-width: 768px) {
-
-	.single-product div.product .onsale {
-		left: auto;
-		right: 25%;
-	}
-}
-
-.single-product div.product .commentlist .comment-text .meta {
-	margin-right: 5px;
-	margin-left: 0;
-}
-
-.single-product div.product .comment .avatar {
-	left: auto;
-	right: inherit;
-}
-
-.woocommerce-cart td.actions {
-	text-align: left;
-}
-
-.woocommerce-cart .cart_totals h2 {
-	text-align: right;
-}
-
-.woocommerce-cart .cart_totals .shop_table {
-	text-align: right;
-}
-
-.woocommerce-cart .wc-proceed-to-checkout {
-	text-align: right;
-}
-
-.woocommerce-checkout .shop_table {
-	text-align: right;
-}
-
-.woocommerce #payment [for="payment_method_paypal"]>img {
-	margin-right: 40px;
-	margin-left: 0;
-	float: left;
-}
-
-@media screen and (min-width: 768px) {
-
-	.woocommerce-address-fields__field-wrapper .form-row-first,
-	.col2-set .form-row-first {
-		float: right;
-		margin-left: 40px;
-		margin-right: 0;
-	}
-
-	.woocommerce-address-fields__field-wrapper .form-row-last,
-	.col2-set .form-row-last {
-		float: left;
-		margin-left: 0;
-	}
-}
-
-@media screen and (min-width: 48em) {
-
-	.woocommerce-account .woocommerce .col-1 {
-		float: right;
-	}
-
-	.woocommerce-account .woocommerce .col-2 {
-		float: left;
-	}
-}
-
-.woocommerce-MyAccount-navigation ul {
-	padding-right: 0;
-}
-
-.woocommerce-MyAccount-navigation a .icon {
-	margin-left: 0;
-	margin-right: 6px;
-}
-
-.woocommerce-MyAccount-navigation ul ul ul {
-	left: auto;
-	right: -999em;
-}
-
-.woocommerce-MyAccount-navigation ul li:hover>ul,
-.woocommerce-MyAccount-navigation ul li.focus>ul {
-	right: auto;
-}
-
-.woocommerce-MyAccount-navigation ul ul li:hover>ul,
-.woocommerce-MyAccount-navigation ul ul li.focus>ul {
-	left: auto;
-	right: 100%;
-}
-
-.woocommerce-MyAccount-content {
-	text-align: right;
-}
-
-.site-header-cart ul {
-	padding-right: 0;
-}
-
-.site-header-cart .cart-contents .icon {
-	margin-left: 6px;
-	margin-right: 0;
-}
-
-.site-header-cart ul ul ul {
-	left: auto;
-	right: -999em;
-}
-
-.site-header-cart ul li:hover>ul,
-.site-header-cart ul li.focus>ul {
-	right: auto;
-}
-
-.site-header-cart ul ul li:hover>ul,
-.site-header-cart ul ul li.focus>ul {
-	left: auto;
-	right: 100%;
-}
-
-@media screen and (min-width: 768px) {
-
-	.site-header-cart {
-		text-align: left;
-	}
-
-	.site-header-cart>li:last-of-type {}
-	.site-header-cart .widget_shopping_cart {
-		left: auto;
-		right: -999em;
-	}
-
-	.site-header-cart:hover .widget_shopping_cart,
-	.site-header-cart.focus .widget_shopping_cart {
-		left: 0;
-		right: auto;
-	}
-
-	.site-header-cart .widget_shopping_cart_content {
-		float: left;
-	}
-
-	.menu-1-empty .site-header-cart .widget_shopping_cart_content {
-		float: right;
-	}
-
-	.site-header-cart .widget_shopping_cart_content:after {
-		left: 60px;
-		right: auto;
-		margin-right: -10px;
-		margin-left: 0;
-	}
-
-
-	#site-header-cart .widget_shopping_cart_content .mini_cart_item {
-		margin-left: 6.5%;
-		margin-right: 0;
-	}
-
-	#site-header-cart .widget_shopping_cart_content .mini_cart_item:nth-child(4n),
-	#site-header-cart .widget_shopping_cart_content .mini_cart_item:last-child {
-		margin-left: 0;
-	}
-}
-
-.star-rating:before {
-	float: right;
-	left: auto;
-	right: 0;
-}
-
-.star-rating span {
-	float: right;
-	left: auto;
-	right: 0;
-}
-
-.star-rating span:before {
-	left: auto;
-	right: 0;
-}
-
-p.stars a {
-	margin-left: 1px;
-	margin-right: 0;
-}
-
-p.stars a:before {
-	left: auto;
-	right: 0;
-}
-
-.woocommerce-password-strength {
-	text-align: left;
-}
-
-.woocommerce-info .woocommerce-Button {
-	float: left;
-}
-
-.woocommerce.widget_shopping_cart .woocommerce-mini-cart__buttons a {
-	margin-left: 1em;
-	margin-right: 0;
-}
-
-.woocommerce.widget_rating_filter .star-rating {
-	float: right;
-}
-
-.widget_price_filter .price_slider_amount {
-	text-align: left;
-}
-
-.widget_price_filter .price_slider_amount .button {
-	float: right;
-}
-
-.widget_price_filter .ui-slider {
-	text-align: right;
-}
-
-.widget_price_filter .ui-slider .ui-slider-handle:last-child {
-	margin-left: 0;
-	margin-right: -1em;
-}
-
 /*--------------------------------------------------------------
 # Media Queries
 --------------------------------------------------------------*/

radcliffe-2/style.css

@@ -4,7 +4,7 @@ Theme URI: http://wordpress.com/themes/radcliffe-2
 Author: Anders Norén
 Author URI: http://www.andersnoren.se
 Description: A theme for bloggers who want their content to take center stage.
-Version: 2.0.3-wpcom
+Version: 2.0.4-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: radcliffe-2
@@ -908,7 +908,7 @@ textarea {
 	color: #666;
 	border: 1px solid #ccc;
 	border-radius: 3px;
-	padding: 3px 7px;
+	padding: 3px;
 	max-width: 100%;
 }
 
@@ -1487,9 +1487,9 @@ textarea {
 	background: rgba(0, 0, 0, 0.6);
 }
 
-.archive .entry-header:hover,
-.blog .entry-header:hover,
-.search-results .entry-header:hover {
+.archive article .entry-header:hover,
+.blog article .entry-header:hover,
+.search-results article .entry-header:hover {
 	background: rgba(0, 0, 0, 0.75);
 }
 
@@ -1779,7 +1779,6 @@ textarea {
 	font-size: 24px;
 	font-size: 2.4rem;
 	font-weight: 700;
-	letter-spacing: 1;
 	margin-bottom: 36px;
 	text-align: center;
 }
@@ -2171,8 +2170,8 @@ object {
 		position: relative;
 		width: 100%;
 		-webkit-transition: max-height 0.425s ease-in-out;
-		-moz-transition: max-height all 0.425s ease-in-out;
-		transition: max-height all 0.425s ease-in-out;
+		-moz-transition: max-height 0.425s ease-in-out;
+		transition: max-height 0.425s ease-in-out;
 	}
 
 	.main-navigation.toggled > div {
@@ -2692,6 +2691,6 @@ object {
 	.site-branding .custom-logo {
 		height: auto;
 		max-width: 90vw;
-		max-height: auto;
+		max-height: 1000%;
 	}
 }

radcliffe-2/woocommerce-rtl.css

@@ -0,0 +1,338 @@
+/*
+ * Theme Name: Radcliffe 2
+ *
+ * RTL additions
+ *
+ */
+
+.woocommerce .site-main > .woocommerce-message {
+	text-align: right;
+}
+
+.woocommerce .site-main > .woocommerce-message .button {
+	float: left;
+}
+
+.woocommerce-sorting-wrap {
+	text-align: right;
+}
+
+table.shop_table_responsive tr td {
+	text-align: left;
+}
+
+table.shop_table_responsive tr td::before{
+	float: right;
+}
+
+table.shop_table_responsive tr td.product-remove a {
+	text-align: right;
+}
+
+table.shop_table_responsive.my_account_orders .order-actions{
+	text-align: left;
+}
+
+@media screen and (min-width: 768px) {
+
+	table.shop_table_responsive tr td {
+		text-align: left;
+	}
+
+	table.shop_table_responsive tr th,
+	table.shop_table_responsive tr td {
+		text-align: right;
+	}
+
+	table.shop_table_responsive tbody .coupon {
+		float: right;
+	}
+
+	table.shop_table_responsive tbody input[name="update_cart"] {
+		float: left;
+	}
+}
+
+ul.products li.product a.added_to_cart {
+	margin-left: 0px;
+	margin-right: 6px;
+}
+
+@media screen and (min-width: 768px) {
+
+	ul.products li.product {
+		float: right;
+		margin-left: 3.8%;
+		margin-right: 0;
+	}
+
+	ul.products li.product.last {
+		margin-left: 0;
+	}
+}
+
+.single-product div.product .onsale {
+	left: auto;
+	right: 4%;
+}
+
+.single-product div.product .woocommerce-product-gallery .woocommerce-product-gallery__trigger {
+	left: 0;
+	right: auto;
+}
+
+.single-product div.product .woocommerce-product-gallery.woocommerce-product-gallery--columns-2 .flex-control-thumbs li:nth-child(2n) {
+	margin-left: 0;
+}
+
+.single-product div.product .woocommerce-product-gallery.woocommerce-product-gallery--columns-3 .flex-control-thumbs li:nth-child(3n) {
+	margin-left: 0;
+}
+
+.single-product div.product .woocommerce-product-gallery.woocommerce-product-gallery--columns-4 .flex-control-thumbs li:nth-child(4n) {
+	margin-left: 0;
+}
+
+.single-product div.product .woocommerce-product-gallery.woocommerce-product-gallery--columns-5 .flex-control-thumbs li:nth-child(5n) {
+	margin-left: 0;
+}
+
+.single-product div.product .cart {
+	float: right;
+	margin: 0 0 3em 40px;
+}
+
+.single-product div.product .product_meta {
+	float: left;
+}
+
+@media screen and (min-width: 768px) {
+
+	.single-product div.product .onsale {
+		left: auto;
+		right: 25%;
+	}
+}
+
+.single-product div.product .commentlist .comment-text .meta {
+	margin-right: 5px;
+	margin-left: 0;
+}
+
+.single-product div.product .comment .avatar {
+	left: auto;
+	right: inherit;
+}
+
+.woocommerce-cart td.actions {
+	text-align: left;
+}
+
+.woocommerce-cart .cart_totals h2 {
+	text-align: right;
+}
+
+.woocommerce-cart .cart_totals .shop_table {
+	text-align: right;
+}
+
+.woocommerce-cart .wc-proceed-to-checkout {
+	text-align: right;
+}
+
+.woocommerce-checkout .shop_table {
+	text-align: right;
+}
+
+.woocommerce #payment [for="payment_method_paypal"]>img {
+	margin-right: 40px;
+	margin-left: 0;
+	float: left;
+}
+
+@media screen and (min-width: 768px) {
+
+	.woocommerce-address-fields__field-wrapper .form-row-first,
+	.col2-set .form-row-first {
+		float: right;
+		margin-left: 40px;
+		margin-right: 0;
+	}
+
+	.woocommerce-address-fields__field-wrapper .form-row-last,
+	.col2-set .form-row-last {
+		float: left;
+		margin-left: 0;
+	}
+}
+
+@media screen and (min-width: 48em) {
+
+	.woocommerce-account .woocommerce .col-1 {
+		float: right;
+	}
+
+	.woocommerce-account .woocommerce .col-2 {
+		float: left;
+	}
+}
+
+.woocommerce-MyAccount-navigation ul {
+	padding-right: 0;
+}
+
+.woocommerce-MyAccount-navigation a .icon {
+	margin-left: 0;
+	margin-right: 6px;
+}
+
+.woocommerce-MyAccount-navigation ul ul ul {
+	left: auto;
+	right: -999em;
+}
+
+.woocommerce-MyAccount-navigation ul li:hover>ul,
+.woocommerce-MyAccount-navigation ul li.focus>ul {
+	right: auto;
+}
+
+.woocommerce-MyAccount-navigation ul ul li:hover>ul,
+.woocommerce-MyAccount-navigation ul ul li.focus>ul {
+	left: auto;
+	right: 100%;
+}
+
+.woocommerce-MyAccount-content {
+	text-align: right;
+}
+
+.site-header-cart ul {
+	padding-right: 0;
+}
+
+.site-header-cart .cart-contents .icon {
+	margin-left: 6px;
+	margin-right: 0;
+}
+
+.site-header-cart ul ul ul {
+	left: auto;
+	right: -999em;
+}
+
+.site-header-cart ul li:hover>ul,
+.site-header-cart ul li.focus>ul {
+	right: auto;
+}
+
+.site-header-cart ul ul li:hover>ul,
+.site-header-cart ul ul li.focus>ul {
+	left: auto;
+	right: 100%;
+}
+
+@media screen and (min-width: 768px) {
+
+	.site-header-cart {
+		text-align: left;
+	}
+
+	.site-header-cart>li:last-of-type {}
+	.site-header-cart .widget_shopping_cart {
+		left: auto;
+		right: -999em;
+	}
+
+	.site-header-cart:hover .widget_shopping_cart,
+	.site-header-cart.focus .widget_shopping_cart {
+		left: 0;
+		right: auto;
+	}
+
+	.site-header-cart .widget_shopping_cart_content {
+		float: left;
+	}
+
+	.menu-1-empty .site-header-cart .widget_shopping_cart_content {
+		float: right;
+	}
+
+	.site-header-cart .widget_shopping_cart_content:after {
+		left: 60px;
+		right: auto;
+		margin-right: -10px;
+		margin-left: 0;
+	}
+
+
+	#site-header-cart .widget_shopping_cart_content .mini_cart_item {
+		margin-left: 6.5%;
+		margin-right: 0;
+	}
+
+	#site-header-cart .widget_shopping_cart_content .mini_cart_item:nth-child(4n),
+	#site-header-cart .widget_shopping_cart_content .mini_cart_item:last-child {
+		margin-left: 0;
+	}
+}
+
+.star-rating:before {
+	float: right;
+	left: auto;
+	right: 0;
+}
+
+.star-rating span {
+	float: right;
+	left: auto;
+	right: 0;
+}
+
+.star-rating span:before {
+	left: auto;
+	right: 0;
+}
+
+p.stars a {
+	margin-left: 1px;
+	margin-right: 0;
+}
+
+p.stars a:before {
+	left: auto;
+	right: 0;
+}
+
+.woocommerce-password-strength {
+	text-align: left;
+}
+
+.woocommerce-info .woocommerce-Button {
+	float: left;
+}
+
+.woocommerce.widget_shopping_cart .woocommerce-mini-cart__buttons a {
+	margin-left: 1em;
+	margin-right: 0;
+}
+
+.woocommerce.widget_rating_filter .star-rating {
+	float: right;
+}
+
+.widget_price_filter .price_slider_amount {
+	text-align: left;
+}
+
+.widget_price_filter .price_slider_amount .button {
+	float: right;
+}
+
+.widget_price_filter .ui-slider {
+	text-align: right;
+}
+
+.widget_price_filter .ui-slider .ui-slider-handle:last-child {
+	margin-left: 0;
+	margin-right: -1em;
+}

radcliffe-2/woocommerce.css

@@ -32,10 +32,11 @@
 
 .woocommerce .site-main {
 	text-align: center;
+	margin-bottom: 3em;
 }
 
 .woocommerce .site-main .products {
-	margin: 3em auto;
+	margin: 0 auto;
 	max-width: 92%;
 }
 
@@ -73,7 +74,7 @@
 	display: flex;
 	flex-wrap: wrap;
 	justify-content: space-between;
-	margin: 0 auto;
+	margin: 0 auto 3em;
 	max-width: 92%;
 	text-align: left;
 	width: 1300px;
@@ -153,8 +154,8 @@ table.shop_table_responsive tr td.product-remove a {
 }
 
 table.shop_table_responsive tr td.product-remove {
-	background: #fff;
-	border-top: 1.618em solid #fff;
+	background: transparent;
+	border-top: 1.618em solid transparent;
 	padding: 0;
 	position: relative;
 }
@@ -217,8 +218,8 @@ table.shop_table_responsive tbody .coupon .button {
 	}
 
 	table.shop_table_responsive tr td.product-remove {
-		background: transparent;
-		border: 0;
+		border-top: 0;
+		border-bottom: 1px solid #eee;
 		display: table-cell;
 		text-align: center;
 	}
@@ -361,7 +362,7 @@ ul.products li.product .button {
 }
 
 .infinite-scroll .woocommerce-pagination {
-    display: none;
+	display: none;
 }
 
 @media screen and (min-width: 768px) {
@@ -805,6 +806,16 @@ ul.products li.product .button {
 	font-weight: 400;
 }
 
+dl.variation {
+	font-size: .875em;
+	margin: .875em 0 0 0;
+}
+
+dl.variation dd,
+dl.variation p {
+	margin: 0;
+}
+
 @media screen and (min-width: 768px) {
 
 	.woocommerce-cart td.actions {
@@ -921,6 +932,21 @@ ul.products li.product .button {
 	margin-bottom: 0;
 }
 
+.woocommerce .shop_table tbody ul {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+
+.woocommerce .shop_table tbody .wc-item-meta {
+	font-size: .875em;
+	margin: .875em 0 0 0;
+}
+
+.woocommerce .shop_table tbody .wc-item-meta p {
+	margin: 0;
+}
+
 @media screen and (min-width: 768px) {
 
 	.woocommerce-address-fields__field-wrapper .form-row-first,
@@ -1066,14 +1092,6 @@ ul.products li.product .button {
 	width: 200px;
 }
 
-.woocommerce-MyAccount-navigation ul ul li {}
-
-.woocommerce-MyAccount-navigation ul ul:hover>a,
-.woocommerce-MyAccount-navigation ul ul .focus>a {}
-
-.woocommerce-MyAccount-navigation ul ul a:hover,
-.woocommerce-MyAccount-navigation ul ul a.focus {}
-
 .woocommerce-MyAccount-navigation ul li:hover>ul,
 .woocommerce-MyAccount-navigation ul li.focus>ul {
 	left: auto;
@@ -1084,11 +1102,6 @@ ul.products li.product .button {
 	left: 100%;
 }
 
-.woocommerce-MyAccount-navigation .current_page_item>a,
-.woocommerce-MyAccount-navigation .current-menu-item>a,
-.woocommerce-MyAccount-navigation .current_page_ancestor>a,
-.woocommerce-MyAccount-navigation .current-menu-ancestor>a {}
-
 /* !My Account Content */
 
 .woocommerce-MyAccount-content {

scratchpad/inc/wpcom-colors.php

@@ -16,7 +16,27 @@ add_color_rule( 'bg', '#bdcbcc', array(
 		.post-navigation-container a:hover,
 		.page-header p,
 		.error404 .page-content > p,
-		.search-no-results .page-content > p', 'color', 'bg', 5 ),
+		.search-no-results .page-content > p,
+		body:not(.single) .format-audio.post-password-required,
+		body:not(.single) .format-audio .post-password-form label,
+		body:not(.single) .format-gallery.post-password-required,
+		body:not(.single) .format-gallery .post-password-form label,
+		body:not(.single) .format-image.post-password-required,
+		body:not(.single) .format-image .post-password-form label,
+		body:not(.single) .format-video.post-password-required,
+		body:not(.single) .format-video .post-password-form label,
+		body:not(.single) .format-audio .post-password-form input[type="submit"],
+		body:not(.single) .format-gallery .post-password-form input[type="submit"],
+		body:not(.single) .format-image .post-password-form input[type="submit"],
+		body:not(.single) .format-video .post-password-form input[type="submit"],
+		body:not(.single) .format-audio .post-password-form input[type="submit"]:hover,
+		body:not(.single) .format-audio .post-password-form input[type="submit"]:focus,
+		body:not(.single) .format-gallery .post-password-form input[type="submit"]:hover,
+		body:not(.single) .format-gallery .post-password-form input[type="submit"]:focus,
+		body:not(.single) .format-image .post-password-form input[type="submit"]:hover,
+		body:not(.single) .format-image .post-password-form input[type="submit"]:focus,
+		body:not(.single) .format-video .post-password-form input[type="submit"]:hover,
+		body:not(.single) .format-video .post-password-form input[type="submit"]:focus', 'color', 'bg', 5 ),
 
 	array( 'body:not(.single) .format-audio .entry-meta,
 		body:not(.single) .format-audio .entry-meta a,
@@ -37,6 +57,19 @@ add_color_rule( 'bg', '#bdcbcc', array(
 		.posts-navigation .nav-previous a,
 		.posts-navigation .nav-next a', 'color', 'bg', 3 ),
 
+	array( 'body:not(.single) .format-audio .post-password-form input[type="submit"],
+		body:not(.single) .format-gallery .post-password-form input[type="submit"],
+		body:not(.single) .format-image .post-password-form input[type="submit"],
+		body:not(.single) .format-video .post-password-form input[type="submit"],
+		body:not(.single) .format-audio .post-password-form input[type="submit"]:hover,
+		body:not(.single) .format-audio .post-password-form input[type="submit"]:focus,
+		body:not(.single) .format-gallery .post-password-form input[type="submit"]:hover,
+		body:not(.single) .format-gallery .post-password-form input[type="submit"]:focus,
+		body:not(.single) .format-image .post-password-form input[type="submit"]:hover,
+		body:not(.single) .format-image .post-password-form input[type="submit"]:focus,
+		body:not(.single) .format-video .post-password-form input[type="submit"]:hover,
+		body:not(.single) .format-video .post-password-form input[type="submit"]:focus', 'border-color', 'bg', 5 ),
+
 	array( '.single #primary .author-info', 'background-color', 0.1 ),
 
 	// Background colour - contrast against background
@@ -95,7 +128,15 @@ add_color_rule( 'bg', '#bdcbcc', array(
 		body:not(.single) .format-aside,
 		body:not(.single) .format-aside a', 'color' ),
 
-	array( 'body:not(.single) .format-aside .entry-content', 'color', 0.8 ),
+	array( 'body:not(.single) .format-aside .entry-content,
+		body:not(.single) .format-aside input[type="submit"],
+		body:not(.single) .format-aside input[type="submit"]:hover,
+		body:not(.single) .format-aside input[type="submit"]:focus,
+		body:not(.single) .format-aside .post-password-form label', 'color', 0.8 ),
+
+	array( 'body:not(.single) .format-aside input[type="submit"],
+		body:not(.single) .format-aside input[type="submit"]:hover,
+		body:not(.single) .format-aside input[type="submit"]:focus', 'border-color', 0.8 ),
 
 	array( 'body:not(.single) .format-aside .entry-meta,
 		body:not(.single) .format-aside .entry-meta .entry-meta,

scratchpad/style.css

@@ -1544,6 +1544,31 @@ body:not(.single) .format-aside .entry-meta a {
 	color: rgba(255, 255, 255, 0.4);
 }
 
+body:not(.single) .format-aside button,
+body:not(.single) .format-aside input[type="button"],
+body:not(.single) .format-aside input[type="reset"],
+body:not(.single) .format-aside input[type="submit"] {
+	border-color: rgba(255, 255, 255, 0.5);
+	color: rgba(255, 255, 255, 0.8);
+}
+
+body:not(.single) .format-aside button:hover,
+body:not(.single) .format-aside input[type="button"]:hover,
+body:not(.single) .format-aside input[type="reset"]:hover,
+body:not(.single) .format-aside input[type="submit"]:hover,
+body:not(.single) .format-aside button:focus,
+body:not(.single) .format-aside input[type="button"]:focus,
+body:not(.single) .format-aside input[type="reset"]:focus,
+body:not(.single) .format-aside input[type="submit"]:focus {
+	border-color: rgba(255, 255, 255, 0.8);
+	color: #fff;
+}
+
+body:not(.single) .format-aside .post-password-form label {
+	color: rgba(255,255,255,0.8);
+}
+
+
 /*--------------------------------------------------------------
 10.4 Audio
 --------------------------------------------------------------*/
@@ -3088,6 +3113,37 @@ iframe[src*='bandcamp'] {
 	top: -3px;
 }
 
+body:not(.single) .format-audio.post-password-required,
+body:not(.single) .format-audio .post-password-form label,
+body:not(.single) .format-gallery.post-password-required,
+body:not(.single) .format-gallery .post-password-form label,
+body:not(.single) .format-image.post-password-required,
+body:not(.single) .format-image .post-password-form label,
+body:not(.single) .format-video.post-password-required,
+body:not(.single) .format-video .post-password-form label {
+	color: #537375;
+}
+
+ body:not(.single) .format-audio .post-password-form input[type="submit"],
+ body:not(.single) .format-gallery .post-password-form input[type="submit"],
+ body:not(.single) .format-image .post-password-form input[type="submit"],
+ body:not(.single) .format-video .post-password-form input[type="submit"] {
+	border-color: #537375;
+	color: #537375;
+}
+
+body:not(.single) .format-audio .post-password-form input[type="submit"]:hover,
+body:not(.single) .format-audio .post-password-form input[type="submit"]:focus,
+body:not(.single) .format-gallery .post-password-form input[type="submit"]:hover,
+body:not(.single) .format-gallery .post-password-form input[type="submit"]:focus,
+body:not(.single) .format-image .post-password-form input[type="submit"]:hover,
+body:not(.single) .format-image .post-password-form input[type="submit"]:focus,
+body:not(.single) .format-video .post-password-form input[type="submit"]:hover,
+body:not(.single) .format-video .post-password-form input[type="submit"]:focus {
+	border-color: #3e5f61;
+	color: #3e5f61;
+}
+
 /*--------------------------------------------------------------
 15.0 Infinite scroll
 --------------------------------------------------------------*/

scratchpad/template-parts/content-audio.php

@@ -52,4 +52,8 @@ $content = apply_filters( 'the_content', get_the_content() );
 			?>
 		</div><!-- .entry-meta -->
 	</header><!-- .entry-header -->
+
+	<?php if ( post_password_required() ) {
+		the_content();
+	} ?>
 </article><!-- #post-## -->

scratchpad/template-parts/content-gallery.php

@@ -14,7 +14,7 @@
 	<?php scratchpad_sticky(); ?>
 
 	<?php
-		if ( get_post_gallery() ) { ?>
+		if ( get_post_gallery() && ! post_password_required() ) { ?>
 			<div class="entry-gallery">
 				<?php echo get_post_gallery(); ?>
 				<div class="photo-corners">
@@ -53,4 +53,9 @@
 			);
 		?>
 	</footer><!-- .entry-footer -->
+
+	<?php
+	if ( post_password_required() ) {
+		the_content();
+	} ?>
 </article><!-- #post-## -->

scratchpad/template-parts/content-image.php

@@ -20,7 +20,7 @@ $image = get_media_embedded_in_content( $content, array( 'image' ) );
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<?php scratchpad_sticky(); ?>
 
-	<?php if ( has_post_thumbnail() ) { ?>
+	<?php if ( has_post_thumbnail() && ! post_password_required() ) { ?>
 		<div class="featured-image">
 			<a href="<?php the_permalink(); ?>"><?php the_post_thumbnail( 'scratchpad-featured' ); ?></a>
 			<div class="photo-corners">
@@ -33,7 +33,7 @@ $image = get_media_embedded_in_content( $content, array( 'image' ) );
 			</div><!-- .photo-corners -->
 		</div><!-- .featured-image -->
 
-	<?php } else if ( ! empty( $image ) ) { ?>
+	<?php } else if ( ! empty( $image ) && ! post_password_required() ) { ?>
 		<div class="featured-image">
 			<a href="<?php the_permalink(); ?>"><?php echo $image[0]; ?></a>
 			<div class="photo-corners">
@@ -67,4 +67,8 @@ $image = get_media_embedded_in_content( $content, array( 'image' ) );
 			?>
 		</div><!-- .entry-meta -->
 	</header><!-- .entry-header -->
+
+	<?php if ( post_password_required() ) {
+		the_content();
+	} ?>
 </article><!-- #post-## -->

scratchpad/template-parts/content-single.php

@@ -10,7 +10,7 @@
 ?>
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-	<?php if ( has_post_thumbnail() ) { ?>
+	<?php if ( has_post_thumbnail() && ! post_password_required() ) { ?>
 		<div class="featured-image">
 			<span>
 				<?php get_template_part( 'images/inline', 'paperclip.svg' ); ?>

scratchpad/template-parts/content-video.php

@@ -64,4 +64,8 @@ $content = apply_filters( 'the_content', get_the_content( $content_text ) );
 		<?php
 		endif; ?>
 	</header><!-- .entry-header -->
+
+	<?php if ( post_password_required() ) {
+		the_content();
+	} ?>
 </article><!-- #post-## -->

sketch/rtl.css

@@ -193,6 +193,15 @@ body[class*="jetpack-portfolio"].archive .entry-thumbnail .edit-link a {
 	margin-left: auto;
 }
 
+/* Custom Menu, Pages & Categories */
+
+.widget_nav_menu ul ul,
+.widget_categories ul ul,
+.widget_pages ul ul {
+  margin-left: 0;
+  margin-right: 2.0em;
+}
+
 /* Tags */
 
 .wp_widget_tag_cloud a,

sketch/style.css

@@ -1827,6 +1827,30 @@ object {
   color: #f68060;
 }
 
+/* Custom Menu, Pages & Categories */
+
+.widget_nav_menu ul ul,
+.widget_categories ul ul,
+.widget_pages ul ul {
+  margin-top: 6px;
+  margin-left: 2.0em;
+}
+
+.widget_nav_menu ul ul li:first-child,
+.widget_categories ul ul li:first-child,
+.widget_pages ul ul li:first-child {
+  margin-top: 0;
+}
+
+.widget_nav_menu li.menu-item-has-children,
+.widget_pages li.page_item_has_children  {
+  padding-bottom: 0;
+}
+
+.widget_categories ul.children {
+  margin-bottom: -7px;
+}
+
 /* =Jetpack */
 /* Globally hidden elements when Infinite Scroll is supported and in use. */
 .infinite-scroll .paging-navigation,