Revert "Merge branch 'master' of https://github.com/Automattic/themes"

This reverts commit b882c2456019ce631e2bd0498b54a7a3fe1eb351, reversing
changes made to 1ec346a4e74f43c7c5634136a6344aaf8056e9d7.

altofocus/assets/js/navigation.js

@@ -65,7 +65,7 @@
 			// jscs:enable
 
 			// Update screen reader text
-			screenReaderSpan.text( screenReaderSpan.text() === altoFocusScreenReaderText.expand ? altoFocusScreenReaderText.collapse : altoFocusScreenReaderText.expand );
+			screenReaderSpan.text( altoFocusScreenReaderText.text() === altoFocusScreenReaderText.expand ? altoFocusScreenReaderText.collapse : altoFocusScreenReaderText.expand );
 
 		} );
 

altofocus/style.css

@@ -1763,7 +1763,6 @@ table th, table td {
     padding: 0;
     position: relative;
     text-align: left;
-    width: 100%;
     z-index: 1;
   }
   .top-navigation div > ul > li {

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() && ! is_paged() ) {
+	if ( is_sticky() && ! is_single() && ! is_archive() ) {
 		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,10 +1436,6 @@ 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;

button-2/inc/jetpack.php

@@ -67,7 +67,7 @@ add_filter( 'infinite_scroll_has_footer_widgets', 'button_2_has_footer_widgets'
  * @since button 1.0
  */
 function button_2_infinite_scroll_render() {
-	if ( class_exists( 'WooCommerce' ) && ( button_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
 		button_2_woocommerce_product_columns_wrapper();
 		woocommerce_product_loop_start();
 	}
@@ -75,16 +75,14 @@ function button_2_infinite_scroll_render() {
 	while ( have_posts() ) {
 		the_post();
 
-		if ( is_search() ) :
-			get_template_part( 'components/content', 'search' );
-		elseif ( class_exists( 'WooCommerce' ) && ( button_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) :
+		if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) :
 			wc_get_template_part( 'content', 'product' );
 		else :
 			get_template_part( 'components/content', get_post_format() );
 		endif;
 	}
 
-	if ( class_exists( 'WooCommerce' ) && ( button_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
 		woocommerce_product_loop_end();
 		button_2_woocommerce_product_columns_wrapper_close();
 	}

button-2/inc/woocommerce.php

@@ -16,18 +16,10 @@
  * @return void
  */
 function button_2_woocommerce_setup() {
-	add_theme_support( 'woocommerce', apply_filters( 'button_2_woocommerce_args', array(
-		'single_image_width'    => 366,
-		'thumbnail_image_width' => 390,
-		'product_grid'          => array(
-			'default_columns' => 3,
-			'default_rows'    => 4,
-			'min_columns'     => 1,
-			'max_columns'     => 6,
-			'min_rows'        => 2
-		)
-	) ) );
-
+	add_theme_support( 'woocommerce', array(
+		'thumbnail_image_width' => 584,
+		'single_image_width'    => 584,
+	) );
 	add_theme_support( 'wc-product-gallery-zoom' );
 	add_theme_support( 'wc-product-gallery-lightbox' );
 	add_theme_support( 'wc-product-gallery-slider' );
@@ -91,11 +83,9 @@ add_filter( 'body_class', 'button_2_woocommerce_active_body_class' );
  * @return integer number of products.
  */
 function button_2_woocommerce_products_per_page() {
-	return absint( apply_filters( 'button_2_woocommerce_products_per_page', 12 ) );
-}
-if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
-	add_filter( 'loop_shop_per_page', 'button_2_woocommerce_products_per_page' );
+	return 12;
 }
+add_filter( 'loop_shop_per_page', 'button_2_woocommerce_products_per_page' );
 
 /**
  * Product gallery thumnbail columns.
@@ -103,7 +93,7 @@ if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
  * @return integer number of columns.
  */
 function button_2_woocommerce_thumbnail_columns() {
-	return absint( apply_filters( 'button_2_woocommerce_product_thumbnail_columns', 4 ) );
+	return 4;
 }
 add_filter( 'woocommerce_product_thumbnails_columns', 'button_2_woocommerce_thumbnail_columns' );
 
@@ -113,13 +103,9 @@ add_filter( 'woocommerce_product_thumbnails_columns', 'button_2_woocommerce_thum
  * @return integer products per row.
  */
 function button_2_woocommerce_loop_columns() {
-	return absint( apply_filters( 'button_2_woocommerce_loop_columns', 3 ) );
-}
-
-// Legacy WooCommerce columns filter.
-if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
-	add_filter( 'loop_shop_columns', 'button_2_woocommerce_loop_columns' );
+	return 3;
 }
+add_filter( 'loop_shop_columns', 'button_2_woocommerce_loop_columns' );
 
 /**
  * Related Products Args.
@@ -128,10 +114,12 @@ if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
  * @return array $args related products args.
  */
 function button_2_woocommerce_related_products_args( $args ) {
-	$args = apply_filters( 'button_2_woocommerce_related_products_args', array(
+	$defaults = array(
 		'posts_per_page' => 3,
 		'columns'        => 3,
-	) );
+	);
+
+	$args = wp_parse_args( $defaults, $args );
 
 	return $args;
 }
@@ -144,27 +132,12 @@ if ( ! function_exists( 'button_2_woocommerce_product_columns_wrapper' ) ) {
 	 * @return  void
 	 */
 	function button_2_woocommerce_product_columns_wrapper() {
-		$columns = button_2_loop_columns();
+		$columns = button_2_woocommerce_loop_columns();
 		echo '<div class="columns columns-' . absint( $columns ) . '">';
 	}
 }
 add_action( 'woocommerce_before_shop_loop', 'button_2_woocommerce_product_columns_wrapper', 40 );
 
-if ( ! function_exists( 'button_2_loop_columns' ) ) {
-	/**
-	 * Default loop columns on product archives
-	 *
-	 * @return integer products per row
-	 */
-	function button_2_loop_columns() {
-		$columns = 3; // 3 products per row
-		if ( function_exists( 'wc_get_default_products_per_row' ) ) {
-			$columns = wc_get_default_products_per_row();
-		}
-		return apply_filters( 'button_2_loop_columns', $columns );
-	}
-}
-
 if ( ! function_exists( 'button_2_woocommerce_product_columns_wrapper_close' ) ) {
 	/**
 	 * Product columns wrapper close.
@@ -307,3 +280,35 @@ function button_2_woocommerce_is_shop_page() {
 
 	return $is_shop_page;
 }
+
+/**
+ * Jetpack infinite scroll duplicates posts where orderby is anything other than modified or date
+ * This filter offsets the products returned by however many are displayed per page
+ *
+ * @link https://github.com/Automattic/jetpack/issues/1135
+ * @param  array $args infinite scroll args.
+ * @return array       infinite scroll args.
+ */
+function button_2_woocommerce_jetpack_duplicate_products( $args ) {
+	if ( ( isset( $args['post_type'] ) && 'product' === $args['post_type'] ) || ( isset( $args['taxonomy'] ) && 'product_cat' === $args['taxonomy'] ) ) {
+		$args['offset'] = $args['posts_per_page'] * $args['paged'];
+	}
+
+ 	return $args;
+}
+add_filter( 'infinite_scroll_query_args', 'button_2_woocommerce_jetpack_duplicate_products', 100 );
+
+/**
+ * Override number of products per page in Jetpack infinite scroll.
+ *
+ * @param  array $args infinite scroll args.
+ * @return array       infinite scroll args.
+ */
+function button_2_woocommerce_jetpack_products_per_page( $args ) {
+	if ( is_array( $args ) && ( button_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+		 $args['posts_per_page'] = button_2_woocommerce_products_per_page();
+	}
+
+	return $args;
+}
+add_filter( 'infinite_scroll_settings', 'button_2_woocommerce_jetpack_products_per_page' );

button-2/style.css

@@ -4,7 +4,7 @@ Theme URI: http://wordpress.com/themes/button-2/
 Author: Automattic
 Author URI: http://automattic.com
 Description: A stylish, lighthearted theme for crafters, hobbyists, and creatives.
-Version: 2.1.3-wpcom
+Version: 2.1.2-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: button

button-2/woocommerce-rtl.css

@@ -390,14 +390,9 @@ table.cart .product-remove a {
         float: left;
         margin-right: -10px; } }
 
-dl.variation {
-  font-size: .875em;
-  margin: .875em 0 0 0; }
-
-dl.variation dd,
-dl.variation p {
-  margin: 0; }
-
+/**
+ * Checkout
+ */
 /**
  * Checkout
  */

button-2/woocommerce.css

@@ -357,14 +357,6 @@ table.cart .product-remove a {
     text-align: right;
     vertical-align: top; }
 
-dl.variation {
-  font-size: .875em;
-  margin: .875em 0 0 0; }
-
-dl.variation dd,
-dl.variation p {
-  margin: 0; }
-
 @media screen and (min-width: 48em) {
   table.cart tr {
     display: table-row;

canard/inc/jetpack.php

@@ -109,25 +109,3 @@ function canard_jetpack_featured_image_display() {
 		}
 	}
 }
-
-/**
- * Remove Post Format classes from Portfolio items.
- */
-function canard_jetpack_portfolio_classes( $classes ) {
-	$post_format = get_post_format();
-
-	if ( $post_format && ! is_wp_error( $post_format ) ) {
-		$class = 'format-' . sanitize_html_class( $post_format );
-	} else {
-		$class = 'format-standard';
-	}
-
-	$class_key = array_search( $class, $classes );
-
-	if ( false !== $class_key && 'jetpack-portfolio' === get_post_type() ) {
-		unset( $classes[ $class_key ] );
-	}
-
-	return $classes;
-}
-add_filter( 'post_class', 'canard_jetpack_portfolio_classes' );

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' ) && ( dara_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( is_shop() || 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' ) && ( dara_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) :
+		elseif ( class_exists( 'WooCommerce' ) && ( is_shop() || 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' ) && ( dara_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( is_shop() || 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,10 +47,6 @@
 .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,6 +16,7 @@
  * @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,
@@ -96,6 +97,8 @@ 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' );
 }
@@ -106,7 +109,7 @@ if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
  * @return integer number of columns.
  */
 function dara_woocommerce_thumbnail_columns() {
-	return absint( apply_filters( 'dara_woocommerce_product_thumbnail_columns', 4 ) );
+	return 4;
 }
 add_filter( 'woocommerce_product_thumbnails_columns', 'dara_woocommerce_thumbnail_columns' );
 
@@ -116,7 +119,7 @@ add_filter( 'woocommerce_product_thumbnails_columns', 'dara_woocommerce_thumbnai
  * @return integer products per row.
  */
 function dara_woocommerce_loop_columns() {
-	return absint( apply_filters( 'dara_woocommerce_loop_columns', 4 ) );
+	return 4;
 }
 
 // Legacy WooCommerce columns filter.
@@ -163,9 +166,11 @@ 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 );
 	}
 }
@@ -327,4 +332,36 @@ function dara_woocommerce_is_shop_page() {
 	}
 
 	return $is_shop_page;
-}
+}
+
+/**
+ * Jetpack infinite scroll duplicates posts where orderby is anything other than modified or date
+ * This filter offsets the products returned by however many are displayed per page
+ *
+ * @link https://github.com/Automattic/jetpack/issues/1135
+ * @param  array $args infinite scroll args.
+ * @return array       infinite scroll args.
+ */
+function dara_woocommerce_jetpack_duplicate_products( $args ) {
+	if ( ( isset( $args['post_type'] ) && 'product' === $args['post_type'] ) || ( isset( $args['taxonomy'] ) && 'product_cat' === $args['taxonomy'] ) ) {
+		$args['offset'] = $args['posts_per_page'] * $args['paged'];
+	}
+
+ 	return $args;
+}
+add_filter( 'infinite_scroll_query_args', 'dara_woocommerce_jetpack_duplicate_products', 100 );
+
+/**
+ * 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.4-wpcom
+Version: 1.2.3-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: dara
@@ -129,13 +129,6 @@ a:focus {
 a img {
 	border: 0;
 }
-.entry-content a {
-	text-decoration: underline;
-}
-.entry-content a:hover,
-.entry-content a:focus {
-	text-decoration: none;
-}
 
 
 html {

dara/woocommerce-rtl.css

@@ -614,8 +614,6 @@ ul.products li.product .woocommerce-loop-category__title {
 }
 
 ul.products li.product a {
-  display: block;
-  max-width: 300px;
   text-decoration: none;
 }
 
@@ -636,7 +634,6 @@ ul.products li.product .star-rating {
 }
 
 ul.products li.product .button {
-  display: inline-block;
   margin-top: 1em;
   max-width: 100%;
   white-space: normal;
@@ -1309,7 +1306,6 @@ 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;
 }
 
@@ -1407,7 +1403,6 @@ 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;
 }
@@ -1422,8 +1417,7 @@ ul.product_list_widget li dl dt {
 
 ul.cart_list li dl dd,
 ul.product_list_widget li dl dd {
-  padding: 0;
-  margin: 0;
+  padding: 0 0 0.25em;
 }
 
 ul.cart_list li dl dd p:last-child,
@@ -2782,8 +2776,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";
@@ -3180,6 +3174,7 @@ form .form-row-last {
 
 form .form-row-first {
   float: right;
+		float: right;
 }
 
 form .form-row-last {
@@ -3238,7 +3233,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 {
@@ -3330,16 +3325,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;
@@ -3351,8 +3346,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,
@@ -3361,8 +3356,8 @@ form .form-row-wide {
     width: 100%;
   }
   /**
-   * Cart
-   */
+	 * Cart
+	 */
   table.cart .product-thumbnail,
   #content table.cart .product-thumbnail {
     display: none;
@@ -3414,16 +3409,9 @@ 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;
@@ -3439,8 +3427,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,9 +614,7 @@ 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 {
@@ -636,7 +634,6 @@ ul.products li.product .star-rating {
 }
 
 ul.products li.product .button {
-  display: inline-block;
   margin-top: 1em;
   max-width: 100%;
   white-space: normal;
@@ -1309,7 +1306,6 @@ 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;
 }
 
@@ -1407,7 +1403,6 @@ 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;
 }
@@ -1422,8 +1417,7 @@ ul.product_list_widget li dl dt {
 
 ul.cart_list li dl dd,
 ul.product_list_widget li dl dd {
-  padding: 0;
-  margin: 0;
+  padding: 0 0 0.25em;
 }
 
 ul.cart_list li dl dd p:last-child,
@@ -2783,8 +2777,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";
@@ -3181,10 +3175,9 @@ form .form-row-last {
 
 form .form-row-first {
   float: left;
-/*
-  rtl:raw:
-  float: right;
-*/
+  /*rtl:raw:
+		float: right;
+		*/
 }
 
 form .form-row-last {
@@ -3243,7 +3236,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 {
@@ -3335,16 +3328,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;
@@ -3356,8 +3349,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,
@@ -3366,8 +3359,8 @@ form .form-row-wide {
     width: 100%;
   }
   /**
-   * Cart
-   */
+	 * Cart
+	 */
   table.cart .product-thumbnail,
   #content table.cart .product-thumbnail {
     display: none;
@@ -3419,16 +3412,9 @@ 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;
@@ -3444,8 +3430,8 @@ form .form-row-wide {
     margin-bottom: 1em;
   }
   /**
-   * Account
-   */
+	 * Account
+	 */
   .lost_reset_password .form-row-first,
   .lost_reset_password .form-row-last {
     width: 100%;

design-toolkit/README.md

@@ -1,3 +0,0 @@
-# Design ToolKit
-
-This repository hosts a set of files and resources to help you design and develop WordPress themes.

dyad-2/inc/jetpack.php

@@ -28,6 +28,7 @@ if ( ! function_exists( 'dyad_2_jetpack' ) ) {
 			'footer_widgets' => array( 'sidebar-1'),
 			'render' => 'dyad_2_infinite_scroll_render',
 			'wrapper' => false,
+			'posts_per_page' => 12,
 		) );
 
 		//Content options
@@ -57,19 +58,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' ) && ( dyad_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( is_shop() || 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' ) && ( dyad_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) :
+		if ( class_exists( 'WooCommerce' ) && ( is_shop() || 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' ) && ( dyad_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( is_shop() || 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,6 +356,36 @@ function dyad_2_woocommerce_is_shop_page() {
 	return $is_shop_page;
 }
 
+/**
+ * Jetpack infinite scroll duplicates posts where orderby is anything other than modified or date
+ * This filter offsets the products returned by however many are displayed per page
+ *
+ * @link https://github.com/Automattic/jetpack/issues/1135
+ * @param  array $args infinite scroll args.
+ * @return array       infinite scroll args.
+ */
+function dyad_2_woocommerce_jetpack_duplicate_products( $args ) {
+	if ( ( isset( $args['post_type'] ) && 'product' === $args['post_type'] ) || ( isset( $args['taxonomy'] ) && 'product_cat' === $args['taxonomy'] ) ) {
+		$args['offset'] = $args['posts_per_page'] * $args['paged'];
+	}
+ 	return $args;
+}
+add_filter( 'infinite_scroll_query_args', 'dyad_2_woocommerce_jetpack_duplicate_products', 100 );
+
+/**
+ * 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.6-wpcom
+Version: 2.0.5-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,6 +584,7 @@ td, th {
 th {
 	font-size: 85%;
 	letter-spacing: 0.1em;
+	padding: ;
 	text-transform: uppercase;
 }
 
@@ -2003,7 +2004,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: "";
 }
@@ -2099,7 +2100,7 @@ body:not(.has-post-thumbnail).is-singular .entry-inner,
 	padding-top: 3rem;
 }
 
-.is-singular:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header {
+.is-singular:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header {
 	font-style: italic;
 }
 
@@ -2110,7 +2111,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-page) .entry-header {
+.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header {
 	background: rgba(0,0,0,0.4);
 	border-top: 1px solid rgba(255,255,255,0.2);
 	bottom: 0;
@@ -2122,34 +2123,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-page) .entry-header {
+.page.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header {
 	padding-bottom: 8rem;
 	padding-top: 4rem;
 }
 
 
-.is-singular:not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header h1 {
+.is-singular:not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header h1 {
 	font-style: normal;
 	margin-top: 1rem;
 }
 
-.is-singular:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header a {
+.is-singular:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-active) .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-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 {
+.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 {
 	color: #fff;
 }
 
-.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-meta {
+.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .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-page) .entry-meta {
+.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-meta {
 	position: relative;
 	width: 100%;
 }
@@ -2182,11 +2183,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-page) .entry-posted .posted-info {
+.is-singular.has-post-thumbnail:not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-posted .posted-info {
 	float: left;
 }
 
-.is-singular.has-post-thumbnail:not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-posted .edit-link {
+.is-singular.has-post-thumbnail:not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-posted .edit-link {
 	float: right;
 }
 
@@ -2209,7 +2210,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-page) .entry-content {
+.is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-content {
 	padding-top: 4em;
 }
 
@@ -2276,7 +2277,7 @@ body:not(.has-post-thumbnail).is-singular .entry-inner,
 	width: 12px;
 }
 
-.is-singular:not(.page-template-eventbrite-index):not(.woocommerce-page) .post-navigation .nav-links:before {
+.is-singular:not(.page-template-eventbrite-index):not(.woocommerce-active) .post-navigation .nav-links:before {
 	border-top: 1px solid #e0e0e0;
 	left: 37.5%;
 	right: 37.5%;
@@ -2958,7 +2959,7 @@ object {
 	position: relative;
 }
 
-.is-singular.has-post-thumbnail:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-page) .widget-area {
+.is-singular.has-post-thumbnail:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-active) .widget-area {
 	max-width: calc(72% + 4em);
 }
 
@@ -2970,13 +2971,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-page) .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 {
 	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-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 {
+.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 {
 	width: 49.5%;
 }
 
@@ -3625,11 +3626,11 @@ object {
 		padding-top: 10px;
 	}
 
-	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header {
+	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header {
 		padding: 0 4rem 3rem;
 	}
 
-	.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-active) .widget-area .widget {
 		width: 100%;
 	}
 }
@@ -3796,7 +3797,7 @@ object {
 	 /* site inner */
 
 
-	.is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .site-inner {
+	.is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .site-inner {
 		width: 65%;
 	}
 
@@ -3814,14 +3815,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-page) .entry-header,
+	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce) .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-page) .entry-header {
+	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header {
 		background: transparent;
 		color: #6a6c6e;
 		position: relative;
@@ -3838,12 +3839,12 @@ object {
 		font-size: 3rem;
 	}
 
-	.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-active) .entry-header h1 {
 		color: #1a1c1e;
 	}
 
-	.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 {
+	.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 {
 		color: #6a6c6e;
 	}
 
@@ -3858,12 +3859,12 @@ object {
 		font-size: 1.5rem;
 	}
 
-	.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 {
+	.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 {
 		float: none;
 	}
 
-	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-meta {
+	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-meta {
 		top: auto;
 	}
 
@@ -3875,13 +3876,13 @@ object {
 	/* entry content */
 
 	.is-singular .entry-content,
-	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-content  {
+	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-content  {
 		padding-top: 3rem;
 	}
 
 	/* entry media */
 
-	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-media {
+	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-media {
 		width: 35%;
 	}
 
@@ -4085,7 +4086,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-page) .site-inner {
+	 .is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .site-inner {
 		width: 100%;
 	}
 
@@ -4130,7 +4131,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-page) .entry-media {
+	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-media {
 		background: none !important;
 		height: auto;
 		margin: 0 0 5.5rem;
@@ -4185,7 +4186,7 @@ object {
 
 	/* widgets */
 
-	.is-singular.has-post-thumbnail:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-page) .widget-area .widget {
+	.is-singular.has-post-thumbnail:not(.home):not(.page-template-eventbrite-index):not(.woocommerce-active) .widget-area .widget {
 		width: 49.5%;
 	}
 
@@ -4476,7 +4477,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-page) .entry-content {
+	.is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-content {
 		padding-top: 2rem;
 	}
 
@@ -4512,9 +4513,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-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: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.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,
@@ -4625,7 +4626,7 @@ object {
 		padding-top: 0 !important;
 	}
 
-	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header,
+	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header,
 	.is-singular .entry-media-thumb {
 		padding: 0 !important;
 	}
@@ -4637,7 +4638,7 @@ object {
 		margin: 0 !important;
 	}
 
-	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-media {
+	.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-media {
 		height: 100% !important;
 		position: relative !important;
 		top: 0 !important;
@@ -4648,11 +4649,11 @@ object {
 		max-width: 100% !important;
 	}
 
-	.is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .site-inner {
+	.is-singular.has-post-thumbnail:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .site-inner {
 		width: 100%;
 	}
 
-	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-page) .entry-header {
+	.has-post-thumbnail.is-singular:not(.home):not(.single-format-image):not(.page-template-eventbrite-index):not(.woocommerce-active) .entry-header {
 		bottom: auto;
 		left: auto;
 		position: relative;

dyad-2/woocommerce-rtl.css

@@ -286,7 +286,6 @@ p.no-comments {
 .woocommerce-noreviews .button,
 p.no-comments .button {
 	float: left;
-	margin-left: 0;
 	margin-right: 2em;
 }
 
@@ -315,7 +314,6 @@ p.no-comments .button {
 .product_list_widget a img {
 	float: right;
 	margin-left: 1em;
-	margin-right: 0;
 }
 
 /***
@@ -325,6 +323,9 @@ p.no-comments .button {
 	text-align: right;
 }
 
+
+
+
 /**
  * My Account
  **/
@@ -335,13 +336,3 @@ 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,17 +60,6 @@ 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%;
@@ -177,12 +166,14 @@ table.shop_table_responsive tr td.download-actions .button {
 }
 
 @media only screen and (min-width: 1200px) {
-	.woocommerce-page.has-post-thumbnail.is-singular:not(.home):not(.single-format-image) .entry-header {
+	.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 {
 		padding: 3em 0 0;
 		text-align: center;
 	}
 
-	.woocommerce-page.has-post-thumbnail .entry-content {
+	.has-post-thumbnail .entry-content {
 		padding-top: 3rem;
 	}
 }
@@ -286,17 +277,6 @@ 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;
@@ -591,10 +571,9 @@ dl.variation p {
 }
 
 .single-product .woocommerce-review-link {
-	display: block;
+	display: inline-block;
 	font-style: italic;
 	line-height: 1.618;
-	margin-bottom: 1em;
 	vertical-align: top;
 }
 
@@ -782,28 +761,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) {
@@ -861,6 +840,10 @@ ul.order_details li strong {
 /**
  * Header cart
  */
+.woocommerce-active #site-navigation {
+	width: 50%;
+}
+
 .site-header-cart {
 	display: table-cell;
 	font-size: 1.4rem;
@@ -1104,13 +1087,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 {
@@ -1133,7 +1116,6 @@ 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;
@@ -1166,19 +1148,6 @@ 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;
@@ -1332,10 +1301,6 @@ 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;
 }
@@ -1439,10 +1404,6 @@ p.no-comments {
 	position: relative;
 }
 
-.woocommerce-noreviews {
-	padding: 1em 2em 1em 2em;
-}
-
 @media screen and (max-width: 1080px) {
 	.woocommerce-message,
 	.woocommerce-info,
@@ -1583,13 +1544,6 @@ 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/header.php

@@ -28,7 +28,7 @@
 				<div class="site-branding">
 					<?php the_custom_logo(); ?>
 
-					<?php if ( '' !== get_theme_mod( 'independent_publisher_2_gravatar_email', get_option( 'admin_email' ) ) && validate_gravatar( get_theme_mod( 'independent_publisher_2_gravatar_email', get_option( 'admin_email' ) ) ) ) : ?>
+					<?php if ( '' !== get_theme_mod( 'independent_publisher_2_gravatar_email', get_option( 'admin_email' ) ) ) : ?>
 						<a class="site-logo-link" href="<?php echo esc_url( home_url( '/' ) ); ?>">
 							<img alt="" class="site-logo-image no-grav" width="80" height="80" src="<?php echo esc_url( get_avatar_url( get_theme_mod( 'independent_publisher_2_gravatar_email', get_option( 'admin_email' ) ), array( 'size' => 160 ) ) ); ?>" />
 						</a><!-- .site-logo-link -->

independent-publisher-2/inc/extras.php

@@ -67,60 +67,3 @@ function independent_publisher_2_pingback_header() {
 	}
 }
 add_action( 'wp_head', 'independent_publisher_2_pingback_header' );
-
-/**
- * Utility function to check if a gravatar exists for a given email or id
- * @param int|string|object $id_or_email A user ID,  email address, or comment object
- * @return bool if the gravatar exists or not
- * @link https://gist.github.com/justinph/5197810
- */
-
-function validate_gravatar( $id_or_email ) {
-	// The id or email code is borrowed from wp-includes/pluggable.php.
-	$email = '';
-	if ( is_numeric( $id_or_email ) ) {
-		$id   = (int) $id_or_email;
-		$user = get_userdata( $id );
-		if ( $user ) {
-			$email = $user->user_email;
-		}
-	} elseif ( is_object( $id_or_email ) ) {
-		// No avatar for pingbacks or trackbacks.
-		$allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
-		if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types, true ) ) {
-			return false;
-		}
-
-		if ( ! empty( $id_or_email->user_id ) ) {
-			$id   = (int) $id_or_email->user_id;
-			$user = get_userdata( $id );
-			if ( $user ) {
-				$email = $user->user_email;
-			}
-		} elseif ( ! empty( $id_or_email->comment_author_email ) ) {
-			$email = $id_or_email->comment_author_email;
-		}
-	} else {
-		$email = $id_or_email;
-	}
-
-	$hashkey = md5( strtolower( trim( $email ) ) );
-	$uri     = 'http://www.gravatar.com/avatar/' . $hashkey . '?d=404';
-	$data    = wp_cache_get( $hashkey );
-	$expire  = 60 * 5;
-	$group   = '';
-	if ( false === $data ) {
-		$response = wp_remote_head( $uri );
-		if ( is_wp_error( $response ) ) {
-			$data = 'not200';
-		} else {
-			$data = $response['response']['code'];
-		}
-		wp_cache_set( $hashkey, $data, $group, $expire );
-	}
-	if ( 200 === $data ) {
-		return true;
-	} else {
-		return false;
-	}
-}

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' ) && ( ip_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( is_shop() || 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' ) && ( ip_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) :
+		elseif ( class_exists( 'WooCommerce' ) && ( is_shop() || 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' ) && ( ip_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( is_shop() || 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,6 +323,35 @@ function ip_woocommerce_is_shop_page() {
 	return $is_shop_page;
 }
 
+/**
+ * Jetpack infinite scroll duplicates posts where orderby is anything other than modified or date
+ * This filter offsets the products returned by however many are displayed per page
+ *
+ * @link https://github.com/Automattic/jetpack/issues/1135
+ * @param  array $args infinite scroll args.
+ * @return array       infinite scroll args.
+ */
+function ip_woocommerce_jetpack_duplicate_products( $args ) {
+	if ( ( isset( $args['post_type'] ) && 'product' === $args['post_type'] ) || ( isset( $args['taxonomy'] ) && 'product_cat' === $args['taxonomy'] ) ) {
+		$args['offset'] = $args['posts_per_page'] * $args['paged'];
+	}
+ 	return $args;
+}
+add_filter( 'infinite_scroll_query_args', 'ip_woocommerce_jetpack_duplicate_products', 100 );
+/**
+ * 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.4-wpcom
+Version: 2.1.3-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,6 +2171,7 @@ p.no-comments {
 .custom-logo {
 	display: block;
 	width: auto;
+	max-width: 750px;
 	height: auto;
 	max-height: 150px;
 	margin: 0 auto .875em;
@@ -3151,10 +3152,7 @@ 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,8 +436,6 @@ 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 {
@@ -828,34 +826,6 @@ 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
  */
@@ -893,11 +863,6 @@ ul#shipping_method {
 .infinite-scroll .woocommerce-pagination {
   display: none; }
 
-.woocommerce-page .infinite-wrap {
-  border-top: none;
-  margin-top: 0;
-  padding-top: 0; }
-
 /**
  * Onsale
  */
@@ -1392,17 +1357,17 @@ a.added_to_cart {
   .widget.woocommerce ul.product_list_widget li .remove {
     display: block;
     font-size: 1.5em;
-    line-height: .75;
+    line-height: 1;
     color: #333;
     border-radius: 100%;
     text-decoration: none;
     font-weight: 700;
     box-shadow: none;
     opacity: .5;
-    text-align: right;
-    margin: 0 0 0 .5rem;
-    height: .75em;
-    width: .75em;
+    text-align: center;
+    margin: .65rem 0 1rem .75rem;
+    height: 1em;
+    width: 1em;
     float: right; }
 
 /**
@@ -1535,7 +1500,6 @@ 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,8 +436,6 @@ 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 {
@@ -828,33 +826,6 @@ 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
  */
@@ -892,11 +863,6 @@ ul#shipping_method {
 .infinite-scroll .woocommerce-pagination {
   display: none; }
 
-.woocommerce-page .infinite-wrap {
-  border-top: none;
-  margin-top: 0;
-  padding-top: 0; }
-
 /**
  * Onsale
  */
@@ -1391,17 +1357,17 @@ a.added_to_cart {
   .widget.woocommerce ul.product_list_widget li .remove {
     display: block;
     font-size: 1.5em;
-    line-height: .75;
+    line-height: 1;
     color: #333;
     border-radius: 100%;
     text-decoration: none;
     font-weight: 700;
     box-shadow: none;
     opacity: .5;
-    text-align: left;
-    margin: 0 .5rem 0 0;
-    height: .75em;
-    width: .75em;
+    text-align: center;
+    margin: .65rem .75rem 1rem 0;
+    height: 1em;
+    width: 1em;
     float: left; }
 
 /**
@@ -1534,7 +1500,6 @@ 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 {

ixion/style.css

@@ -1556,6 +1556,7 @@ object {
 	max-width: 100%;
 }
 .wp-caption {
+	margin: 0;
 	margin-bottom: 1.6em;
 	max-width: 100%;
 }

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: 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 ) {
+	// 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 ) {
 		return;
 	}
 

karuna/inc/woocommerce.php

@@ -111,10 +111,7 @@ add_filter( 'body_class', 'karuna_woocommerce_active_body_class' );
  * @return integer number of products.
  */
 function karuna_woocommerce_products_per_page() {
-	return absint( apply_filters( 'karuna_woocommerce_products_per_page', 12 ) );
-}
-if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
-	add_filter( 'loop_shop_per_page', 'karuna_woocommerce_products_per_page' );
+	return 12;
 }
 
 // Legacy WooCommerce products per page filter.
@@ -128,7 +125,7 @@ if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
  * @return integer number of columns.
  */
 function karuna_woocommerce_thumbnail_columns() {
-	return absint( apply_filters( 'karuna_woocommerce_product_thumbnail_columns', 4 ) );
+	return 4;
 }
 add_filter( 'woocommerce_product_thumbnails_columns', 'karuna_woocommerce_thumbnail_columns' );
 
@@ -138,7 +135,7 @@ add_filter( 'woocommerce_product_thumbnails_columns', 'karuna_woocommerce_thumbn
  * @return integer products per row.
  */
 function karuna_woocommerce_loop_columns() {
-	return absint( apply_filters( 'karuna_woocommerce_loop_columns', 2 ) );
+	return 2;
 }
 
 // Legacy WooCommerce columns filter.
@@ -153,10 +150,12 @@ if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
  * @return array $args related products args.
  */
 function karuna_woocommerce_related_products_args( $args ) {
-	$args = apply_filters( 'karuna_woocommerce_related_products_args', array(
+	$defaults = array(
 		'posts_per_page' => 2,
 		'columns'        => 2,
-	) );
+	);
+
+	$args = wp_parse_args( $defaults, $args );
 
 	return $args;
 }
@@ -348,6 +347,23 @@ function karuna_woocommerce_is_shop_page() {
 	return $is_shop_page;
 }
 
+/**
+ * Jetpack infinite scroll duplicates posts where orderby is anything other than modified or date
+ * This filter offsets the products returned by however many are displayed per page
+ *
+ * @link https://github.com/Automattic/jetpack/issues/1135
+ * @param  array $args infinite scroll args.
+ * @return array       infinite scroll args.
+ */
+function karuna_woocommerce_jetpack_duplicate_products( $args ) {
+	if ( ( isset( $args['post_type'] ) && 'product' === $args['post_type'] ) || ( isset( $args['taxonomy'] ) && 'product_cat' === $args['taxonomy'] ) ) {
+		$args['offset'] = $args['posts_per_page'] * $args['paged'];
+	}
+
+ 	return $args;
+}
+add_filter( 'infinite_scroll_query_args', 'karuna_woocommerce_jetpack_duplicate_products', 100 );
+
 /**
  * Override number of products per page in Jetpack infinite scroll.
  *

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.7-wpcom
+Version: 1.2.5-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: karuna
@@ -1052,12 +1052,11 @@ body {
 .front-testimonials .hentry {
 	background: rgba(0, 0, 0, 0.02);
 	margin-bottom: 3.2em;
-	padding: 1.6em 1.6em 3em;
+	padding: 1.6em;
 	position: relative;
 	font-size: 16px;
 	font-size: 1rem;
 }
-
 .front-testimonials .hentry p {
 	margin-top: 0;
 }
@@ -1850,7 +1849,6 @@ figure {
 	.front-testimonials .hentry {
 		font-size: 28px;
 		font-size: 1.75rem;
-		padding-bottom: 1.6em;
 	}
 	.front-testimonials .hentry .entry-title {
 		font-size: 18px;

karuna/woocommerce.css

@@ -678,10 +678,6 @@ ul#shipping_method {
 .infinite-scroll .woocommerce-pagination {
   display: none; }
 
-.infinite-scroll.woocommerce-page .infinite-loader {
-  margin: 1em auto;
-  width: 2.1em; }
-
 /**
  * Onsale
  */

libre-2/inc/jetpack.php

@@ -49,23 +49,22 @@ add_action( 'after_setup_theme', 'libre_2_jetpack_setup' );
  */
 function libre_2_infinite_scroll_render() {
 
-	if ( class_exists( 'WooCommerce' ) && ( libre_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
 		libre_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' ) && ( libre_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) :
+
+		if ( class_exists( 'WooCommerce' ) && ( is_shop() || 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' ) && ( libre_2_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( is_shop() || 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,7 +27,6 @@ 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' );
@@ -44,7 +43,6 @@ 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,9 +89,10 @@ add_filter( 'body_class', 'libre_2_woocommerce_active_body_class' );
  * @return integer number of products.
  */
 function libre_2_woocommerce_products_per_page() {
-	return absint( apply_filters( 'libre_2_woocommerce_products_per_page', 12 ) );
+	return 12;
 }
 
+// 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' );
 }
@@ -104,7 +103,7 @@ if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
  * @return integer number of columns.
  */
 function libre_2_woocommerce_thumbnail_columns() {
-	return absint( apply_filters( 'libre_2_woocommerce_product_thumbnail_columns', 4 ) );
+	return 4;
 }
 add_filter( 'woocommerce_product_thumbnails_columns', 'libre_2_woocommerce_thumbnail_columns' );
 
@@ -114,9 +113,10 @@ add_filter( 'woocommerce_product_thumbnails_columns', 'libre_2_woocommerce_thumb
  * @return integer products per row.
  */
 function libre_2_woocommerce_loop_columns() {
-	return absint( apply_filters( 'libre_2_woocommerce_loop_columns', 3 ) );
+	return 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' );
 }
@@ -128,10 +128,13 @@ if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
  * @return array $args related products args.
  */
 function libre_2_woocommerce_related_products_args( $args ) {
-	$args = apply_filters( 'libre_2_woocommerce_related_products_args', array(
+	$defaults = array(
 		'posts_per_page' => 3,
 		'columns'        => 3,
-	) );
+	);
+
+	$args = wp_parse_args( $defaults, $args );
+
 	return $args;
 }
 add_filter( 'woocommerce_output_related_products_args', 'libre_2_woocommerce_related_products_args' );
@@ -176,32 +179,6 @@ if ( ! function_exists( 'libre_2_woocommerce_product_columns_wrapper_close' ) )
 }
 add_action( 'woocommerce_after_shop_loop', 'libre_2_woocommerce_product_columns_wrapper_close', 40 );
 
-add_action( 'woocommerce_before_shop_loop', 'libre_2_woocommerce_sorting_wrap', 3 );
-
-if ( ! function_exists( 'libre_2_woocommerce_sorting_wrap' ) ) {
-	/**
-	 * Sorting wrapper
-	 *
-	 * @return  void
-	 */
-	function libre_2_woocommerce_sorting_wrap() {
-		echo '<div class="woocommerce-sorting-wrap">';
-	}
-}
-
-add_action( 'woocommerce_before_shop_loop', 'libre_2_woocommerce_sorting_wrap_close', 30 );
-
-if ( ! function_exists( 'libre_2_woocommerce_sorting_wrap_close' ) ) {
-	/**
-	 * Sorting wrapper close
-	 *
-	 * @return  void
-	 */
-	function libre_2_woocommerce_sorting_wrap_close() {
-		echo '</div><!-- END .sorting-wrap -->';
-	}
-}
-
 /**
  * Remove default WooCommerce wrapper.
  */
@@ -328,4 +305,34 @@ function libre_2_woocommerce_is_shop_page() {
 		$is_shop_page = is_shop();
 	}
 	return $is_shop_page;
-}
+}
+
+/**
+ * Jetpack infinite scroll duplicates posts where orderby is anything other than modified or date
+ * This filter offsets the products returned by however many are displayed per page
+ *
+ * @link https://github.com/Automattic/jetpack/issues/1135
+ * @param  array $args infinite scroll args.
+ * @return array       infinite scroll args.
+ */
+function libre_2_woocommerce_jetpack_duplicate_products( $args ) {
+	if ( ( isset( $args['post_type'] ) && 'product' === $args['post_type'] ) || ( isset( $args['taxonomy'] ) && 'product_cat' === $args['taxonomy'] ) ) {
+		$args['offset'] = $args['posts_per_page'] * $args['paged'];
+	}
+ 	return $args;
+}
+add_filter( 'infinite_scroll_query_args', 'libre_2_woocommerce_jetpack_duplicate_products', 100 );
+
+/**
+ * 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: 0;
+	margin-right: auto;
 }
 
 blockquote.alignright,
@@ -61,7 +61,7 @@ ol {
 li > ul,
 li > ol {
 	margin-right: .4375em;
-	margin-left: 0;
+	margin-left: auto;
 }
 
 /*--------------------------------------------------------------
@@ -74,7 +74,7 @@ input[type="url"],
 input[type="password"],
 input[type="search"] {
 	margin-left: -5px;
-	margin-right: 0;
+	margin-right: auto;
 }
 
 textarea {
@@ -200,7 +200,7 @@ td#next {
 .comment .avatar {
 	float: right;
 	margin-left: .875em;
-	margin-right: 0;
+	margin-right: auto;
 }
 
 #cancel-comment-reply-link {
@@ -209,13 +209,7 @@ td#next {
 
 .comment-form label {
 	margin-left: .875em;
-	margin-right: 0;
-}
-
-.author-avatar {
-    float: left;
-    margin-right: 1.75em;
-    margin-left: 0;
+	margin-right: auto;
 }
 
 @media screen and ( min-width: 45em ) {
@@ -239,7 +233,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: 0;
+		margin-right: auto;
 	}
 
 	.main-navigation ul > li.menu-item-has-children > a:after,
@@ -274,45 +268,45 @@ td#next {
 	.error404 .widget-areas .widget-area {
 		float: right;
 		margin-left: 5%;
-		margin-right: 0;
+		margin-right: auto;
 	}
 
 	.error404 .widget-areas .widget-area:last-of-type {
 		margin-left: 0;
-		margin-right: 0;
+		margin-right: auto;
 	}
 
 	.footer-widgets > div:nth-child(1):nth-last-child(3) {
 		float: right;
 		margin-left: 5%;
-		margin-right: 0;
+		margin-right: auto;
 	}
 
 	.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: 0;
+		margin-right: auto;
 	}
 
 	.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: 0;
+		margin-right: auto;
 	}
 
 	.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: 0;
+		margin-right: auto;
 	}
 
 	.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: 0;
+		margin-right: auto;
 	}
 
 	.entry-footer span {
@@ -355,7 +349,7 @@ td#next {
 @media screen and ( min-width: 55em ) {
 	.sticking .site-logo {
 		margin-left: 0.4375em;
-		margin-right: 0;
+		margin-right: auto;
 	}
 
 	.singular .content-area {
@@ -410,7 +404,7 @@ td#next {
 
 	.sticking .site-title {
 		margin-left: 0;
-		margin-right: 0;
+		margin-right: auto;
 	}
 
 	.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.3-wpcom
+Version: 2.2.2-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

@@ -1,614 +0,0 @@
-/*
- * 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,10 +1,14 @@
 /*
- * Theme Name: Libre 2
- *
- * WooCommerce styles override
- *
- */
+Theme Name: Libre 2
 
+WooCommerce styles override
+*/
+/**
+ * WooCommerce color variables
+ */
+/**
+ * Imports
+ */
 /**
  * Fonts
  */
@@ -115,17 +119,6 @@ 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
  */
@@ -216,21 +209,6 @@ 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
  */
@@ -343,7 +321,7 @@ div[class^='columns-']
 	{
 		float: left;
 
-		width: 40%;
+		width: 48%;
 		margin-right: 4%;
 	}
 	ul.products li.product.first
@@ -504,6 +482,9 @@ ul.products li.product .added_to_cart
 /**
  * Single product
  */
+/**
+ * Single Product
+ */
 .single-product div.product
 {
 	position: relative;
@@ -1029,10 +1010,11 @@ ul.products li.product .added_to_cart
 }
 .woocommerce #payment ul.payment_methods li label img
 {
-	float: right;
-	border: 0;
-	padding: 0;
-	max-height: 1.618em;
+	margin-left: .8em;
+	max-width: 200px;
+	height: auto;
+	position: relative;
+	top: 19px;
 }
 .woocommerce #payment ul.payment_methods li.payment_method_paypal .about_paypal
 {

lodestar/inc/extras.php

@@ -94,13 +94,3 @@ function lodestar_is_frontpage() {
 		return false;
 	endif;
 }
-
-/**
- * Adjust content_width value for portfolio page template.
- */
-function lodestar_portfolio_content_width() {
-	if ( is_page_template( 'templates/portfolio-page.php' ) ) {
-		$GLOBALS['content_width'] = 1120;
-	}
-}
-add_action( 'template_redirect', 'lodestar_portfolio_content_width' );

lodestar/inc/woocommerce.php

@@ -296,6 +296,23 @@ function lodestar_woocommerce_is_shop_page() {
 	return $is_shop_page;
 }
 
+/**
+ * Jetpack infinite scroll duplicates posts where orderby is anything other than modified or date
+ * This filter offsets the products returned by however many are displayed per page
+ *
+ * @link https://github.com/Automattic/jetpack/issues/1135
+ * @param  array $args infinite scroll args.
+ * @return array       infinite scroll args.
+ */
+function lodestar_woocommerce_jetpack_duplicate_products( $args ) {
+	if ( ( isset( $args['post_type'] ) && 'product' === $args['post_type'] ) || ( isset( $args['taxonomy'] ) && 'product_cat' === $args['taxonomy'] ) ) {
+		$args['offset'] = $args['posts_per_page'] * $args['paged'];
+	}
+
+ 	return $args;
+}
+add_filter( 'infinite_scroll_query_args', 'lodestar_woocommerce_jetpack_duplicate_products', 100 );
+
 /**
  * Override number of products per page in Jetpack infinite scroll.
  *

lodestar/style.css

@@ -4,7 +4,7 @@ Theme URI: http://theme.wordpress.com/themes/lodestar
 Author: Automattic
 Author URI: https://www.wordpress.com
 Description: Lodestar is a trendy one-page theme designed with startups and small business ventures in mind.
-Version: 1.0.12
+Version: 1.0.11
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: lodestar

pique/inc/jetpack.php

@@ -14,6 +14,7 @@ function pique_jetpack_setup() {
 		'render'         => 'pique_infinite_scroll_render',
 		'footer'         => 'tertiary',
 		'footer_widgets' => array( 'sidebar-2', 'sidebar-3', 'sidebar-4' ),
+		'posts_per_page' => 9
 	) );
 
 	// Add theme support for Responsive Videos.

pique/inc/woocommerce.php

@@ -112,10 +112,7 @@ add_filter( 'body_class', 'pique_woocommerce_active_body_class' );
  * @return integer number of products.
  */
 function pique_woocommerce_products_per_page() {
-	return absint( apply_filters( 'pique_woocommerce_products_per_page', 12 ) );
-}
-if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
-	add_filter( 'loop_shop_per_page', 'pique_woocommerce_products_per_page' );
+	return 12;
 }
 
 // Legacy WooCommerce products per page filter.
@@ -129,7 +126,7 @@ if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
  * @return integer number of columns.
  */
 function pique_woocommerce_thumbnail_columns() {
-	return absint( apply_filters( 'pique_woocommerce_product_thumbnail_columns', 4 ) );
+	return 4;
 }
 add_filter( 'woocommerce_product_thumbnails_columns', 'pique_woocommerce_thumbnail_columns' );
 
@@ -139,7 +136,7 @@ add_filter( 'woocommerce_product_thumbnails_columns', 'pique_woocommerce_thumbna
  * @return integer products per row.
  */
 function pique_woocommerce_loop_columns() {
-	return absint( apply_filters( 'pique_woocommerce_loop_columns', 3 ) );
+	return 3;
 }
 
 // Legacy WooCommerce columns filter.
@@ -154,10 +151,12 @@ if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
  * @return array $args related products args.
  */
 function pique_woocommerce_related_products_args( $args ) {
-	$args = apply_filters( 'radcliffe_2_woocommerce_related_products_args', array(
+	$defaults = array(
 		'posts_per_page' => 3,
 		'columns'        => 3,
-	) );
+	);
+
+	$args = wp_parse_args( $defaults, $args );
 
 	return $args;
 }
@@ -243,6 +242,18 @@ if ( ! function_exists( 'pique_woocommerce_wrapper_after' ) ) {
 }
 add_action( 'woocommerce_after_main_content', 'pique_woocommerce_wrapper_after' );
 
+/**
+ * Sample implementation of the WooCommerce Mini Cart.
+ *
+ * You can add the WooCommerce Mini Cart to header.php like so ...
+ *
+	<?php
+		if ( function_exists( 'pique_woocommerce_header_cart' ) ) {
+			pique_woocommerce_header_cart();
+		}
+	?>
+ */
+
 if ( ! function_exists( 'pique_woocommerce_cart_link_fragment' ) ) {
 	/**
 	 * Cart Fragments.
@@ -400,6 +411,22 @@ function pique_woocommerce_is_shop_page() {
 	return $is_shop_page;
 }
 
+/**
+ * Jetpack infinite scroll duplicates posts where orderby is anything other than modified or date
+ * This filter offsets the products returned by however many are displayed per page
+ *
+ * @link https://github.com/Automattic/jetpack/issues/1135
+ * @param  array $args infinite scroll args.
+ * @return array       infinite scroll args.
+ */
+function pique_woocommerce_jetpack_duplicate_products( $args ) {
+	if ( ( isset( $args['post_type'] ) && 'product' === $args['post_type'] ) || ( isset( $args['taxonomy'] ) && 'product_cat' === $args['taxonomy'] ) ) {
+		$args['offset'] = $args['posts_per_page'] * $args['paged'];
+	}
+ 	return $args;
+}
+add_filter( 'infinite_scroll_query_args', 'pique_woocommerce_jetpack_duplicate_products', 100 );
+
 /**
  * Override number of products per page in Jetpack infinite scroll.
  *

pique/style.css

@@ -4,7 +4,7 @@ Theme URI: https://wordpress.com/themes/pique/
 Author: Automattic
 Author URI: http://wordpress.com/themes/
 Description: A one-page scrolling theme for small businesses.
-Version: 1.4.5-wpcom
+Version: 1.4.4-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: pique

pique/woocommerce.css

@@ -379,10 +379,6 @@ ul.products li.product .added_to_cart:hover {
 	display: none;
 }
 
-.infinite-scroll.woocommerce-page #infinite-handle button::before {
-	display: none;
-}
-
 /**
  * Single product
  */

radcliffe-2/inc/headstart/en-bar.json

@@ -1,148 +0,0 @@
-{
-    "settings": {
-        "options": {
-            "show_on_front": "page",
-            "featured-content": false,
-            "jetpack_content_post_details_categories": "",
-            "default_comment_status": "closed"
-        },
-        "theme_mods": {
-            "0": false,
-            "custom_css_post_id": -1,
-            "nav_menu_locations": {
-                "menu-1": "primary"
-            },
-            "background_color": "ffffff",
-            "colors_manager": {
-                "colors": {
-                    "bg": "#ffffff",
-                    "txt": "",
-                    "link": "#ca2017"
-                },
-                "cached": false
-            },
-            "radcliffe_2_contact_info_location": "header",
-            "radcliffe_2_contact_info_hours": "",
-            "radcliffe_2_contact_info_address": "",
-            "radcliffe_2_contact_info_phone": "",
-            "radcliffe_2_contact_info_email": "",
-            "radcliffe_2_hero_area_display": true,
-            "radcliffe_2_hero_area_title": "Stop by for special happy hour pricing!",
-            "radcliffe_2_hero_area_content": "Get ½ price draft beers and bottles weekdays from 4-7 PM.",
-            "radcliffe_2_hero_area_background": "https:\/\/headstartdata.files.wordpress.com\/2018\/06\/bar-2209813_1920.jpg",
-            "radcliffe_2_hero_area_button_text": "Read more",
-            "radcliffe_2_hero_area_button_url": "\/blog",
-            "header_image": "remove-header",
-            "active_style_pack": "default",
-            "custom_logo": "",
-            "logo_size": 20,
-            "radcliffe_2_hero_overlay_opacity": 50
-        },
-        "headstart": {
-            "mapped_id_options": [],
-            "mapped_id_theme_mods": [],
-            "keep_submenu_items": true
-        }
-    },
-    "content": [
-        {
-            "post_title": "Your bar website, powered by WordPress.com",
-            "post_content": "<p>For a starter guide to WordPress.com and to learn more about this theme go to:<\/p><p style=\"text-align: center;\"><a href=\"https:\/\/wordpress.com\/theme\/radcliffe-2\">https:\/\/wordpress.com\/theme\/radcliffe-2<\/a><\/p><p>You're now ready to make the text on this page your own. Open the page editor by clicking on the <strong>‘Edit’<\/strong> button 👇below to change the text on this page.<\/p>",
-            "post_excerpt": "",
-            "post_status": "publish",
-            "menu_order": 1,
-            "comment_status": "closed",
-            "ping_status": "closed",
-            "post_type": "page",
-            "hs_custom_meta": "_hs_front_page",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "page_template": "default",
-            "hs_old_id": 100
-        },
-        {
-            "post_title": "Blog",
-            "post_content": "This is the page where users will find your site's blog",
-            "post_status": "publish",
-            "menu_order": 2,
-            "comment_status": "closed",
-            "ping_status": "closed",
-            "post_type": "page",
-            "hs_custom_meta": "_hs_blog_page",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "hs_old_id": 101
-        },
-        {
-            "post_title": "The Journey Begins",
-            "post_content": "Thanks for joining me! <blockquote>Good company in a journey makes the way seem shorter. — Izaak Walton<\/blockquote><img class=\"wp-image-7 size-full\" src=\"https://twentysixteendemo.files.wordpress.com/2015/11/post.png\" alt=\"post\" width=\"1000\" height=\"563\" \/>",
-            "post_status": "publish",
-            "menu_order": 3,
-            "comment_status": "open",
-            "ping_status": "open",
-            "post_type": "post",
-            "hs_custom_meta": "_hs_first_post",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "hs_old_id": 102,
-            "attachment_url": "https:\/\/headstartdata.files.wordpress.com\/2018\/06\/glasses-919071_1920.jpg"
-        },
-                {
-            "post_title": "Contact",
-            "post_content": "[contact-form][contact-field label=\"Name\" type=\"name\" required=\"1\"\/][contact-field label=\"Email\" type=\"email\" required=\"1\"\/][contact-field label=\"Comment\" type=\"textarea\" required=\"1\"\/][\/contact-form]",
-            "post_status": "publish",
-            "menu_order": 4,
-            "comment_status": "closed",
-            "ping_status": "closed",
-            "post_type": "page",
-            "hs_custom_meta": "_hs_contact_page",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "attachment_url": "https:\/\/headstartdata.files.wordpress.com\/2018\/06\/bar-2428693_1920.jpg",
-            "hs_old_id": 103
-        }
-    ],
-    "menus": {
-        "primary": {
-            "name": "Primary",
-            "items": [
-                {
-                "menu-item-title": "Home",
-                "menu-item-db-id": 100,
-                "menu-item-object-id": "100",
-                "menu-item-object": "page",
-                "menu-item-type": "custom",
-                "menu-item-status": "publish",
-                "menu-item-position": 1,
-                "menu-item-parent-id": "",
-                "menu-item-description": "",
-                "menu-item-url": "/"
-                },
-                {
-                "menu-item-title": "Blog",
-                "hs-menu-item-custom": "blog",
-                "menu-item-db-id": 101,
-                "menu-item-object-id": "101",
-                "menu-item-object": "page",
-                "menu-item-type": "post_type",
-                "menu-item-status": "publish",
-                "menu-item-position": 2,
-                "menu-item-parent-id": "",
-                "menu-item-description": ""
-                },
-                {
-                "menu-item-title": "Contact",
-                "hs-menu-item-custom": "contact",
-                "menu-item-db-id": 103,
-                "menu-item-object-id": "103",
-                "menu-item-object": "page",
-                "menu-item-type": "post_type",
-                "menu-item-status": "publish",
-                "menu-item-position": 3,
-                "menu-item-parent-id": "",
-                "menu-item-description": ""
-                }
-            ]
-        }
-    }
-}

radcliffe-2/inc/headstart/en-cafe.json

@@ -1,148 +0,0 @@
-{
-    "settings": {
-        "options": {
-            "show_on_front": "page",
-            "featured-content": false,
-            "jetpack_content_post_details_categories": "",
-            "default_comment_status": "closed"
-        },
-        "theme_mods": {
-            "0": false,
-            "custom_css_post_id": -1,
-            "nav_menu_locations": {
-                "menu-1": "primary"
-            },
-            "background_color": "ffffff",
-            "colors_manager": {
-                "colors": {
-                    "bg": "#ffffff",
-                    "txt": "",
-                    "link": "#ca2017"
-                },
-                "cached": false
-            },
-            "radcliffe_2_contact_info_location": "header",
-            "radcliffe_2_contact_info_hours": "",
-            "radcliffe_2_contact_info_address": "",
-            "radcliffe_2_contact_info_phone": "",
-            "radcliffe_2_contact_info_email": "",
-            "radcliffe_2_hero_area_display": true,
-            "radcliffe_2_hero_area_title": "This week’s special: large iced coffee for $3",
-            "radcliffe_2_hero_area_content": "Available in regular, mocha, French vanilla, and hazelnut",
-            "radcliffe_2_hero_area_background": "https:\/\/headstartdata.files.wordpress.com\/2018\/06\/coffee-shop-1209863_1920.jpg",
-            "radcliffe_2_hero_area_button_text": "Directions to the cafe",
-            "radcliffe_2_hero_area_button_url": "\/contact",
-            "header_image": "remove-header",
-            "active_style_pack": "default",
-            "custom_logo": "",
-            "logo_size": 20,
-            "radcliffe_2_hero_overlay_opacity": 50
-        },
-        "headstart": {
-            "mapped_id_options": [],
-            "mapped_id_theme_mods": [],
-            "keep_submenu_items": true
-        }
-    },
-    "content": [
-        {
-            "post_title": "Your cafe website, powered by WordPress.com",
-            "post_content": "<p>For a starter guide to WordPress.com and to learn more about this theme go to:<\/p><p style=\"text-align: center;\"><a href=\"https:\/\/wordpress.com\/theme\/radcliffe-2\">https:\/\/wordpress.com\/theme\/radcliffe-2<\/a><\/p><p>You're now ready to make the text on this page your own. Open the page editor by clicking on the <strong>‘Edit’<\/strong> button 👇below to change the text on this page.<\/p>",
-            "post_excerpt": "",
-            "post_status": "publish",
-            "menu_order": 1,
-            "comment_status": "closed",
-            "ping_status": "closed",
-            "post_type": "page",
-            "hs_custom_meta": "_hs_front_page",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "page_template": "default",
-            "hs_old_id": 100
-        },
-        {
-            "post_title": "Blog",
-            "post_content": "This is the page where users will find your site's blog",
-            "post_status": "publish",
-            "menu_order": 2,
-            "comment_status": "closed",
-            "ping_status": "closed",
-            "post_type": "page",
-            "hs_custom_meta": "_hs_blog_page",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "hs_old_id": 101
-        },
-        {
-            "post_title": "The Journey Begins",
-            "post_content": "Thanks for joining me! <blockquote>Good company in a journey makes the way seem shorter. — Izaak Walton<\/blockquote><img class=\"wp-image-7 size-full\" src=\"https://twentysixteendemo.files.wordpress.com/2015/11/post.png\" alt=\"post\" width=\"1000\" height=\"563\" \/>",
-            "post_status": "publish",
-            "menu_order": 3,
-            "comment_status": "open",
-            "ping_status": "open",
-            "post_type": "post",
-            "hs_custom_meta": "_hs_first_post",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "hs_old_id": 102,
-            "attachment_url": "https:\/\/headstartdata.files.wordpress.com\/2018\/06\/pexels-photo-373948.jpeg"
-        },
-                {
-            "post_title": "Contact",
-            "post_content": "[contact-form][contact-field label=\"Name\" type=\"name\" required=\"1\"\/][contact-field label=\"Email\" type=\"email\" required=\"1\"\/][contact-field label=\"Comment\" type=\"textarea\" required=\"1\"\/][\/contact-form]",
-            "post_status": "publish",
-            "menu_order": 4,
-            "comment_status": "closed",
-            "ping_status": "closed",
-            "post_type": "page",
-            "hs_custom_meta": "_hs_contact_page",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "attachment_url": "https:\/\/headstartdata.files.wordpress.com\/2018\/06\/people-2592341_1920.jpg",
-            "hs_old_id": 103
-        }
-    ],
-    "menus": {
-        "primary": {
-            "name": "Primary",
-            "items": [
-                {
-                "menu-item-title": "Home",
-                "menu-item-db-id": 100,
-                "menu-item-object-id": "100",
-                "menu-item-object": "page",
-                "menu-item-type": "custom",
-                "menu-item-status": "publish",
-                "menu-item-position": 1,
-                "menu-item-parent-id": "",
-                "menu-item-description": "",
-                "menu-item-url": "/"
-                },
-                {
-                "menu-item-title": "Blog",
-                "hs-menu-item-custom": "blog",
-                "menu-item-db-id": 101,
-                "menu-item-object-id": "101",
-                "menu-item-object": "page",
-                "menu-item-type": "post_type",
-                "menu-item-status": "publish",
-                "menu-item-position": 2,
-                "menu-item-parent-id": "",
-                "menu-item-description": ""
-                },
-                {
-                "menu-item-title": "Contact",
-                "hs-menu-item-custom": "contact",
-                "menu-item-db-id": 103,
-                "menu-item-object-id": "103",
-                "menu-item-object": "page",
-                "menu-item-type": "post_type",
-                "menu-item-status": "publish",
-                "menu-item-position": 3,
-                "menu-item-parent-id": "",
-                "menu-item-description": ""
-                }
-            ]
-        }
-    }
-}

radcliffe-2/inc/headstart/en-mexican-restaurant.json

@@ -1,148 +0,0 @@
-{
-    "settings": {
-        "options": {
-            "show_on_front": "page",
-            "featured-content": false,
-            "jetpack_content_post_details_categories": "",
-            "default_comment_status": "closed"
-        },
-        "theme_mods": {
-            "0": false,
-            "custom_css_post_id": -1,
-            "nav_menu_locations": {
-                "menu-1": "primary"
-            },
-            "background_color": "ffffff",
-            "colors_manager": {
-                "colors": {
-                    "bg": "#ffffff",
-                    "txt": "",
-                    "link": "#ca2017"
-                },
-                "cached": false
-            },
-            "radcliffe_2_contact_info_location": "header",
-            "radcliffe_2_contact_info_hours": "",
-            "radcliffe_2_contact_info_address": "",
-            "radcliffe_2_contact_info_phone": "",
-            "radcliffe_2_contact_info_email": "",
-            "radcliffe_2_hero_area_display": true,
-            "radcliffe_2_hero_area_title": "Authentic Mexican food in downtown Chicago",
-            "radcliffe_2_hero_area_content": "Voted Chicago’s best Mexican restaurant 3 years in a row",
-            "radcliffe_2_hero_area_background": "https:\/\/headstartdata.files.wordpress.com\/2018\/06\/mexico-1621835_1920.jpg",
-            "radcliffe_2_hero_area_button_text": "View our menu",
-            "radcliffe_2_hero_area_button_url": "\/blog",
-            "header_image": "remove-header",
-            "active_style_pack": "default",
-            "custom_logo": "",
-            "logo_size": 20,
-            "radcliffe_2_hero_overlay_opacity": 50
-        },
-        "headstart": {
-            "mapped_id_options": [],
-            "mapped_id_theme_mods": [],
-            "keep_submenu_items": true
-        }
-    },
-    "content": [
-        {
-            "post_title": "Your mexican restaurant website, powered by WordPress.com",
-            "post_content": "<p>For a starter guide to WordPress.com and to learn more about this theme go to:<\/p><p style=\"text-align: center;\"><a href=\"https:\/\/wordpress.com\/theme\/radcliffe-2\">https:\/\/wordpress.com\/theme\/radcliffe-2<\/a><\/p><p>You're now ready to make the text on this page your own. Open the page editor by clicking on the <strong>‘Edit’<\/strong> button 👇below to change the text on this page.<\/p>",
-            "post_excerpt": "",
-            "post_status": "publish",
-            "menu_order": 1,
-            "comment_status": "closed",
-            "ping_status": "closed",
-            "post_type": "page",
-            "hs_custom_meta": "_hs_front_page",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "page_template": "default",
-            "hs_old_id": 100
-        },
-        {
-            "post_title": "Blog",
-            "post_content": "This is the page where users will find your site's blog",
-            "post_status": "publish",
-            "menu_order": 2,
-            "comment_status": "closed",
-            "ping_status": "closed",
-            "post_type": "page",
-            "hs_custom_meta": "_hs_blog_page",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "hs_old_id": 101
-        },
-        {
-            "post_title": "The Journey Begins",
-            "post_content": "Thanks for joining me! <blockquote>Good company in a journey makes the way seem shorter. — Izaak Walton<\/blockquote><img class=\"wp-image-7 size-full\" src=\"https://twentysixteendemo.files.wordpress.com/2015/11/post.png\" alt=\"post\" width=\"1000\" height=\"563\" \/>",
-            "post_status": "publish",
-            "menu_order": 3,
-            "comment_status": "open",
-            "ping_status": "open",
-            "post_type": "post",
-            "hs_custom_meta": "_hs_first_post",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "hs_old_id": 102,
-            "attachment_url": "https:\/\/headstartdata.files.wordpress.com\/2018\/06\/alcohol-alcoholic-bar-6506.jpg"
-        },
-                {
-            "post_title": "Contact",
-            "post_content": "[contact-form][contact-field label=\"Name\" type=\"name\" required=\"1\"\/][contact-field label=\"Email\" type=\"email\" required=\"1\"\/][contact-field label=\"Comment\" type=\"textarea\" required=\"1\"\/][\/contact-form]",
-            "post_status": "publish",
-            "menu_order": 4,
-            "comment_status": "closed",
-            "ping_status": "closed",
-            "post_type": "page",
-            "hs_custom_meta": "_hs_contact_page",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "attachment_url": "https:\/\/headstartdata.files.wordpress.com\/2018\/06\/salsa-1670402_1920.jpg",
-            "hs_old_id": 103
-        }
-    ],
-    "menus": {
-        "primary": {
-            "name": "Primary",
-            "items": [
-                {
-                "menu-item-title": "Home",
-                "menu-item-db-id": 100,
-                "menu-item-object-id": "100",
-                "menu-item-object": "page",
-                "menu-item-type": "custom",
-                "menu-item-status": "publish",
-                "menu-item-position": 1,
-                "menu-item-parent-id": "",
-                "menu-item-description": "",
-                "menu-item-url": "/"
-                },
-                {
-                "menu-item-title": "Blog",
-                "hs-menu-item-custom": "blog",
-                "menu-item-db-id": 101,
-                "menu-item-object-id": "101",
-                "menu-item-object": "page",
-                "menu-item-type": "post_type",
-                "menu-item-status": "publish",
-                "menu-item-position": 2,
-                "menu-item-parent-id": "",
-                "menu-item-description": ""
-                },
-                {
-                "menu-item-title": "Contact",
-                "hs-menu-item-custom": "contact",
-                "menu-item-db-id": 103,
-                "menu-item-object-id": "103",
-                "menu-item-object": "page",
-                "menu-item-type": "post_type",
-                "menu-item-status": "publish",
-                "menu-item-position": 3,
-                "menu-item-parent-id": "",
-                "menu-item-description": ""
-                }
-            ]
-        }
-    }
-}

radcliffe-2/inc/headstart/en-movie-theater.json

@@ -1,148 +0,0 @@
-{
-    "settings": {
-        "options": {
-            "show_on_front": "page",
-            "featured-content": false,
-            "jetpack_content_post_details_categories": "",
-            "default_comment_status": "closed"
-        },
-        "theme_mods": {
-            "0": false,
-            "custom_css_post_id": -1,
-            "nav_menu_locations": {
-                "menu-1": "primary"
-            },
-            "background_color": "ffffff",
-            "colors_manager": {
-                "colors": {
-                    "bg": "#ffffff",
-                    "txt": "",
-                    "link": "#ca2017"
-                },
-                "cached": false
-            },
-            "radcliffe_2_contact_info_location": "header",
-            "radcliffe_2_contact_info_hours": "",
-            "radcliffe_2_contact_info_address": "",
-            "radcliffe_2_contact_info_phone": "",
-            "radcliffe_2_contact_info_email": "",
-            "radcliffe_2_hero_area_display": true,
-            "radcliffe_2_hero_area_title": "Students: get a free snack with any ticket",
-            "radcliffe_2_hero_area_content": "Show a valid Ellington High ID for free popcorn, candy, or soda!",
-            "radcliffe_2_hero_area_background": "https:\/\/headstartdata.files.wordpress.com\/2018\/06\/cinema-314354.jpg",
-            "radcliffe_2_hero_area_button_text": "See what's playing",
-            "radcliffe_2_hero_area_button_url": "\/blog",
-            "header_image": "remove-header",
-            "active_style_pack": "default",
-            "custom_logo": "",
-            "logo_size": 20,
-            "radcliffe_2_hero_overlay_opacity": 50
-        },
-        "headstart": {
-            "mapped_id_options": [],
-            "mapped_id_theme_mods": [],
-            "keep_submenu_items": true
-        }
-    },
-    "content": [
-        {
-            "post_title": "Your movie theater website, powered by WordPress.com",
-            "post_content": "<p>For a starter guide to WordPress.com and to learn more about this theme go to:<\/p><p style=\"text-align: center;\"><a href=\"https:\/\/wordpress.com\/theme\/radcliffe-2\">https:\/\/wordpress.com\/theme\/radcliffe-2<\/a><\/p><p>You're now ready to make the text on this page your own. Open the page editor by clicking on the <strong>‘Edit’<\/strong> button 👇below to change the text on this page.<\/p>",
-            "post_excerpt": "",
-            "post_status": "publish",
-            "menu_order": 1,
-            "comment_status": "closed",
-            "ping_status": "closed",
-            "post_type": "page",
-            "hs_custom_meta": "_hs_front_page",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "page_template": "default",
-            "hs_old_id": 100
-        },
-        {
-            "post_title": "Blog",
-            "post_content": "This is the page where users will find your site's blog",
-            "post_status": "publish",
-            "menu_order": 2,
-            "comment_status": "closed",
-            "ping_status": "closed",
-            "post_type": "page",
-            "hs_custom_meta": "_hs_blog_page",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "hs_old_id": 101
-        },
-        {
-            "post_title": "The Journey Begins",
-            "post_content": "Thanks for joining me! <blockquote>Good company in a journey makes the way seem shorter. — Izaak Walton<\/blockquote><img class=\"wp-image-7 size-full\" src=\"https://twentysixteendemo.files.wordpress.com/2015/11/post.png\" alt=\"post\" width=\"1000\" height=\"563\" \/>",
-            "post_status": "publish",
-            "menu_order": 3,
-            "comment_status": "open",
-            "ping_status": "open",
-            "post_type": "post",
-            "hs_custom_meta": "_hs_first_post",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "hs_old_id": 102,
-            "attachment_url": "https:\/\/headstartdata.files.wordpress.com\/2018\/06\/popcorn-movie-party-entertainment.jpg"
-        },
-                {
-            "post_title": "Contact",
-            "post_content": "[contact-form][contact-field label=\"Name\" type=\"name\" required=\"1\"\/][contact-field label=\"Email\" type=\"email\" required=\"1\"\/][contact-field label=\"Comment\" type=\"textarea\" required=\"1\"\/][\/contact-form]",
-            "post_status": "publish",
-            "menu_order": 4,
-            "comment_status": "closed",
-            "ping_status": "closed",
-            "post_type": "page",
-            "hs_custom_meta": "_hs_contact_page",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "attachment_url": "https:\/\/headstartdata.files.wordpress.com\/2018\/06\/denver-1676444_1920.jpg",
-            "hs_old_id": 103
-        }
-    ],
-    "menus": {
-        "primary": {
-            "name": "Primary",
-            "items": [
-                {
-                "menu-item-title": "Home",
-                "menu-item-db-id": 100,
-                "menu-item-object-id": "100",
-                "menu-item-object": "page",
-                "menu-item-type": "custom",
-                "menu-item-status": "publish",
-                "menu-item-position": 1,
-                "menu-item-parent-id": "",
-                "menu-item-description": "",
-                "menu-item-url": "/"
-                },
-                {
-                "menu-item-title": "Blog",
-                "hs-menu-item-custom": "blog",
-                "menu-item-db-id": 101,
-                "menu-item-object-id": "101",
-                "menu-item-object": "page",
-                "menu-item-type": "post_type",
-                "menu-item-status": "publish",
-                "menu-item-position": 2,
-                "menu-item-parent-id": "",
-                "menu-item-description": ""
-                },
-                {
-                "menu-item-title": "Contact",
-                "hs-menu-item-custom": "contact",
-                "menu-item-db-id": 103,
-                "menu-item-object-id": "103",
-                "menu-item-object": "page",
-                "menu-item-type": "post_type",
-                "menu-item-status": "publish",
-                "menu-item-position": 3,
-                "menu-item-parent-id": "",
-                "menu-item-description": ""
-                }
-            ]
-        }
-    }
-}

radcliffe-2/inc/headstart/en-parking-garage.json

@@ -1,148 +0,0 @@
-{
-    "settings": {
-        "options": {
-            "show_on_front": "page",
-            "featured-content": false,
-            "jetpack_content_post_details_categories": "",
-            "default_comment_status": "closed"
-        },
-        "theme_mods": {
-            "0": false,
-            "custom_css_post_id": -1,
-            "nav_menu_locations": {
-                "menu-1": "primary"
-            },
-            "background_color": "ffffff",
-            "colors_manager": {
-                "colors": {
-                    "bg": "#ffffff",
-                    "txt": "",
-                    "link": "#ca2017"
-                },
-                "cached": false
-            },
-            "radcliffe_2_contact_info_location": "header",
-            "radcliffe_2_contact_info_hours": "",
-            "radcliffe_2_contact_info_address": "",
-            "radcliffe_2_contact_info_phone": "",
-            "radcliffe_2_contact_info_email": "",
-            "radcliffe_2_hero_area_display": true,
-            "radcliffe_2_hero_area_title": "Summer special: $20 event parking",
-            "radcliffe_2_hero_area_content": "Park for only $20 after 5 PM between June-Sept.",
-            "radcliffe_2_hero_area_background": "https:\/\/headstartdata.files.wordpress.com\/2018\/06\/multi-storey-car-park-2705368_1920.jpg",
-            "radcliffe_2_hero_area_button_text": "Get directions",
-            "radcliffe_2_hero_area_button_url": "\/contact",
-            "header_image": "remove-header",
-            "active_style_pack": "default",
-            "custom_logo": "",
-            "logo_size": 20,
-            "radcliffe_2_hero_overlay_opacity": 50
-        },
-        "headstart": {
-            "mapped_id_options": [],
-            "mapped_id_theme_mods": [],
-            "keep_submenu_items": true
-        }
-    },
-    "content": [
-        {
-            "post_title": "Your parking garage website, powered by WordPress.com",
-            "post_content": "<p>For a starter guide to WordPress.com and to learn more about this theme go to:<\/p><p style=\"text-align: center;\"><a href=\"https:\/\/wordpress.com\/theme\/radcliffe-2\">https:\/\/wordpress.com\/theme\/radcliffe-2<\/a><\/p><p>You're now ready to make the text on this page your own. Open the page editor by clicking on the <strong>‘Edit’<\/strong> button 👇below to change the text on this page.<\/p>",
-            "post_excerpt": "",
-            "post_status": "publish",
-            "menu_order": 1,
-            "comment_status": "closed",
-            "ping_status": "closed",
-            "post_type": "page",
-            "hs_custom_meta": "_hs_front_page",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "page_template": "default",
-            "hs_old_id": 100
-        },
-        {
-            "post_title": "Blog",
-            "post_content": "This is the page where users will find your site's blog",
-            "post_status": "publish",
-            "menu_order": 2,
-            "comment_status": "closed",
-            "ping_status": "closed",
-            "post_type": "page",
-            "hs_custom_meta": "_hs_blog_page",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "hs_old_id": 101
-        },
-        {
-            "post_title": "The Journey Begins",
-            "post_content": "Thanks for joining me! <blockquote>Good company in a journey makes the way seem shorter. — Izaak Walton<\/blockquote><img class=\"wp-image-7 size-full\" src=\"https://twentysixteendemo.files.wordpress.com/2015/11/post.png\" alt=\"post\" width=\"1000\" height=\"563\" \/>",
-            "post_status": "publish",
-            "menu_order": 3,
-            "comment_status": "open",
-            "ping_status": "open",
-            "post_type": "post",
-            "hs_custom_meta": "_hs_first_post",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "hs_old_id": 102,
-            "attachment_url": "https:\/\/headstartdata.files.wordpress.com\/2018\/06\/ford-2705402_1920.jpg"
-        },
-                {
-            "post_title": "Contact",
-            "post_content": "[contact-form][contact-field label=\"Name\" type=\"name\" required=\"1\"\/][contact-field label=\"Email\" type=\"email\" required=\"1\"\/][contact-field label=\"Comment\" type=\"textarea\" required=\"1\"\/][\/contact-form]",
-            "post_status": "publish",
-            "menu_order": 4,
-            "comment_status": "closed",
-            "ping_status": "closed",
-            "post_type": "page",
-            "hs_custom_meta": "_hs_contact_page",
-            "hs_sharing": 0,
-            "hs_like_status": 0,
-            "attachment_url": "https:\/\/headstartdata.files.wordpress.com\/2018\/06\/auto-automobile-automotive-257345.jpg",
-            "hs_old_id": 103
-        }
-    ],
-    "menus": {
-        "primary": {
-            "name": "Primary",
-            "items": [
-                {
-                "menu-item-title": "Home",
-                "menu-item-db-id": 100,
-                "menu-item-object-id": "100",
-                "menu-item-object": "page",
-                "menu-item-type": "custom",
-                "menu-item-status": "publish",
-                "menu-item-position": 1,
-                "menu-item-parent-id": "",
-                "menu-item-description": "",
-                "menu-item-url": "/"
-                },
-                {
-                "menu-item-title": "Blog",
-                "hs-menu-item-custom": "blog",
-                "menu-item-db-id": 101,
-                "menu-item-object-id": "101",
-                "menu-item-object": "page",
-                "menu-item-type": "post_type",
-                "menu-item-status": "publish",
-                "menu-item-position": 2,
-                "menu-item-parent-id": "",
-                "menu-item-description": ""
-                },
-                {
-                "menu-item-title": "Contact",
-                "hs-menu-item-custom": "contact",
-                "menu-item-db-id": 103,
-                "menu-item-object-id": "103",
-                "menu-item-object": "page",
-                "menu-item-type": "post_type",
-                "menu-item-status": "publish",
-                "menu-item-position": 3,
-                "menu-item-parent-id": "",
-                "menu-item-description": ""
-                }
-            ]
-        }
-    }
-}

radcliffe-2/inc/jetpack.php

@@ -19,7 +19,7 @@ function radcliffe_2_jetpack_setup() {
 		'container'      => 'main',
 		'render'         => 'radcliffe_2_infinite_scroll_render',
 		'footer'         => 'page',
-		'wrapper'         => false,
+		'wrapper'        => false,
 		'footer_widgets' => array( 'sidebar-1', 'sidebar-2', 'sidebar-3' ),
 	) );
 
@@ -56,27 +56,14 @@ 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' ) && ( 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' ) && ( 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' ) && ( 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,7 +41,6 @@ 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' );
@@ -318,29 +317,6 @@ 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,7 +166,23 @@ add_color_rule( 'extra', '#ffffff', array(
 			.post-navigation a span,
 			.posts-navigation a,
 			.comment-header cite,
-			.comment-header span a', 'color', 'bg', 3 ),
+			.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 ),
 
 	array( '.blog .entry-title a,
 			.blog .entry-title a:visited,
@@ -257,6 +273,9 @@ add_color_rule( 'extra', '#222222', array(
 			.contact-info-area a,
 			body,
 			button,
+			input,
+			select,
+			textarea,
 			th', 'color', 'bg' ),
 
 	array( '.button,
@@ -356,11 +375,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 article .entry-header:hover,
+	array( '.archive .entry-header:hover,
 			.archive article:nth-of-type(even) .entry-header:hover,
-			.blog article .entry-header:hover,
+			.blog .entry-header:hover,
 			.blog  article:nth-of-type(even) .entry-header:hover,
-			.search-results article .entry-header:hover,
+			.search-results .entry-header:hover,
 			.search-results  article:nth-of-type(even) .entry-header:hover', 'background-color', 0.75 ),
 
 	array( '.comments-area,

radcliffe-2/rtl.css

@@ -9,6 +9,7 @@ https://codex.wordpress.org/Right-to-Left_Language_Support
 
 */
 
+
 body {
 	direction: rtl;
 	unicode-bidi: embed;
@@ -54,8 +55,8 @@ th {
 
 /* Small menu. */
 .menu-toggle .icon {
-	margin-left: 6px;
-	margin-right: 0;
+	margin-left: 0;
+	margin-right: 6px;
 }
 
 /* Jetpack social menu */
@@ -169,7 +170,6 @@ th {
 /*--------------------------------------------------------------
 ## Comments
 --------------------------------------------------------------*/
-
 .comments .children {
 	margin-left: 0;
 	margin-right: 5%;
@@ -215,7 +215,6 @@ ol.children ol.children {
 /*--------------------------------------------------------------
 # Infinite scroll
 --------------------------------------------------------------*/
-
 #infinite-handle span {
 	float: right;
 }
@@ -226,6 +225,10 @@ ol.children ol.children {
 
 @media all and  (max-width: 768px) {
 
+	.menu-toggle {
+		margin: 0 4% 40px 0;
+	}
+
 	.dropdown-toggle {
 		left: 6px;
 		right: auto;
@@ -241,7 +244,6 @@ ol.children ol.children {
 }
 
 @media all and (min-width: 600px) {
-
 	.jetpack-social-navigation {
 		margin-right: 0;
 	}
@@ -288,7 +290,6 @@ ol.children ol.children {
 }
 
 @media screen and (min-width: 768px) {
-
 	.contact-info-area span.contact-info-label {
 		right: auto;
 	}

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.4-wpcom
+Version: 2.0.2-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: radcliffe-2
@@ -1487,9 +1487,9 @@ textarea {
 	background: rgba(0, 0, 0, 0.6);
 }
 
-.archive article .entry-header:hover,
-.blog article .entry-header:hover,
-.search-results article .entry-header:hover {
+.archive .entry-header:hover,
+.blog .entry-header:hover,
+.search-results .entry-header:hover {
 	background: rgba(0, 0, 0, 0.75);
 }
 
@@ -1779,6 +1779,7 @@ textarea {
 	font-size: 24px;
 	font-size: 2.4rem;
 	font-weight: 700;
+	letter-spacing: 1;
 	margin-bottom: 36px;
 	text-align: center;
 }
@@ -2170,8 +2171,8 @@ object {
 		position: relative;
 		width: 100%;
 		-webkit-transition: max-height 0.425s ease-in-out;
-		-moz-transition: max-height 0.425s ease-in-out;
-		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;
 	}
 
 	.main-navigation.toggled > div {
@@ -2691,6 +2692,6 @@ object {
 	.site-branding .custom-logo {
 		height: auto;
 		max-width: 90vw;
-		max-height: 1000%;
+		max-height: auto;
 	}
 }

radcliffe-2/woocommerce-rtl.css

@@ -1,338 +0,0 @@
-/*
- * 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,11 +32,10 @@
 
 .woocommerce .site-main {
 	text-align: center;
-	margin-bottom: 3em;
 }
 
 .woocommerce .site-main .products {
-	margin: 0 auto;
+	margin: 3em auto;
 	max-width: 92%;
 }
 
@@ -50,14 +49,10 @@
 .woocommerce .site-main > .woocommerce-message {
 	margin-left: auto;
 	margin-right: auto;
-	max-width: 740px;
+	max-width: 84%;
 	padding: 20px 10px;
-	text-align: left;
-	width: 92%;
-}
-
-.woocommerce .site-main > .woocommerce-message .button {
-	float: right;
+	text-align: center;
+	width: 740px;
 }
 
 .woocommerce-products-header {
@@ -74,7 +69,7 @@
 	display: flex;
 	flex-wrap: wrap;
 	justify-content: space-between;
-	margin: 0 auto 3em;
+	margin: 0 auto;
 	max-width: 92%;
 	text-align: left;
 	width: 1300px;
@@ -122,15 +117,7 @@ table.shop_table_responsive tbody th {
 }
 
 table.shop_table_responsive tr td {
-	display:block;
-	text-align:right;
-	clear:both
-}
-
-table.shop_table_responsive tr td::before{
-	content: attr(data-title) ": ";
-	font-weight: 600;
-	float: left;
+	clear: both;
 }
 
 table.shop_table_responsive thead th,
@@ -141,7 +128,7 @@ table.shop_table_responsive tbody tr {
 table.shop_table_responsive thead th .quantity .qty,
 table.shop_table_responsive tbody tr .quantity .qty {
 	font-size: 1em;
-	width: 3em;
+	width: 2em;
 }
 
 table.shop_table_responsive tr td.product-thumbnail a {
@@ -149,17 +136,9 @@ table.shop_table_responsive tr td.product-thumbnail a {
 }
 
 table.shop_table_responsive tr td.product-remove a {
-	font-size: 1.5em;
 	text-align: left;
 }
 
-table.shop_table_responsive tr td.product-remove {
-	background: transparent;
-	border-top: 1.618em solid transparent;
-	padding: 0;
-	position: relative;
-}
-
 table.shop_table_responsive tr td.product-remove:before {
 	display: none;
 }
@@ -174,29 +153,13 @@ table.shop_table_responsive tr td.download-actions .button {
 	text-align: center;
 }
 
-table.shop_table_responsive.my_account_orders .order-actions{
-	text-align: right;
-}
-
-table.shop_table_responsive.my_account_orders .order-actions::before{
-	display: none;
-}
-
 table.shop_table_responsive tbody .coupon {
-	padding-bottom: 1em;
-	margin-bottom: 1em;
-	border-bottom: 1px solid #ddd;
+	margin-bottom: 18px;
 }
 
 table.shop_table_responsive tbody .coupon #coupon_code {
-	display: block;
-	font-size: 0.9em;
-	margin-top: 1em;
-	width: 100%;
-}
-
-table.shop_table_responsive tbody .coupon .button {
-	margin-top: 1em;
+	font-size: 1em;
+	width: 5em;
 }
 
 @media screen and (min-width: 768px) {
@@ -209,29 +172,10 @@ table.shop_table_responsive tbody .coupon .button {
 		text-align: right;
 	}
 
-	table.shop_table_responsive tr td::before {
-		display: none;
-	}
-
 	table.shop_table_responsive tr td.product-thumbnail {
 		width: 100px;
 	}
 
-	table.shop_table_responsive tr td.product-remove {
-		border-top: 0;
-		border-bottom: 1px solid #eee;
-		display: table-cell;
-		text-align: center;
-	}
-
-	table tbody > tr:nth-child(2n+1) > td.product-remove {
-		background: #f9f9f9;
-	}
-
-	table.shop_table_responsive tr td.product-remove a {
-		font-size: 1em;
-	}
-
 	table.shop_table_responsive tbody th {
 		display: table-cell;
 	}
@@ -243,22 +187,14 @@ table.shop_table_responsive tbody .coupon .button {
 	}
 
 	table.shop_table_responsive tbody .coupon {
-		border-bottom: 0;
 		float: left;
 		margin-bottom: 0;
-		padding-bottom: 0;
 	}
 
 	table.shop_table_responsive tbody .coupon #coupon_code {
-		display: inline-block;
-		margin-top: 0;
 		width: auto;
 	}
 
-	table.shop_table_responsive tbody .coupon .button {
-		margin-top: 0;
-	}
-
 	table.shop_table_responsive tbody input[name="update_cart"] {
 		float: right;
 	}
@@ -302,21 +238,18 @@ ul.products li.product a {
 
 ul.products li.product a.added_to_cart {
 	background: #ca2017;
-	border-radius: 3px;
-	color: #fff;
-	display: inline-block;
+    border-radius: 3px;
+    color: #fff;
 	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif;
 	font-size: 14px;
-	font-size: 1.4rem;
-	line-height: 1.29;
-	margin-left: 6px;
-	padding: 9px 14px;
+    font-size: 1.4rem;
+    line-height: 1;
+    margin-left: 6px;
+    padding: 10px 14px;
 }
-
 ul.products li.product a.added_to_cart:hover {
 	background: #222;
 }
-
 ul.products li.product .woocommerce-loop-product__title {
 	color: #000;
 	font-size: 20px;
@@ -361,12 +294,11 @@ ul.products li.product .button {
 	text-align: center;
 }
 
-.infinite-scroll .woocommerce-pagination {
+.woocommerce-page #infinite-handle {
 	display: none;
 }
 
 @media screen and (min-width: 768px) {
-
 	ul.products li.product {
 		width: 22.15%;
 		float: left;
@@ -721,38 +653,6 @@ ul.products li.product .button {
 /* !Cart */
 /**/
 
-.woocommerce-cart td.actions {
-	text-align: right;
-	margin-top: 2em;
-}
-
-.woocommerce-cart td.actions label {
-	display: none;
-}
-
-.woocommerce-cart td.actions .button {
-	vertical-align: top;
-}
-
-.woocommerce-cart td.actions button[name="update_cart"] {
-	margin-bottom: 1em;
-}
-
-.woocommerce-cart .product-thumbnail {
-	float: none;
-}
-
-.woocommerce-cart .product-thumbnail::before {
-	display: none;
-}
-
-.woocommerce-cart .product-thumbnail img {
-	display: block;
-	margin: 0 auto;
-	max-width: 3.706325903em;
-	height: auto;
-}
-
 .woocommerce-cart .woocommerce > .woocommerce-message {
 	padding: 10px;
 	text-align: center;
@@ -790,10 +690,6 @@ ul.products li.product .button {
 	width: 100%;
 }
 
-.woocommerce-cart .cart-collaterals input {
-	width: 100%;
-}
-
 .woocommerce-cart .cart-collaterals .cross-sells {
 	display: none;
 }
@@ -806,22 +702,8 @@ 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 {
-		margin-top: 0em;
-	}
-
 	.woocommerce-cart [data-title="Subtotal"] {
 		width: 33%;
 	}
@@ -829,10 +711,6 @@ dl.variation p {
 	.woocommerce-cart .cart-collaterals .cross-sells {
 		display: block;
 	}
-
-	.woocommerce-cart td.actions button[name="update_cart"] {
-		margin-bottom: 0;
-	}
 }
 
 /**/
@@ -879,6 +757,7 @@ dl.variation p {
 .woocommerce #payment [for="payment_method_paypal"]>img {
 	margin-left: 40px;
 	float: right;
+	width: 40%;
 }
 
 .woocommerce #payment .payment_box p,
@@ -911,19 +790,6 @@ dl.variation p {
 	border-bottom: none;
 }
 
-.woocommerce-checkout .woocommerce-form-coupon {
-	margin-bottom: 1em;
-}
-
-.woocommerce-checkout .woocommerce-form-coupon p {
-	margin-bottom: 1em;
-	margin-top: 0;
-}
-
-.woocommerce-checkout .woocommerce-form-coupon-toggle .woocommerce-info {
-	margin-bottom: 1em;
-}
-
 .woocommerce-checkout .col-2 {
 	clear: both;
 }
@@ -932,40 +798,21 @@ dl.variation p {
 	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,
 	.col2-set .form-row-first {
 		float: left;
 		margin-right: 40px;
 	}
-
 	.woocommerce-address-fields__field-wrapper .form-row-last,
 	.col2-set .form-row-last {
 		float: right;
 		margin-right: 0;
 	}
-
 	.woocommerce-address-fields__field-wrapper .form-row-wide,
 	.col2-set .form-row-wide {
 		clear: both;
 	}
-
 	.woocommerce-address-fields__field-wrapper .form-row-first,
 	.woocommerce-address-fields__field-wrapper .form-row-last,
 	.col2-set .form-row-first,
@@ -1092,6 +939,14 @@ dl.variation p {
 	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;
@@ -1102,6 +957,11 @@ dl.variation p {
 	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 {
@@ -1323,7 +1183,6 @@ dl.variation p {
 .site-header-cart .current-menu-ancestor>a {}
 
 @media all and (max-width: 768px) {
-
 	.site-header-cart .count {
 		display: none;
 	}
@@ -1333,7 +1192,6 @@ dl.variation p {
 }
 
 @media screen and (min-width: 768px) {
-
 	.site-header-cart {
 		flex: 0 0 auto;
 		margin-bottom: 0;
@@ -1341,7 +1199,6 @@ dl.variation p {
 		text-align: right;
 		top: inherit;
 	}
-
 	.site-header-cart>li:last-of-type {}
 	.site-header-cart .widget_shopping_cart {
 		font-size: ms(-1);
@@ -1352,14 +1209,12 @@ dl.variation p {
 		top: 100%;
 		z-index: 999999;
 	}
-
 	.site-header-cart:hover .widget_shopping_cart,
 	.site-header-cart.focus .widget_shopping_cart {
 		display: block;
 		left: auto;
 		right: 0;
 	}
-
 	.site-header-cart .widget_shopping_cart_content {
 		border-radius: 6px;
 		box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2);
@@ -1372,11 +1227,9 @@ dl.variation p {
 		flex-wrap: wrap;
 		flex-flow: column;
 	}
-
 	.menu-1-empty .site-header-cart .widget_shopping_cart_content {
 		float: left;
 	}
-
 	.site-header-cart .widget_shopping_cart_content:after {
 		border: 10px solid transparent;
 		border-bottom-color: #222;
@@ -1388,62 +1241,46 @@ dl.variation p {
 		right: 60px;
 		top: 3px;
 	}
-
 	.site-header-cart .widget_shopping_cart_content .product_list_widget {
 		display: flex;
 		flex-wrap: wrap;
 		justify-content: space-evenly;
 		margin-bottom: 1em;
 	}
-
 	#site-header-cart .widget_shopping_cart_content .mini_cart_item {
 		font-weight: 400;
 		padding: 0;
-		margin-right: 6.5%;
 		text-transform: none;
 		width: 20%;
 	}
-
-	#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-right: 0;
-	}
-
 	.site-header-cart .widget_shopping_cart_content .mini_cart_item a img {
 		display: block;
 		margin: 0 auto;
 	}
-
 	.site-header-cart .widget_shopping_cart_content .mini_cart_item .remove:hover {
 		text-decoration: none;
 	}
-
 	.site-header-cart .widget_shopping_cart_content .mini_cart_item .remove {
 		font-size: 25px;
 	}
-
 	.site-header-cart .widget_shopping_cart_content .mini_cart_item .quantity {
 		display: block;
 		font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif;
 		padding: 0 12px 10px;
 	}
-
 	.site-header-cart .widget_shopping_cart_content .woocommerce-mini-cart__total {
 		font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif;
 		margin-bottom: .5em;
 		text-align: center;
 	}
-
 	.site-header-cart .widget_shopping_cart_content .woocommerce-mini-cart__buttons {
 		margin: 0;
 		text-align: center;
 	}
-
 	.site-header-cart .widget_shopping_cart_content .woocommerce-mini-cart__buttons a {
 		display: inline-block;
 		margin: 0 .5em;
 	}
-
 	.site-header-cart .cart-contents .icon {
 		display: inline;
 	}
@@ -1620,10 +1457,6 @@ p.stars.selected a:not(.active):before {
 	cursor: default;
 }
 
-.single-product div.product  .shop_attributes p {
-	margin-bottom: 0;
-}
-
 /**/
 /* !Password strength meter */
 /**/
@@ -1805,14 +1638,6 @@ ul.woocommerce-error li {
 	font-weight: 700;
 }
 
-.widget .star-rating {
-	margin: 0;
-}
-
-.woocommerce.widget img {
-	display: block;
-}
-
 /* !Product Search Widget */
 
 .woocommerce.widget_product_search .woocommerce-product-search .search-field {

rebalance/style.css

@@ -2639,7 +2639,7 @@ object {
 	text-align: center;
 }
 
-.wp-caption.aligncenter {
+.post .wp-caption.aligncenter {
 	margin: 0 auto 1.5em;
 }
 

scratchpad/inc/wpcom-colors.php

@@ -16,27 +16,7 @@ add_color_rule( 'bg', '#bdcbcc', array(
 		.post-navigation-container a:hover,
 		.page-header p,
 		.error404 .page-content > p,
-		.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 ),
+		.search-no-results .page-content > p', 'color', 'bg', 5 ),
 
 	array( 'body:not(.single) .format-audio .entry-meta,
 		body:not(.single) .format-audio .entry-meta a,
@@ -57,19 +37,6 @@ 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
@@ -128,15 +95,7 @@ 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,
-		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-content', 'color', 0.8 ),
 
 	array( 'body:not(.single) .format-aside .entry-meta,
 		body:not(.single) .format-aside .entry-meta .entry-meta,

scratchpad/style.css

@@ -1544,31 +1544,6 @@ 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
 --------------------------------------------------------------*/
@@ -3113,37 +3088,6 @@ 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,8 +52,4 @@ $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() && ! post_password_required() ) { ?>
+		if ( get_post_gallery() ) { ?>
 			<div class="entry-gallery">
 				<?php echo get_post_gallery(); ?>
 				<div class="photo-corners">
@@ -53,9 +53,4 @@
 			);
 		?>
 	</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() && ! post_password_required() ) { ?>
+	<?php if ( has_post_thumbnail() ) { ?>
 		<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 ) && ! post_password_required() ) { ?>
+	<?php } else if ( ! empty( $image ) ) { ?>
 		<div class="featured-image">
 			<a href="<?php the_permalink(); ?>"><?php echo $image[0]; ?></a>
 			<div class="photo-corners">
@@ -67,8 +67,4 @@ $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() && ! post_password_required() ) { ?>
+	<?php if ( has_post_thumbnail() ) { ?>
 		<div class="featured-image">
 			<span>
 				<?php get_template_part( 'images/inline', 'paperclip.svg' ); ?>

scratchpad/template-parts/content-video.php

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

shoreditch/inc/jetpack.php

@@ -71,7 +71,7 @@ add_action( 'after_setup_theme', 'shoreditch_jetpack_setup' );
  * Custom render function for Infinite Scroll.
  */
 function shoreditch_infinite_scroll_render() {
-	if ( class_exists( 'WooCommerce' ) && ( shoreditch_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
 		shoreditch_woocommerce_product_columns_wrapper();
 		woocommerce_product_loop_start();
 	}
@@ -80,7 +80,7 @@ function shoreditch_infinite_scroll_render() {
 		the_post();
 		if ( is_search() ) {
 			get_template_part( 'template-parts/content', 'search' );
-		} else if ( class_exists( 'WooCommerce' ) && ( shoreditch_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+		} else if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
 			wc_get_template_part( 'content', 'product' );
 		} else if ( is_post_type_archive( 'jetpack-testimonial' ) ) {
 			get_template_part( 'template-parts/content', 'testimonial' );
@@ -89,7 +89,7 @@ function shoreditch_infinite_scroll_render() {
 		}
 	}
 
-	if ( class_exists( 'WooCommerce' ) && ( shoreditch_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+	if ( class_exists( 'WooCommerce' ) && ( is_shop() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
 		woocommerce_product_loop_end();
 		shoreditch_woocommerce_product_columns_wrapper_close();
 	}

shoreditch/inc/woocommerce.php

@@ -15,18 +15,7 @@
  * @return void
  */
 function shoreditch_woocommerce_setup() {
-	add_theme_support( 'woocommerce', apply_filters( 'shoreditch_woocommerce_args', array(
-		'single_image_width'    => 580,
-		'thumbnail_image_width' => 290,
-		'product_grid'          => array(
-			'default_columns' => 2,
-			'default_rows'    => 3,
-			'min_columns'     => 1,
-			'max_columns'     => 5,
-			'min_rows'        => 1
-		)
-	) ) );
-
+	add_theme_support( 'woocommerce' );
 	add_theme_support( 'wc-product-gallery-zoom' );
 	add_theme_support( 'wc-product-gallery-lightbox' );
 	add_theme_support( 'wc-product-gallery-slider' );
@@ -76,13 +65,10 @@ add_filter( 'body_class', 'shoreditch_woocommerce_active_body_class' );
  * @return integer number of products
  */
 function shoreditch_woocommerce_products_per_page() {
-	return absint( apply_filters( 'shoreditch_woocommerce_products_per_page', 6 ) );
+	return intval( apply_filters( 'shoreditch_woocommerce_products_per_page', 6 ) );
 }
 
-// Legacy WooCommerce products per page filter.
-if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
-	add_filter( 'loop_shop_per_page', 'shoreditch_woocommerce_products_per_page' );
-}
+add_filter( 'loop_shop_per_page', 'shoreditch_woocommerce_products_per_page' );
 
 /**
  * Product gallery thumnbail columns
@@ -90,7 +76,7 @@ if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
  * @return integer number of columns
  */
 function shoreditch_woocommerce_thumbnail_columns() {
-	return absint( apply_filters( 'shoreditch_woocommerce_product_thumbnail_columns', 4 ) );
+	return intval( apply_filters( 'shoreditch_woocommerce_product_thumbnail_columns', 4 ) );
 }
 
 add_filter( 'woocommerce_product_thumbnails_columns', 'shoreditch_woocommerce_thumbnail_columns' );
@@ -101,13 +87,10 @@ add_filter( 'woocommerce_product_thumbnails_columns', 'shoreditch_woocommerce_th
  * @return integer products per row
  */
 function shoreditch_woocommerce_loop_columns() {
-	return absint( apply_filters( 'shoreditch_woocommerce_loop_columns', 2 ) );
+	return intval( apply_filters( 'shoreditch_woocommerce_loop_columns', 2 ) );
 }
 
-// Legacy WooCommerce columns filter.
-if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
-	add_filter( 'loop_shop_columns', 'shoreditch_woocommerce_loop_columns' );
-}
+add_filter( 'loop_shop_columns', 'shoreditch_woocommerce_loop_columns' );
 
 /**
  * Related Products Args
@@ -133,28 +116,13 @@ if ( ! function_exists( 'shoreditch_woocommerce_product_columns_wrapper' ) ) {
 	 * @return  void
 	 */
 	function shoreditch_woocommerce_product_columns_wrapper() {
-		$columns = shoreditch_loop_columns();
-		echo '<div class="columns-' . absint( $columns ) . '">';
+		$columns = shoreditch_woocommerce_loop_columns();
+		echo '<div class="columns-' . $columns . '">';
 	}
 }
 
 add_action( 'woocommerce_before_shop_loop', 'shoreditch_woocommerce_product_columns_wrapper', 40 );
 
-if ( ! function_exists( 'shoreditch_loop_columns' ) ) {
-	/**
-	 * Default loop columns on product archives
-	 *
-	 * @return integer products per row
-	 */
-	function shoreditch_loop_columns() {
-		$columns = 2; // 2 products per row
-		if ( function_exists( 'wc_get_default_products_per_row' ) ) {
-			$columns = wc_get_default_products_per_row();
-		}
-		return apply_filters( 'shoreditch_loop_columns', $columns );
-	}
-}
-
 if ( ! function_exists( 'shoreditch_woocommerce_product_columns_wrapper_close' ) ) {
 	/**
 	 * Product columns wrapper close
@@ -297,3 +265,35 @@ function shoreditch_woocommerce_is_shop_page() {
 
 	return $is_shop_page;
 }
+
+/**
+ * Jetpack infinite scroll duplicates posts where orderby is anything other than modified or date
+ * This filter offsets the products returned by however many are displayed per page
+ *
+ * @link https://github.com/Automattic/jetpack/issues/1135
+ * @param  array $args infinite scroll args.
+ * @return array       infinite scroll args.
+ */
+function shoreditch_woocommerce_jetpack_duplicate_products( $args ) {
+	if ( ( isset( $args['post_type'] ) && 'product' === $args['post_type'] ) || ( isset( $args['taxonomy'] ) && 'product_cat' === $args['taxonomy'] ) ) {
+		$args['offset'] = $args['posts_per_page'] * $args['paged'];
+	}
+
+ 	return $args;
+}
+add_filter( 'infinite_scroll_query_args', 'shoreditch_woocommerce_jetpack_duplicate_products', 100 );
+
+/**
+ * Override number of products per page in Jetpack infinite scroll.
+ *
+ * @param  array $args infinite scroll args.
+ * @return array       infinite scroll args.
+ */
+function shoreditch_woocommerce_jetpack_products_per_page( $args ) {
+	if ( is_array( $args ) && ( shoreditch_woocommerce_is_shop_page() || is_product_taxonomy() || is_product_category() || is_product_tag() ) ) {
+		$args['posts_per_page'] = shoreditch_woocommerce_products_per_page();
+	}
+
+	return $args;
+}
+add_filter( 'infinite_scroll_settings', 'shoreditch_woocommerce_jetpack_products_per_page' );

shoreditch/style.css

@@ -4,7 +4,7 @@ Theme URI: https://wordpress.com/themes/shoreditch/
 Author: Automattic
 Author URI: https://wordpress.com/themes/
 Description: Shoreditch is a functional and responsive theme perfect for your business’s online presence. Although its main purpose is business, Shoreditch looks great as a personal blog theme too.
-Version: 1.2.4-wpcom
+Version: 1.2.3-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: shoreditch

shoreditch/woocommerce-rtl.css

@@ -106,14 +106,6 @@ table.cart .coupon {
   .cart-collaterals .wc-proceed-to-checkout {
     text-align: left; }
 
-dl.variation {
-  font-size: .875em;
-  margin: .875em 0 0 0; }
-
-dl.variation dd,
-dl.variation p {
-  margin: 0; }
-
 /**
  * Attributes table
  */

shoreditch/woocommerce.css

@@ -106,14 +106,6 @@ table.cart .coupon {
   .cart-collaterals .wc-proceed-to-checkout {
     text-align: right; }
 
-dl.variation {
-  font-size: .875em;
-  margin: .875em 0 0 0; }
-
-dl.variation dd,
-dl.variation p {
-  margin: 0; }
-
 /**
  * Attributes table
  */

sketch/js/jquery.flexslider.js

@@ -1,29 +1,23 @@
 /*
- * jQuery FlexSlider v2.7.1
+ * jQuery FlexSlider v2.5.0
  * Copyright 2012 WooThemes
  * Contributing Author: Tyler Smith
  */
 ;
 (function ($) {
 
-  var focused = true;
-
   //FlexSlider: Object Instance
   $.flexslider = function(el, options) {
     var slider = $(el);
 
     // making variables public
-
-    //if rtl value was not passed and html is in rtl..enable it by default.
-    if(typeof options.rtl=='undefined' && $('html').attr('dir')=='rtl'){
-      options.rtl=true;
-    }
     slider.vars = $.extend({}, $.flexslider.defaults, options);
 
     var namespace = slider.vars.namespace,
         msGesture = window.navigator && window.navigator.msPointerEnabled && window.MSGesture,
         touch = (( "ontouchstart" in window ) || msGesture || window.DocumentTouch && document instanceof DocumentTouch) && slider.vars.touch,
-        // deprecating this idea, as devices are being released with both of these events
+        // depricating this idea, as devices are being released with both of these events
+        //eventType = (touch) ? "touchend" : "click",
         eventType = "click touchend MSPointerUp keyup",
         watchedEvent = "",
         watchedEventClearTimer,
@@ -32,7 +26,8 @@
         carousel = (slider.vars.itemWidth > 0),
         fade = slider.vars.animation === "fade",
         asNav = slider.vars.asNavFor !== "",
-        methods = {};
+        methods = {},
+        focused = true;
 
     // Store a reference to the slider object
     $.data(el, "flexslider", slider);
@@ -54,7 +49,7 @@
         slider.syncExists = $(slider.vars.sync).length > 0;
         // SLIDE:
         if (slider.vars.animation === "slide") { slider.vars.animation = "swing"; }
-        slider.prop = (vertical) ? "top" : ( slider.vars.rtl ? "marginRight" : "marginLeft" );
+        slider.prop = (vertical) ? "top" : "marginLeft";
         slider.args = {};
         // SLIDESHOW:
         slider.manualPause = false;
@@ -75,7 +70,6 @@
           }
           return false;
         }());
-        slider.isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
         slider.ensureAnimationEnd = '';
         // CONTROLSCONTAINER:
         if (slider.vars.controlsContainer !== "") slider.controlsContainer = $(slider.vars.controlsContainer).length > 0 && $(slider.vars.controlsContainer);
@@ -107,14 +101,8 @@
           $(document).bind('keyup', function(event) {
             var keycode = event.keyCode;
             if (!slider.animating && (keycode === 39 || keycode === 37)) {
-              var target = (slider.vars.rtl?
-                                ((keycode === 37) ? slider.getTarget('next') :
-                                (keycode === 39) ? slider.getTarget('prev') : false)
-                                :
-                                ((keycode === 39) ? slider.getTarget('next') :
-                                (keycode === 37) ? slider.getTarget('prev') : false)
-                                )
-                                ;
+              var target = (keycode === 39) ? slider.getTarget('next') :
+                           (keycode === 37) ? slider.getTarget('prev') : false;
               slider.flexAnimate(target, slider.vars.pauseOnAction);
             }
           });
@@ -177,15 +165,8 @@
                 e.preventDefault();
                 var $slide = $(this),
                     target = $slide.index();
-                var posFromX;
-                if(slider.vars.rtl){
-                  posFromX = -1*($slide.offset().right - $(slider).scrollLeft()); // Find position of slide relative to right of slider container
-                }
-                else
-                {
-                  posFromX = $slide.offset().left - $(slider).scrollLeft(); // Find position of slide relative to left of slider container
-                }
-                if( posFromX <= 0 && $slide.hasClass( namespace + 'active-slide' ) ) {
+                var posFromLeft = $slide.offset().left - $(slider).scrollLeft(); // Find position of slide relative to left of slider container
+                if( posFromLeft <= 0 && $slide.hasClass( namespace + 'active-slide' ) ) {
                   slider.flexAnimate(slider.getTarget("prev"), true);
                 } else if (!$(slider.vars.asNavFor).data('flexslider').animating && !$slide.hasClass(namespace + "active-slide")) {
                   slider.direction = (slider.currentItem < target) ? "next" : "prev";
@@ -236,9 +217,7 @@
           if (slider.pagingCount > 1) {
             for (var i = 0; i < slider.pagingCount; i++) {
               slide = slider.slides.eq(i);
-              if ( undefined === slide.attr( 'data-thumb-alt' ) ) { slide.attr( 'data-thumb-alt', '' ); }
-              var altText = ( '' !== slide.attr( 'data-thumb-alt' ) ) ? altText = ' alt="' + slide.attr( 'data-thumb-alt' ) + '"' : '';
-              item = (slider.vars.controlNav === "thumbnails") ? '<img src="' + slide.attr( 'data-thumb' ) + '"' + altText + '/>' : '<a href="#">' + j + '</a>';
+              item = (slider.vars.controlNav === "thumbnails") ? '<img src="' + slide.attr( 'data-thumb' ) + '"/>' : '<a>' + j + '</a>';
               if ( 'thumbnails' === slider.vars.controlNav && true === slider.vars.thumbCaptions ) {
                 var captn = slide.attr( 'data-thumbcaption' );
                 if ( '' !== captn && undefined !== captn ) { item += '<span class="' + namespace + 'caption">' + captn + '</span>'; }
@@ -308,7 +287,7 @@
         },
         update: function(action, pos) {
           if (slider.pagingCount > 1 && action === "add") {
-            slider.controlNavScaffold.append($('<li><a href="#">' + slider.count + '</a></li>'));
+            slider.controlNavScaffold.append($('<li><a>' + slider.count + '</a></li>'));
           } else if (slider.pagingCount === 1) {
             slider.controlNavScaffold.find('li').remove();
           } else {
@@ -371,7 +350,7 @@
       },
       pausePlay: {
         setup: function() {
-          var pausePlayScaffold = $('<div class="' + namespace + 'pauseplay"><a href="#"></a></div>');
+          var pausePlayScaffold = $('<div class="' + namespace + 'pauseplay"><a></a></div>');
 
           // CONTROLSCONTAINER:
           if (slider.controlsContainer) {
@@ -447,6 +426,7 @@
                          (reverse) ? (slider.last - slider.currentSlide + slider.cloneOffset) * cwidth : (slider.currentSlide + slider.cloneOffset) * cwidth;
                 startX = (vertical) ? localY : localX;
                 startY = (vertical) ? localX : localY;
+
                 el.addEventListener('touchmove', onTouchMove, false);
                 el.addEventListener('touchend', onTouchEnd, false);
               }
@@ -458,8 +438,9 @@
               localX = e.touches[0].pageX;
               localY = e.touches[0].pageY;
 
-              dx = (vertical) ? startX - localY : (slider.vars.rtl?-1:1)*(startX - localX);
+              dx = (vertical) ? startX - localY : startX - localX;
               scrolling = (vertical) ? (Math.abs(dx) < Math.abs(localX - startY)) : (Math.abs(dx) < Math.abs(localY - startY));
+
               var fxms = 500;
 
               if ( ! scrolling || Number( new Date() ) - startT > fxms ) {
@@ -536,7 +517,7 @@
 
                 //Accumulate translations.
                 accDx = accDx + ((vertical) ? transY : transX);
-                dx = (slider.vars.rtl?-1:1)*accDx;
+                dx = accDx;
                 scrolling = (vertical) ? (Math.abs(accDx) < Math.abs(-transX)) : (Math.abs(accDx) < Math.abs(-transY));
 
                 if(e.detail === e.MSGESTURE_FLAG_INERTIA){
@@ -609,7 +590,7 @@
       smoothHeight: function(dur) {
         if (!vertical || fade) {
           var $obj = (fade) ? slider : slider.viewport;
-          (dur) ? $obj.animate({"height": slider.slides.eq(slider.animatingTo).innerHeight()}, dur) : $obj.innerHeight(slider.slides.eq(slider.animatingTo).innerHeight());
+          (dur) ? $obj.animate({"height": slider.slides.eq(slider.animatingTo).height()}, dur) : $obj.height(slider.slides.eq(slider.animatingTo).height());
         }
       },
       sync: function(action) {
@@ -756,6 +737,7 @@
 
           // INFINITE LOOP / REVERSE:
           if (carousel) {
+            //margin = (slider.vars.itemWidth > slider.w) ? slider.vars.itemMargin * 2 : slider.vars.itemMargin;
             margin = slider.vars.itemMargin;
             calcNext = ((slider.itemW + margin) * slider.move) * slider.animatingTo;
             slideString = (calcNext > slider.limit && slider.visible !== 1) ? slider.limit : calcNext;
@@ -793,8 +775,12 @@
           }
         } else { // FADE:
           if (!touch) {
+            //slider.slides.eq(slider.currentSlide).fadeOut(slider.vars.animationSpeed, slider.vars.easing);
+            //slider.slides.eq(target).fadeIn(slider.vars.animationSpeed, slider.vars.easing, slider.wrapup);
+
             slider.slides.eq(slider.currentSlide).css({"zIndex": 1}).animate({"opacity": 0}, slider.vars.animationSpeed, slider.vars.easing);
             slider.slides.eq(target).css({"zIndex": 2}).animate({"opacity": 1}, slider.vars.animationSpeed, slider.vars.easing, slider.wrapup);
+
           } else {
             slider.slides.eq(slider.currentSlide).css({ "opacity": 0, "zIndex": 1 });
             slider.slides.eq(target).css({ "opacity": 1, "zIndex": 2 });
@@ -891,15 +877,11 @@
               }
             }());
 
-            return (posCalc * ((slider.vars.rtl)?1:-1)) + "px";
+            return (posCalc * -1) + "px";
           }());
 
       if (slider.transitions) {
-        if (slider.isFirefox) {
-          target = (vertical) ? "translate3d(0," + target + ",0)" : "translate3d(" + (parseInt(target)+'px') + ",0,0)";
-        } else {
-          target = (vertical) ? "translate3d(0," + target + ",0)" : "translate3d(" + ((slider.vars.rtl?-1:1)*parseInt(target)+'px') + ",0,0)";
-        }
+        target = (vertical) ? "translate3d(0," + target + ",0)" : "translate3d(" + target + ",0,0)";
         dur = (dur !== undefined) ? (dur/1000) + "s" : "0s";
         slider.container.css("-" + slider.pfx + "-transition-duration", dur);
          slider.container.css("transition-duration", dur);
@@ -954,28 +936,13 @@
           slider.setProps(sliderOffset * slider.computedW, "init");
           setTimeout(function(){
             slider.doMath();
-          if(slider.vars.rtl){
-            if (slider.isFirefox) {
-              slider.newSlides.css({"width": slider.computedW, "marginRight" : slider.computedM, "float": "right", "display": "block"});
-            } else {
-              slider.newSlides.css({"width": slider.computedW, "marginRight" : slider.computedM, "float": "left", "display": "block"});
-            }
-              
-           }
-            else{
-              slider.newSlides.css({"width": slider.computedW, "marginRight" : slider.computedM, "float": "left", "display": "block"});
-            }
+            slider.newSlides.css({"width": slider.computedW, "float": "left", "display": "block"});
             // SMOOTH HEIGHT:
             if (slider.vars.smoothHeight) { methods.smoothHeight(); }
           }, (type === "init") ? 100 : 0);
         }
       } else { // FADE:
-        if(slider.vars.rtl){
-          slider.slides.css({"width": "100%", "float": 'right', "marginLeft": "-100%", "position": "relative"});
-        }
-        else{
-          slider.slides.css({"width": "100%", "float": 'left', "marginRight": "-100%", "position": "relative"});
-        }
+        slider.slides.css({"width": "100%", "float": "left", "marginRight": "-100%", "position": "relative"});
         if (type === "init") {
           if (!touch) {
             //slider.slides.eq(slider.currentSlide).fadeIn(slider.vars.animationSpeed, slider.vars.easing);
@@ -1006,14 +973,12 @@
           maxItems = slider.vars.maxItems;
 
       slider.w = (slider.viewport===undefined) ? slider.width() : slider.viewport.width();
-      if (slider.isFirefox) { slider.w = slider.width(); }
       slider.h = slide.height();
       slider.boxPadding = slide.outerWidth() - slide.width();
 
       // CAROUSEL:
       if (carousel) {
         slider.itemT = slider.vars.itemWidth + slideMargin;
-        slider.itemM = slideMargin;
         slider.minW = (minItems) ? minItems * slider.itemT : slider.w;
         slider.maxW = (maxItems) ? (maxItems * slider.itemT) - slideMargin : slider.w;
         slider.itemW = (slider.minW > slider.w) ? (slider.w - (slideMargin * (minItems - 1)))/minItems :
@@ -1028,12 +993,10 @@
                        (slider.vars.itemWidth > slider.w) ? (slider.itemW * (slider.count - 1)) + (slideMargin * (slider.count - 1)) : ((slider.itemW + slideMargin) * slider.count) - slider.w - slideMargin;
       } else {
         slider.itemW = slider.w;
-        slider.itemM = slideMargin;
         slider.pagingCount = slider.count;
         slider.last = slider.count - 1;
       }
       slider.computedW = slider.itemW - slider.boxPadding;
-      slider.computedM = slider.itemM;
     };
 
     slider.update = function(pos, action) {
@@ -1150,7 +1113,7 @@
     // Usability features
     pauseOnAction: true,            //Boolean: Pause the slideshow when interacting with control elements, highly recommended.
     pauseOnHover: false,            //Boolean: Pause the slideshow when hovering over slider, then resume when no longer hovering
-    pauseInvisible: true,       //{NEW} Boolean: Pause the slideshow when tab is invisible, resume when visible. Provides better UX, lower CPU usage.
+    pauseInvisible: true,   		//{NEW} Boolean: Pause the slideshow when tab is invisible, resume when visible. Provides better UX, lower CPU usage.
     useCSS: true,                   //{NEW} Boolean: Slider will use CSS3 transitions if available
     touch: true,                    //{NEW} Boolean: Allow touch swipe navigation of the slider on touch-enabled devices
     video: false,                   //{NEW} Boolean: If using video in the slider, will prevent CSS3 3D Transforms to avoid graphical glitches
@@ -1184,9 +1147,6 @@
     move: 0,                        //{NEW} Integer: Number of carousel items that should move on animation. If 0, slider will move all visible items.
     allowOneSlide: true,           //{NEW} Boolean: Whether or not to allow a slider comprised of a single slide
 
-    // Browser Specific
-    isFirefox: false,             // {NEW} Boolean: Set to true when Firefox is the browser used.
-
     // Callback API
     start: function(){},            //Callback: function(slider) - Fires when the slider loads the first slide
     before: function(){},           //Callback: function(slider) - Fires asynchronously with each slider animation
@@ -1194,8 +1154,7 @@
     end: function(){},              //Callback: function(slider) - Fires when the slider reaches the last slide (asynchronous)
     added: function(){},            //{NEW} Callback: function(slider) - Fires after a slide is added
     removed: function(){},           //{NEW} Callback: function(slider) - Fires after a slide is removed
-    init: function() {},             //{NEW} Callback: function(slider) - Fires after the slider is initially setup
-  rtl: false             //{NEW} Boolean: Whether or not to enable RTL mode
+    init: function() {}             //{NEW} Callback: function(slider) - Fires after the slider is initially setup
   };
 
   //FlexSlider: Plugin Function
@@ -1208,7 +1167,7 @@
             selector = (options.selector) ? options.selector : ".slides > li",
             $slides = $this.find(selector);
 
-      if ( ( $slides.length === 1 && options.allowOneSlide === false ) || $slides.length === 0 ) {
+      if ( ( $slides.length === 1 && options.allowOneSlide === true ) || $slides.length === 0 ) {
           $slides.fadeIn(400);
           if (options.start) { options.start($this); }
         } else if ($this.data('flexslider') === undefined) {

sketch/rtl.css

@@ -193,15 +193,6 @@ 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,30 +1827,6 @@ 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,
@@ -2176,10 +2152,6 @@ div.sharedaddy div.sd-block {
   -webkit-backface-visibility: hidden;
 }
 
-.flexslider .slides > li:only-child {
-  display: block;
-}
-
 .flexslider .slides img {
   width: 100%;
   display: block;
@@ -2394,7 +2366,7 @@ div.sharedaddy div.sd-block {
   }
 
   .project-navigation-wrapper .jetpack-portfolio,
-  .page-template-portfolio-page-php .projects .jetpack-portfolio,
+  .page-template-portfolio-page-php .jetpack-portfolio,
   body[class*="jetpack-portfolio"].archive .jetpack-portfolio {
     border: 0;
     float: left;

textbook/style.css

@@ -4720,19 +4720,15 @@ body {
 }
 
 .widget_goodreads > div > div > div {
-  box-sizing: content-box;
   position: relative;
-  margin: 0 0 1.65em !important;
-}
-
-.widget_goodreads > div > div > div[class$="currently_reading"],
-.widget_goodreads > div > div > div[class$="to_read"] {
-  margin: 0 !important;
+  margin: 0 0 1.65em;
+  padding: 0 16.2px 1.65em;
 }
 
 .widget_goodreads > div > div > div:before {
   content: "";
   position: absolute;
+  border-bottom: 1px solid #cfccc7;
   bottom: 0;
   height: 0;
   left: 0;
@@ -4742,6 +4738,7 @@ body {
 .widget_goodreads > div > div > div:last-of-type {
   margin-bottom: 0;
 }
+
 .widget_goodreads > div > div > div div[class^="gr_custom_book_container"] {
   float: left;
   margin-right: 27px;