Merge branch 'release/1.2'

siteorigin · May 9, 2016 · bdb9442 · bdb9442
2 parents ab83574 + 8c2e8d6
commit bdb9442
Show file tree

Hide file tree

Showing 42 changed files with 1,526 additions and 729 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 .DS_Store
 dist/
 tmp
+config.codekit
+npm-debug.log
diff --git a/404.php b/404.php
@@ -12,7 +12,9 @@
 
 			<section class="error-404 not-found">
 				<header class="page-header">
-					<h1 class="page-title"><?php esc_html_e( 'Oops! That page can&rsquo;t be found.', 'siteorigin-north' ); ?></h1>
+					<?php if( siteorigin_page_setting( 'page_title' ) ) : ?>
+						<h1 class="page-title"><?php esc_html_e( 'Oops! That page can&rsquo;t be found.', 'siteorigin-north' ); ?></h1>
+					<?php endif; ?>
 					<?php siteorigin_north_breadcrumbs(); ?>
 				</header><!-- .page-header -->
 
@@ -52,4 +54,5 @@
 		</main><!-- #main -->
 	</div><!-- #primary -->
 
+<?php get_sidebar(); ?>
 <?php get_footer(); ?>
diff --git a/archive.php b/archive.php
@@ -13,10 +13,9 @@
 		<main id="main" class="site-main" role="main">
 
 		<?php if ( have_posts() ) : ?>
-
 			<header class="page-header">
 				<?php
-					the_archive_title( '<h1 class="page-title">', '</h1>' );
+					if( siteorigin_page_setting( 'page_title' ) ) the_archive_title( '<h1 class="page-title">', '</h1>' );
 					the_archive_description( '<div class="taxonomy-description">', '</div>' );
 				?>
 				<?php siteorigin_north_breadcrumbs(); ?>

diff --git a/build b/build
diff --git a/build-config.js b/build-config.js
@@ -1,78 +1,80 @@
 module.exports = {
-    slug: 'siteorigin-north',
-    jsMinSuffix: '.min',
-//    contributors: {
-//        src: [
-//            '**/*',
-//            '!{build,build/**}',                      // Ignore build/ submodule
-//            '!{design,design/**}',                    // Ignore design/ and contents
-//            '!{inc/settings,inc/settings/**}',        // Ignore settings submodule
-//            '!{inc/panels-lite,inc/panels-lite/**}',  // Ignore panels-lite submodule
-//            '!{languages,languages/**}',              // Ignore languages
-//            '!{tests,tests/**}',                      // Ignore tests/ and contents if any
-//            '!{tmp,tmp/**}'                           // Ignore tmp/ and contents if any
-//        ],
-//        format: 'php',
-//        skipCommits: [],
-//    },
-    version: {
-        src: [
-            'functions.php',
-            'readme.txt'
-        ]
-    },
-    sass: {
-        src: [
-            'sass/**/*.scss',
-        ],
-        include: [
-            'sass',
-        ],
-        external: {
-          src: [
-              'inc/settings/css/**/*.scss',
-          ],
-          include: [
-            'inc/settings/css'
-          ],
-        }
-    },
-    less: {
-        src: [],
-        include:[],
-        external: {
-          src: [
-              'inc/panels-lite/css/**/*.less',
-          ],
-          include: [
-              'inc/panels-lite/css',
-          ],
-        },
-    },
-    js: {
-        src: [
-          'js/**/*.js',
-          'inc/settings/js/**/*.js',
-          'inc/panels-lite/js/**/*.js',
-          '!{node_modules,node_modules/**}',  // Ignore node_modules/ and contents
-          '!{tests,tests/**}',                // Ignore tests/ and contents
-          '!{tmp,tmp/**}'                     // Ignore tmp/ and contents
-        ]
-    },
-    copy: {
-        src: [
-          '**/!(*.js|*.scss|*.md|style.css|woocommerce.css)',   // Everything except .js and .scss files
-          '!{build,build/**}',                                  // Ignore build/ and contents
-          '!{sass,sass/**}',                                    // Ignore sass/ and contents
-          'inc/settings/chosen/*.js',                           // Ensure necessary .js files ignored in the first glob are copied
-          '!{inc/settings/bin,inc/settings/bin/**}',            // Ignore settings/bin/ and contents
-          '!{inc/settings/README.md}',                          // Ignore settings/README.md
-          '!{tests,tests/**}',                                  // Ignore tests/ and contents
-          '!{tmp,tmp/**}',                                      // Ignore tmp/ and contents
-          '!phpunit.xml',                                       // Not the unit tests configuration file. (If there is one.)
-          '!functions.php',                                     // Not the functions .php file. It is copied by the 'version' task.
-          '!readme.txt',                                        // Not the readme.txt file. It is copied by the 'version' task.
-          '!npm-debug.log'                                      // Ignore debug log from NPM if it's there
-        ]
-    }
+	slug: 'siteorigin-north',
+	jsMinSuffix: '.min',
+	contributors: {
+		src: [
+			'{**/*.js,**/*.php,**/*.less,**/*.scss}',
+			'!{build,build/**}',                      // Ignore build/ submodule
+			'!{inc/settings,inc/settings/**}',        // Ignore settings submodule
+			'!{inc/panels-lite,inc/panels-lite/**}',  // Ignore panels-lite submodule
+			'!{languages,languages/**}',              // Ignore languages
+			'!{tests,tests/**}',                      // Ignore tests/ and contents if any
+			'!{tmp,tmp/**}'                           // Ignore tmp/ and contents if any
+		],
+		format: 'php',
+		skipCommits: [ ],
+		excludeEmails: [
+			'77e88891e4965161953320ec66623cbc',       // Remove [email protected]
+		]
+	},
+	version: {
+		src: [
+			'functions.php',
+			'readme.txt'
+		]
+	},
+	sass: {
+		src: [
+			'sass/**/*.scss',
+		],
+		include: [
+			'sass',
+		],
+		external: {
+			src: [
+				'inc/settings/css/**/*.scss',
+			],
+			include: [
+				'inc/settings/css'
+			],
+		}
+	},
+	less: {
+		src: [],
+		include: [],
+		external: {
+			src: [
+				'inc/panels-lite/css/**/*.less',
+			],
+			include: [
+				'inc/panels-lite/css',
+			],
+		},
+	},
+	js: {
+		src: [
+			'js/**/*.js',
+			'inc/settings/js/**/*.js',
+			'inc/panels-lite/js/**/*.js',
+			'!{node_modules,node_modules/**}',  // Ignore node_modules/ and contents
+			'!{tests,tests/**}',                // Ignore tests/ and contents
+			'!{tmp,tmp/**}'                     // Ignore tmp/ and contents
+		]
+	},
+	copy: {
+		src: [
+			'**/!(*.js|*.scss|*.md|style.css|woocommerce.css)',   // Everything except .js and .scss files
+			'!{build,build/**}',                                  // Ignore build/ and contents
+			'!{sass,sass/**}',                                    // Ignore sass/ and contents
+			'inc/settings/chosen/*.js',                           // Ensure necessary .js files ignored in the first glob are copied
+			'!{inc/settings/bin,inc/settings/bin/**}',            // Ignore settings/bin/ and contents
+			'!{inc/settings/README.md}',                          // Ignore settings/README.md
+			'!{tests,tests/**}',                                  // Ignore tests/ and contents
+			'!{tmp,tmp/**}',                                      // Ignore tmp/ and contents
+			'!phpunit.xml',                                       // Not the unit tests configuration file. (If there is one.)
+			'!functions.php',                                     // Not the functions .php file. It is copied by the 'version' task.
+			'!readme.txt',                                        // Not the readme.txt file. It is copied by the 'version' task.
+			'!npm-debug.log'                                      // Ignore debug log from NPM if it's there
+		]
+	}
 };
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,21 @@
+= 1.2 - May 6 2016 =
+* Fixes to RTL layout.
+* Styled various WooCommerce widgets.
+* Fixed mobile menu dropdown for custom breakpoints.
+* Made Mobile Menu scrollable.
+* Added WooCommerce quick view functionality.
+* Added font-smoothing and text-rendering.
+* Added current menu item indication.
+* Fixed overflowing menu dropdowns.
+* For one page sites, close mobile menu when a link in the dropdown is clicked.
+* Fixed flashes with smooth scroll.
+* Removed unused setting.
+* Added mobile menu customization settings.
+* Added custom icon settings.
+* Fixed masthead padding updating in Customizer.
+* Changed post meta alignment.
+* Added page settings to posts.
+
 = 1.1.3 - March 9 2016 =
 * Reformatted code to match WordPress guidelines.
 * Center aligned dropdown menu.

diff --git a/footer.php b/footer.php
@@ -13,20 +13,22 @@
 
 	<footer id="colophon" class="site-footer <?php if( !siteorigin_setting('footer_constrained') ) echo 'unconstrained-footer' ?>" role="contentinfo">
 
-		<div class="container">
+		<?php if( ! siteorigin_page_setting( 'hide_footer_widgets', false ) ) : ?>
+			<div class="container">
 
-			<?php
-			if( is_active_sidebar( 'footer-sidebar' ) ) {
-				$siteorigin_north_sidebars = wp_get_sidebars_widgets();
-				?>
-				<div class="widgets widget-area widgets-<?php echo count( $siteorigin_north_sidebars['footer-sidebar'] ) ?>" role="complementary" aria-label="<?php _e( 'Footer Sidebar', 'siteorigin-north' ); ?>">
-					<?php dynamic_sidebar( 'footer-sidebar' ); ?>
-				</div>
 				<?php
-			}
-			?>
+				if( is_active_sidebar( 'footer-sidebar' ) ) {
+					$siteorigin_north_sidebars = wp_get_sidebars_widgets();
+					?>
+					<div class="widgets widget-area widgets-<?php echo count( $siteorigin_north_sidebars['footer-sidebar'] ) ?>" role="complementary" aria-label="<?php _e( 'Footer Sidebar', 'siteorigin-north' ); ?>">
+						<?php dynamic_sidebar( 'footer-sidebar' ); ?>
+					</div>
+					<?php
+				}
+				?>
 
-		</div>
+			</div>
+		<?php endif; ?>
 
 		<div class="site-info">
 			<div class="container">
@@ -50,10 +52,10 @@
 </div><!-- #page -->
 
 <?php if( siteorigin_setting('navigation_scroll_to_top') ) : ?>
-	<button id="scroll-to-top">
+	<div id="scroll-to-top">
 		<span class="screen-reader-text"><?php esc_html_e( 'Scroll to top', 'siteorigin-north' ); ?></span>
-		<img src="<?php echo get_template_directory_uri() ?>/images/up-arrow.svg" width="24px" height="24px" />
-	</button>
+		<?php siteorigin_north_display_icon('up-arrow') ?>
+	</div>
 <?php endif; ?>
 
 <?php wp_footer(); ?>

diff --git a/functions.php b/functions.php
@@ -81,9 +81,6 @@ function siteorigin_north_setup() {
 	// This theme supports WooCommerce
 	add_theme_support( 'woocommerce' );
 
-	// Support for SiteOrigin Premium extras
-	add_theme_support( 'siteorigin-premium-retina-images' );
-
 	if ( ! defined( 'SITEORIGIN_PANELS_VERSION' ) ) {
 		// Only include panels lite if the panels plugin doesn't exist
 		include get_template_directory() . '/inc/panels-lite/panels-lite.php';
@@ -93,10 +90,14 @@ function siteorigin_north_setup() {
 		'home-page'  => true,
 		'responsive' => ! siteorigin_setting( 'responsive_disabled' ),
 	) );
+
+	// We'll use archive settings
+	add_theme_support( 'siteorigin-template-settings' );
 }
 endif; // siteorigin_north_setup
 add_action( 'after_setup_theme', 'siteorigin_north_setup' );
 
+if ( ! function_exists( 'siteorigin_north_premium_setup' ) ) :
 /**
  * Add support for premium theme components
  */
@@ -105,11 +106,20 @@ function siteorigin_north_premium_setup(){
 	// This theme supports the no attribution addon
 	add_theme_support( 'siteorigin-premium-no-attribution', array(
 		'filter'  => 'siteorigin_north_footer_credits',
-		'enabled' => siteorigin_setting( 'branding_attribution' )
+		'enabled' => siteorigin_setting( 'branding_attribution' ),
+		'siteorigin_setting' => 'branding_attribution'
+	) );
+
+	// This theme supports the no attribution addon
+	add_theme_support( 'siteorigin-premium-ajax-comments', array(
+		'enabled' => siteorigin_setting( 'blog_ajax_comments' ),
+		'siteorigin_setting' => 'blog_ajax_comments'
 	) );
 }
+endif;
 add_action( 'after_setup_theme', 'siteorigin_north_premium_setup' );
 
+if ( ! function_exists( 'siteorigin_north_content_width' ) ) :
 /**
  * Set the content width in pixels, based on the theme's design and stylesheet.
  *
@@ -121,8 +131,10 @@ function siteorigin_north_content_width() {
 	global $content_width;
 	$content_width = apply_filters( 'siteorigin_north_content_width', 650 );
 }
+endif;
 add_action( 'after_setup_theme', 'siteorigin_north_content_width', 0 );
 
+if ( ! function_exists( 'siteorigin_north_disable_responsive' ) ) :
 /**
  * Disable responsive layout.
  */
@@ -131,8 +143,10 @@ function siteorigin_north_disable_responsive() {
 		echo '<meta name="viewport" content="width=device-width, initial-scale=1">';
 	}
 }
+endif;
 add_action( 'wp_head', 'siteorigin_north_disable_responsive', 0 );
 
+if ( ! function_exists( 'siteorigin_north_widgets_init' ) ) :
 /**
  * Register widget area.
  *
@@ -160,8 +174,10 @@ function siteorigin_north_widgets_init() {
 	) );
 
 }
+endif;
 add_action( 'widgets_init', 'siteorigin_north_widgets_init' );
 
+if ( ! function_exists( 'siteorigin_north_scripts' ) ) :
 /**
  * Enqueue scripts and styles.
  */
@@ -185,14 +201,21 @@ function siteorigin_north_scripts() {
 		wp_enqueue_script( 'comment-reply' );
 	}
 }
+endif;
 add_action( 'wp_enqueue_scripts', 'siteorigin_north_scripts' );
 
+if ( ! function_exists( 'siteorigin_north_siteorigin_premium' ) ) :
 function siteorigin_north_siteorigin_premium($themes){
 	$themes[] = 'siteorigin-north';
 	return $themes;
 }
+endif;
 add_filter('siteorigin_premium_themes', 'siteorigin_north_siteorigin_premium');
 
+if ( ! function_exists( 'siteorigin_north_filter_comment_form_default_fields' ) ) :
+/**
+ * Modify comments form - change placeholders
+ */
 function siteorigin_north_filter_comment_form_default_fields( $fields ){
 	$placeholders = apply_filters( 'siteorigin_north_comment_form_placeholders', array(
 		'author' => __( 'Enter Your Name', 'siteorigin-north' ),
@@ -241,8 +264,13 @@ function siteorigin_north_filter_comment_form_default_fields( $fields ){
 
 	return $fields;
 }
+endif;
 add_filter('comment_form_default_fields', 'siteorigin_north_filter_comment_form_default_fields');
 
+if ( ! function_exists( 'siteorigin_north_filter_comment_form_defaults' ) ) :
+/**
+ * Modify comments form - make labels screen-reader-text
+ */
 function siteorigin_north_filter_comment_form_defaults( $defaults ){
 	$comment_placeholder = __( 'Enter your message', 'siteorigin-north' );
 	$default_comment     = array( '<label for="comment"', '<textarea id="comment" ' );
@@ -262,6 +290,7 @@ function siteorigin_north_filter_comment_form_defaults( $defaults ){
 
 	return $defaults;
 }
+endif;
 add_filter('comment_form_defaults', 'siteorigin_north_filter_comment_form_defaults');
 
 /**
@@ -292,5 +321,4 @@ function siteorigin_north_filter_comment_form_defaults( $defaults ){
 /**
  * Load support for WooCommerce
  */
-
 include get_template_directory() . '/woocommerce/functions.php';
+90 −20		gulp-git-contributors.js
+3 −19		gulpfile.js
+37 −0		score/code-scorer.js
+15 −0		score/decay.js