Merge branch 'release/1.18.1'

functions.php

@@ -255,25 +255,26 @@ function siteorigin_north_scripts() {
 	// jQuery Transit.
 	wp_enqueue_script( 'jquery-transit', get_template_directory_uri() . '/js/jquery.transit' . SITEORIGIN_THEME_JS_PREFIX . '.js', array( 'jquery' ), '0.9.12', true );
 
+	// jQuery FitVids.
+	if ( siteorigin_setting( 'responsive_fitvids' ) ) {
+		wp_enqueue_script( 'jquery-fitvids', get_template_directory_uri() . '/js/jquery.fitvids' . SITEORIGIN_THEME_JS_PREFIX . '.js', array( 'jquery' ), '1.1', true );
+	}
+
 	// Theme JavaScript.
 	wp_enqueue_script( 'siteorigin-north-script', get_template_directory_uri() . '/js/north' . SITEORIGIN_THEME_JS_PREFIX . '.js', array( 'jquery' ), SITEORIGIN_THEME_VERSION, true );
 
 	// Skip link focus fix.
 	wp_enqueue_script( 'siteorigin-north-skip-link', get_template_directory_uri() . '/js/skip-link-focus-fix' . SITEORIGIN_THEME_JS_PREFIX . '.js', array(), SITEORIGIN_THEME_VERSION, true );
 
-	// Localize smooth scroll and output sticky logo scale.
+	// Add settings variables used by main theme JS.
 	$logo_sticky_scale = apply_filters( 'siteorigin_north_logo_sticky_scale', 0.755 );
 	wp_localize_script( 'siteorigin-north-script', 'siteoriginNorth', array(
 		'smoothScroll' => siteorigin_setting( 'navigation_smooth_scroll' ),
 		'logoScale' => is_numeric( $logo_sticky_scale ) ? $logo_sticky_scale : 0.755,
 		'collapse' => siteorigin_setting( 'responsive_menu_breakpoint' ),
+		'fitvids' => siteorigin_setting( 'responsive_fitvids' ),
 	) );
 
-	// jQuery FitVids.
-	if ( ! ( function_exists( 'has_blocks' ) && has_blocks() ) && siteorigin_setting( 'responsive_fitvids' ) ) {
-		wp_enqueue_script( 'jquery-fitvids', get_template_directory_uri() . '/js/jquery.fitvids' . SITEORIGIN_THEME_JS_PREFIX . '.js', array( 'jquery' ), '1.1', true );
-	}
-
 	// Comment reply.
 	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
 		wp_enqueue_script( 'comment-reply' );

inc/extras.php

@@ -98,57 +98,6 @@ function siteorigin_north_body_classes( $classes ) {
 endif;
 add_filter( 'body_class', 'siteorigin_north_body_classes' );
 
-if ( version_compare( $GLOBALS['wp_version'], '4.1', '<' ) ) :
-	if ( ! function_exists( 'siteorigin_north_wp_title' ) ) :
-	/**
-	 * Filters wp_title to print a neat <title> tag based on what is being viewed.
-	 *
-	 * @param string $title Default title text for current view.
-	 * @param string $sep Optional separator.
-	 * @return string The filtered title.
-	 */
-	function siteorigin_north_wp_title( $title, $sep ) {
-		if ( is_feed() ) {
-			return $title;
-		}
-
-		global $page, $paged;
-
-		// Add the blog name.
-		$title .= get_bloginfo( 'name', 'display' );
-
-		// Add the blog description for the home/front page.
-		$site_description = get_bloginfo( 'description', 'display' );
-		if ( $site_description && ( is_home() || is_front_page() ) ) {
-			$title .= " $sep $site_description";
-		}
-
-		// Add a page number if necessary.
-		if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
-			$title .= " $sep " . sprintf( esc_html__( 'Page %s', 'siteorigin-north' ), max( $paged, $page ) );
-		}
-
-		return $title;
-	}
-	endif;
-	add_filter( 'wp_title', 'siteorigin_north_wp_title', 10, 2 );
-
-	if ( ! function_exists( 'siteorigin_north_render_title' ) ) :
-	/**
-	 * Title shim for sites older than WordPress 4.1.
-	 *
-	 * @link https://make.wordpress.org/core/2014/10/29/title-tags-in-4-1/
-	 * @todo Remove this function when WordPress 4.3 is released.
-	 */
-	function siteorigin_north_render_title() {
-		?>
-		<title><?php wp_title( '|', true, 'right' ); ?></title>
-		<?php
-	}
-	endif;
-	add_action( 'wp_head', 'siteorigin_north_render_title' );
-endif;
-
 /*
  * Allow the use of HTML in author bio
  */

inc/settings.php

@@ -22,8 +22,8 @@ function siteorigin_north_settings_init() {
 				),
 				'site_title' => array(
 					'type'        => 'checkbox',
-					'label'       => __( 'Site Title', 'siteorigin-north' ),
-					'description' => __( 'Show your site title alongside your logo.', 'siteorigin-north' )
+					'label'       => __( 'Display Site Title Alongside Logo', 'siteorigin-north' ),
+					'description' => __( 'Only applicable if a Logo image has been set.', 'siteorigin-north' )
 				),
 				'site_description' => array(
 					'type'        => 'checkbox',

js/north.js

@@ -109,7 +109,7 @@
 	} );
 
 	// Setup FitVids for entry content, panels and WooCommerce. Ignore Tableau.
-	if ( typeof $.fn.fitVids !== 'undefined' ) {
+	if ( typeof $.fn.fitVids !== 'undefined' && siteoriginNorth.fitvids ) {
 		$( '.entry-content, .entry-content .panel, .woocommerce #main' ).fitVids( { ignore: '.tableauViz' } );
 	}
 

readme.txt

@@ -104,6 +104,12 @@ Original design files are available on [Google Drive](https://drive.google.com/f
 
 == Changelog ==
 
+= 1.18.1 - 11 July 2021 =
+* Only setup FitVids if enabled in Theme Settings. Ensures better compatibility with other plugins loading FitVids for fluid width video embeds.
+* Block Editor: Removed exclusion preventing FitVids from loading in the Block Editor.
+* Updated SiteOrigin Settings submodule.
+* Removed `siteorigin_north_wp_title` and `siteorigin_north_render_title`. Due to the way Theme Check is broadly checking for `wp_title` we don't see a way of deprecating these functions.
+
 = 1.18.0 - 06 March 2021 =
 * WooCommerce: Improved product shortcode styling.
 * WooCommerce: Fixed product shortcode quick view functionality.

sass/rtl/_layout.scss

@@ -2,11 +2,11 @@
 ## General Layout
 --------------------------------------------------------------*/
 .content-area {
-    float: right;
-    margin: 0 0 0 (-$size__site-sidebar);
+	float: right;
+	margin: 0 0 0 (-$size__site-sidebar);
 
 	@media (max-width: 600px) {
-        
+
 		body.rtl.responsive & {
 			margin: 0 !important;
 		}
@@ -25,77 +25,77 @@
 }
 
 .site-content .widget-area {
-    float: left;
-    padding-right: 40px;
-    padding-left: 0;
-
-    @media (max-width: 600px) {
-        
-        body.rtl.responsive & {
-            padding-right: 0;
-        }
-    }
+	float: left;
+	padding-right: 40px;
+	padding-left: 0;
+
+	@media (max-width: 600px) {
+
+		body.rtl.responsive & {
+			padding-right: 0;
+		}
+	}
 }
 
 /*--------------------------------------------------------------
 ## Site Masthead
 --------------------------------------------------------------*/
 #masthead .site-branding {
-    padding-right: 0;
-    padding-left: 20px;
+	padding-right: 0;
+	padding-left: 20px;
 
 	> * {
 		@include transform-origin( right center );
 	}
 }
 
 #topbar p {
-    text-align: left;
+	text-align: left;
 }
 
 /*--------------------------------------------------------------
 ## Site Footer
 --------------------------------------------------------------*/
 #colophon .widgets {
 
-    .widget-wrapper {
-        border-right: none;
-        border-left: $footer__border_width solid $footer__border_color;
-        float: right;
+	.widget-wrapper {
+		border-right: none;
+		border-left: $footer__border_width solid $footer__border_color;
+		float: right;
 
-        &:last-child {
-            border-left: none;
-        }
-    }
+		&:last-child {
+			border-left: none;
+		}
+	}
 
-    aside:last-child {
-        border-left: 0;
-    }
+	aside:last-child {
+		border-left: 0;
+	}
 
-    @media (max-width: 640px) {
+	@media (max-width: 640px) {
 
-	   .widget-wrapper {
-    	   border-left: none;
+		.widget-wrapper {
+			border-left: none;
 		}
-    }   
+	}
 }
 
 #scroll-to-top {
 	left: 20px;
 	margin-left: auto;
 	margin-right: -22px;
-    right: auto;
+	right: auto;
 
-    img {
-        @include transform( rotate(90deg) );
-    }
+	img {
+		@include transform( rotate(90deg) );
+	}
 }
 
 /*--------------------------------------------------------------
 ## Widgets
 --------------------------------------------------------------*/
 .widget ul {
-    margin-right: 0;
-    padding-left: 0;
-    padding-right: 1.275em;
+	margin-right: 0;
+	padding-left: 0;
+	padding-right: 1.275em;
 }