Merge branch 'release/1.17.2'

siteorigin · Apr 25, 2021 · 774e21b · 774e21b
2 parents adcfde8 + 66ad537
commit 774e21b
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 74 deletions.
diff --git a/css/woocommerce.css b/css/woocommerce.css
@@ -205,6 +205,9 @@
   background: -o-linear-gradient(#0fc0ff, #00b5fa);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0fc0ff', endColorstr='#00b5fa', GradientType=0);
 }
+.woocommerce .shop_table .quantity .qty {
+  width: 4.5em;
+}
 .woocommerce .shop_table .actions .button {
   padding-top: 7px;
   padding-bottom: 7px;

diff --git a/functions.php b/functions.php
@@ -352,7 +352,7 @@ function vantage_scripts() {
 	wp_enqueue_script( 'jquery-touchswipe' , get_template_directory_uri() . '/js/jquery.touchSwipe' . SITEORIGIN_THEME_JS_PREFIX . '.js' , array( 'jquery' ), '1.6.6', $in_footer );
 	wp_enqueue_script( 'vantage-main' , get_template_directory_uri() . '/js/jquery.theme-main' . SITEORIGIN_THEME_JS_PREFIX . '.js', array( 'jquery' ), SITEORIGIN_THEME_VERSION, $in_footer );
 
-	if ( ! ( function_exists( 'has_blocks' ) && has_blocks() ) && siteorigin_setting( 'layout_fitvids' ) ) {
+	if ( siteorigin_setting( 'layout_fitvids' ) ) {
 		wp_enqueue_script( 'jquery-fitvids' , get_template_directory_uri() . '/js/jquery.fitvids' . SITEORIGIN_THEME_JS_PREFIX . '.js' , array('jquery'), '1.0', $in_footer );
 	}
 

diff --git a/inc/customizer.php b/inc/customizer.php
@@ -55,13 +55,13 @@ function vantage_customizer_init(){
 				'type' => 'font',
 				'title' => __('Site Title Font', 'vantage'),
 				'default' => 'Helvetica Neue',
-				'selector' => '#masthead h1',
+				'selector' => '#masthead.site-header .hgroup h1',
 			),
 			'heading_font' => array(
 				'type' => 'font',
 				'title' => __('Heading Font', 'vantage'),
 				'default' => 'Helvetica Neue',
-				'selector' => 'h1,h2,h3,h4,h5,h6',
+				'selector' => '#page-wrapper h1,#page-wrapper h2,#page-wrapper h3,#page-wrapper h4,#page-wrapper h5,#page-wrapper h6',
 			),
 			'menu_font' => array(
 				'type' => 'font',

diff --git a/inc/customizer/customizer.php b/inc/customizer/customizer.php
@@ -177,13 +177,16 @@ function add_web_font( $selector, $mod ) {
 		}
 
 		$this->add_css( $selector, 'font-family', $family );
-		if ( $variant != 400 ) $this->add_css( $selector, 'font-weight', $variant );
-
-		$this->fonts[ ] = $font;
-
-		if ( !empty( $variant ) ) {
-			if ( $variant == 'regular' ) $variant = '400';
-			$this->css[ $selector ][ ] = 'font-weight: ' . $variant;
+		if ( ! empty( $variant ) ) {
+			if ( $variant != 400 && $variant != 'regular' ) {
+				if ( ! is_numeric( $variant ) ) {
+					$variant = filter_var( $variant, FILTER_SANITIZE_NUMBER_INT );
+					$this->add_css( $selector, 'font-style', 'italic' );
+				}
+				$this->add_css( $selector, 'font-weight', $variant );
+			} else {
+				$this->add_css( $selector, 'font-weight', 400 );
+			}
 		}
 	}
 

diff --git a/inc/settings b/inc/settings
diff --git a/less/css/woocommerce.less b/less/css/woocommerce.less
@@ -171,9 +171,17 @@
 
 	}
 
-	.shop_table .actions .button {
-		padding-top: 7px;
-		padding-bottom: 7px;
+	// Cart.
+	.shop_table {
+
+		.quantity .qty {
+			width: 4.5em;
+		}
+
+		.actions .button {
+			padding-top: 7px;
+			padding-bottom: 7px;
+		}
 	}
 
 

diff --git a/loops/loop-carousel.php b/loops/loop-carousel.php
@@ -12,7 +12,7 @@
 			<li class="carousel-entry">
 				<div class="thumbnail">
 					<?php $img = wp_get_attachment_image_src( get_post_thumbnail_id(), 'vantage-carousel' ); ?>
-					<?php if( $img[0] ) : ?>
+					<?php if ( ! empty( $img ) ) : ?>
 						<a href="<?php the_permalink() ?>" style="background-image: url(<?php echo $img[0] ?>)">
 						</a>
 					<?php else : ?>
+4 −0		css/page-settings.css
+9 −0		css/page-settings.scss
+8,334 −4,129		data/fonts.php
+0 −10		inc/css_functions.php
+12 −0		inc/page_settings.php
+40 −18		inc/webfont_manager.php