lightspeeddevelopment / lsx

inc/scripts.php

Spacing +28 added lines, -28 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) return; // Exit if accessed directly
+if ( ! defined('ABSPATH')) return; // Exit if accessed directly
 
 /**
  * Enqueue scripts and styles.
@@ -10,12 +10,12 @@ 
 function lsx_scripts() {
 	global $content_width;
 	
-	wp_enqueue_style('lsx_main_style', get_stylesheet_uri() , false, '23a2bd43791de3fa3cab2d2af5fec6a2');
+	wp_enqueue_style('lsx_main_style', get_stylesheet_uri(), false, '23a2bd43791de3fa3cab2d2af5fec6a2');
 	
 	wp_enqueue_style('lsx_main', get_template_directory_uri() . '/css/app.css', false, '48a2bd26791de3fa7cab2d2af5fec6a2');
 	
-	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
-		wp_enqueue_script( 'comment-reply' );
+	if (is_singular() && comments_open() && get_option('thread_comments')) {
+		wp_enqueue_script('comment-reply');
 	}
 
 	wp_enqueue_script('bootstrap', get_template_directory_uri() . '/js/vendor/bootstrap.min.js', array('jquery'), 'c9f983e2965b9c7888dac272e56c4f4b', false);
@@ -26,38 +26,38 @@ 
 	wp_enqueue_script('picturefill', get_template_directory_uri() . '/js/vendor/picturefill.min.js', array(), null, false);
 
 	wp_enqueue_script('masonry');
-	wp_enqueue_script('imagesLoaded', get_template_directory_uri().'/js/vendor/imagesloaded.pkgd.min.js', array('jquery','masonry'));	
-	if(defined('WP_DEBUG') && true === WP_DEBUG){
+	wp_enqueue_script('imagesLoaded', get_template_directory_uri() . '/js/vendor/imagesloaded.pkgd.min.js', array('jquery', 'masonry'));	
+	if (defined('WP_DEBUG') && true === WP_DEBUG) {
 		wp_enqueue_script('lsx_script', get_template_directory_uri() . '/js/lsx-script.js', array('masonry'), null, false);
-	}else{
+	} else {
 		wp_enqueue_script('lsx_script', get_template_directory_uri() . '/js/lsx-script.min.js', array('masonry'), null, false);
 	}
 	
 	//Set some parameters that we can use in the JS
 	$is_portfolio = false;
-	if(is_post_type_archive('jetpack-portfolio') || is_tax('jetpack-portfolio-type') || is_tax('jetpack-portfolio-tag') || is_page_template('page-templates/template-portfolio.php')){
+	if (is_post_type_archive('jetpack-portfolio') || is_tax('jetpack-portfolio-type') || is_tax('jetpack-portfolio-tag') || is_page_template('page-templates/template-portfolio.php')) {
 		$is_portfolio = true;
 	}
 	$param_array = array(
 			'is_portfolio' => $is_portfolio
 	);
 	//Set the columns for the archives
-	$param_array['columns'] = apply_filters('lsx_archive_column_number',3);
-	wp_localize_script( 'lsx_script', 'lsx_params', $param_array );
+	$param_array['columns'] = apply_filters('lsx_archive_column_number', 3);
+	wp_localize_script('lsx_script', 'lsx_params', $param_array);
 
 
-	wp_enqueue_style( 'fontawesome', get_template_directory_uri() . '/css/font-awesome.min.css');
+	wp_enqueue_style('fontawesome', get_template_directory_uri() . '/css/font-awesome.min.css');
 	
 	
-	if(is_child_theme() && file_exists(get_stylesheet_directory() . '/custom.css')) {
-		wp_enqueue_style( 'child-css', get_stylesheet_directory_uri() . '/custom.css' );
+	if (is_child_theme() && file_exists(get_stylesheet_directory() . '/custom.css')) {
+		wp_enqueue_style('child-css', get_stylesheet_directory_uri() . '/custom.css');
 	}
 
 	wp_enqueue_style('medium-break', get_template_directory_uri() . '/css/medium-nav-break.css', false);
 	
 	
-	$font = get_theme_mod('lsx_font','raleway_open_sans');
-	switch($font){
+	$font = get_theme_mod('lsx_font', 'raleway_open_sans');
+	switch ($font) {
 		case 'raleway_open_sans':
 			$header_font_location = 'Raleway';
 			$body_font_location = 'Open+Sans';
@@ -86,18 +86,18 @@ 
 	}
 	
 	$http_var = 'http';
-	if(is_ssl()){ $http_var .= 's'; }
+	if (is_ssl()) { $http_var .= 's'; }
 	
 	//Call the Google Fonts and then Enque them.
-	wp_register_style('lsx-header-font', $http_var.'://fonts.googleapis.com/css?family='.$header_font_location);
-	wp_register_style('lsx-body-font', $http_var.'://fonts.googleapis.com/css?family='.$body_font_location);
-	wp_enqueue_style( 'lsx-header-font');
-	wp_enqueue_style( 'lsx-body-font');
+	wp_register_style('lsx-header-font', $http_var . '://fonts.googleapis.com/css?family=' . $header_font_location);
+	wp_register_style('lsx-body-font', $http_var . '://fonts.googleapis.com/css?family=' . $body_font_location);
+	wp_enqueue_style('lsx-header-font');
+	wp_enqueue_style('lsx-body-font');
 	
-	wp_enqueue_style('lsx_font_scheme', esc_url( get_template_directory_uri() . '/css/'.$font.'.css'), false, '48a2bd26791de3fa7cab2d2af5fec6a4');
+	wp_enqueue_style('lsx_font_scheme', esc_url(get_template_directory_uri() . '/css/' . $font . '.css'), false, '48a2bd26791de3fa7cab2d2af5fec6a4');
 	
 }
-add_action( 'wp_enqueue_scripts', 'lsx_scripts' );
+add_action('wp_enqueue_scripts', 'lsx_scripts');
 
 /**
  * Defer JavaScript
@@ -105,14 +105,14 @@ 
  * @package 	lsx
  * @subpackage	scripts
  */
-function lsx_scripts_defer_parsing( $url ) {
-	if ( ! ( is_admin() ) ) {
-		if ( FALSE === strpos( $url, '.js' ) ) return $url;
-		if ( strpos( $url, 'jquery.js' ) ) return $url;
-		if ( strpos( $url, ' defer ' ) ) return $url;
+function lsx_scripts_defer_parsing($url) {
+	if ( ! (is_admin())) {
+		if (FALSE === strpos($url, '.js')) return $url;
+		if (strpos($url, 'jquery.js')) return $url;
+		if (strpos($url, ' defer ')) return $url;
 		return "$url' defer onload='";
 	}
 
 	return $url;
 }
-add_filter( 'clean_url', 'lsx_scripts_defer_parsing', 11, 1 );
+add_filter('clean_url', 'lsx_scripts_defer_parsing', 11, 1);

Braces +14 added lines, -5 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) return; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	return;
+}
+// Exit if accessed directly
 
 /**
  * Enqueue scripts and styles.
@@ -29,7 +32,7 @@ 
 	wp_enqueue_script('imagesLoaded', get_template_directory_uri().'/js/vendor/imagesloaded.pkgd.min.js', array('jquery','masonry'));	
 	if(defined('WP_DEBUG') && true === WP_DEBUG){
 		wp_enqueue_script('lsx_script', get_template_directory_uri() . '/js/lsx-script.js', array('masonry'), null, false);
-	}else{
+	} else{
 		wp_enqueue_script('lsx_script', get_template_directory_uri() . '/js/lsx-script.min.js', array('masonry'), null, false);
 	}
 	
@@ -107,9 +110,15 @@ 
  */
 function lsx_scripts_defer_parsing( $url ) {
 	if ( ! ( is_admin() ) ) {
-		if ( FALSE === strpos( $url, '.js' ) ) return $url;
-		if ( strpos( $url, 'jquery.js' ) ) return $url;
-		if ( strpos( $url, ' defer ' ) ) return $url;
+		if ( FALSE === strpos( $url, '.js' ) ) {
+			return $url;
+		}
+		if ( strpos( $url, 'jquery.js' ) ) {
+			return $url;
+		}
+		if ( strpos( $url, ' defer ' ) ) {
+			return $url;
+		}
 		return "$url' defer onload='";
 	}
 

inc/customizer.php

Spacing +44 added lines, -44 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) return; // Exit if accessed directly
+if ( ! defined('ABSPATH')) return; // Exit if accessed directly
 
 /**
  * Customizer Configuration File
@@ -9,7 +9,7 @@ 
  * @author  warwick@feedmymedia.com <lsdev.biz>
  * 
  */
-if ( ! class_exists( 'LSX_Theme_Customizer' ) ) {
+if ( ! class_exists('LSX_Theme_Customizer')) {
 	
 	class LSX_Theme_Customizer {
 
@@ -29,7 +29,7 @@ 
 		 *
 		 * @since     1.0.0
 		 */
-		public function __construct( $controls ) {
+		public function __construct($controls) {
 			require get_template_directory() . '/inc/google-font.php';
 			require get_template_directory() . '/inc/google-font-collection.php';
 			require get_template_directory() . '/inc/customizer-core.php';
@@ -40,19 +40,19 @@ 
 
 			$this->controls = $controls;
 
-			add_action( 'customize_preview_init', array($this,'customize_preview_js' ),20);
-			add_action( 'customize_register', array($this,'customizer'), 11 );
+			add_action('customize_preview_init', array($this, 'customize_preview_js'), 20);
+			add_action('customize_register', array($this, 'customizer'), 11);
 			
-			add_action( 'wp_ajax_customizer_site_title', array($this,'ajax_site_title') );
-			add_action( 'wp_ajax_nopriv_customizer_site_title', array($this,'ajax_site_title') );
+			add_action('wp_ajax_customizer_site_title', array($this, 'ajax_site_title'));
+			add_action('wp_ajax_nopriv_customizer_site_title', array($this, 'ajax_site_title'));
 		}
 		
 		/**
 		 * Binds JS handlers to make Theme Customizer preview reload changes asynchronously.
 		 */
 		function customize_preview_js() {
-			wp_enqueue_script( 'lsx_customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ) , wp_get_theme()->Version, true );
-			wp_localize_script( 'lsx_customizer', 'lsx_customizer_params', array( 'template_directory' => get_template_directory_uri() ) );
+			wp_enqueue_script('lsx_customizer', get_template_directory_uri() . '/js/customizer.js', array('customize-preview'), wp_get_theme()->Version, true);
+			wp_localize_script('lsx_customizer', 'lsx_customizer_params', array('template_directory' => get_template_directory_uri()));
 		}
 		
 		/**
@@ -60,40 +60,40 @@ 
 		 *
 		 * @since     1.0.0
 		 */		
-		public function customizer( $wp_customize ) {
+		public function customizer($wp_customize) {
 			// start panels
-			if( !empty( $this->controls['panels'] ) ){
-				foreach( $this->controls['panels'] as $panel_slug => $args ){
-					$this->add_panel( $panel_slug, $args, $wp_customize );
+			if ( ! empty($this->controls['panels'])) {
+				foreach ($this->controls['panels'] as $panel_slug => $args) {
+					$this->add_panel($panel_slug, $args, $wp_customize);
 				}
 			}
 
 			// start sections
-			if( !empty( $this->controls['sections'] ) ){
-				foreach( $this->controls['sections'] as $section_slug => $args ){
-					$this->add_section( $section_slug, $args, $wp_customize );
+			if ( ! empty($this->controls['sections'])) {
+				foreach ($this->controls['sections'] as $section_slug => $args) {
+					$this->add_section($section_slug, $args, $wp_customize);
 				}
 			}
 
 			// start settings
-			if( !empty( $this->controls['settings'] ) ){
-				foreach( $this->controls['settings'] as $settings_slug => $args ){
-					$this->add_setting( $settings_slug, $args, $wp_customize );
+			if ( ! empty($this->controls['settings'])) {
+				foreach ($this->controls['settings'] as $settings_slug => $args) {
+					$this->add_setting($settings_slug, $args, $wp_customize);
 				}
 			}
 
 			// start fields
-			if( !empty( $this->controls['fields'] ) ){
-				foreach( $this->controls['fields'] as $field_slug => $args ){
-					$this->add_control( $field_slug, $args, $wp_customize );
+			if ( ! empty($this->controls['fields'])) {
+				foreach ($this->controls['fields'] as $field_slug => $args) {
+					$this->add_control($field_slug, $args, $wp_customize);
 				}
 			}
 			
-			$wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
-			$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
-			$wp_customize->get_setting( 'background_color' )->transport = 'postMessage';
+			$wp_customize->get_setting('blogname')->transport = 'postMessage';
+			$wp_customize->get_setting('blogdescription')->transport = 'postMessage';
+			$wp_customize->get_setting('background_color')->transport = 'postMessage';
 
-			$wp_customize->remove_control( 'background_color' );
+			$wp_customize->remove_control('background_color');
 		}
 
 		/**
@@ -101,7 +101,7 @@ 
 		 *
 		 * @since     1.0.0
 		 */		
-		private function add_panel( $slug, $args, $wp_customize ) {
+		private function add_panel($slug, $args, $wp_customize) {
 			$default_args = array(
 				'title' 		=> null,
 				'description' 	=> null,
@@ -109,7 +109,7 @@ 
 
 			$wp_customize->add_panel(
 				$slug,
-				array_merge( $default_args, $args )
+				array_merge($default_args, $args)
 			);
 		}
 
@@ -118,14 +118,14 @@ 
 		 *
 		 * @since     1.0.0
 		 */		
-		private function add_section( $slug, $args, $wp_customize ) {
+		private function add_section($slug, $args, $wp_customize) {
 			$default_args = array(
 				'capability' => 'edit_theme_options', //Capability needed to tweak
 				'description' => null, //Descriptive tooltip
 			);
 
-			$wp_customize->add_section( $slug, 
-				array_merge( $default_args, $args )
+			$wp_customize->add_section($slug, 
+				array_merge($default_args, $args)
 			);
 		}
 
@@ -134,15 +134,15 @@ 
 		 *
 		 * @since     1.0.0
 		 */		
-		private function add_setting( $slug, $args, $wp_customize ) {
-			$wp_customize->add_setting( $slug, //No need to use a SERIALIZED name, as `theme_mod` settings already live under one db record
-				array_merge( array(
+		private function add_setting($slug, $args, $wp_customize) {
+			$wp_customize->add_setting($slug, //No need to use a SERIALIZED name, as `theme_mod` settings already live under one db record
+				array_merge(array(
 					'default' 			=> null, //Default setting/value to save
 					'type' 				=> 'theme_mod', //Is this an 'option' or a 'theme_mod'?
 					'capability'		=> 'edit_theme_options', //Optional. Special permissions for accessing this setting.
 					'transport' 		=> 'postMessage', //What triggers a refresh of the setting? 'refresh' or 'postMessage' (instant)?
 					'sanitize_callback'	=> 'lsx_sanitize_choices'
-				), $args )
+				), $args)
 			);
 		}
 
@@ -151,28 +151,28 @@ 
 		 *
 		 * @since     1.0.0
 		 */		
-		private function add_control( $slug, $args, $wp_customize ) {
+		private function add_control($slug, $args, $wp_customize) {
 			$default_args = array(
 
 			);
 
-			if( isset( $args['control'] ) && class_exists( $args['control'] )){
+			if (isset($args['control']) && class_exists($args['control'])) {
 				
 				$control_class = $args['control'];
-				unset( $args['control'] );
+				unset($args['control']);
 
-				$control = new $control_class( $wp_customize, $slug, array_merge( $default_args, $args ) );
-				$wp_customize->add_control( $control );
+				$control = new $control_class($wp_customize, $slug, array_merge($default_args, $args));
+				$wp_customize->add_control($control);
 			
-			}else{
+			} else {
 				
-				if( isset( $args['control'] ) ){
-					unset( $args['control'] );
+				if (isset($args['control'])) {
+					unset($args['control']);
 				}
 
 				$wp_customize->add_control(
 					$slug,
-					array_merge( $default_args, $args )
+					array_merge($default_args, $args)
 				);
 			}
 		}

Braces +5 added lines, -2 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) return; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	return;
+}
+// Exit if accessed directly
 
 /**
  * Customizer Configuration File
@@ -164,7 +167,7 @@ 
 				$control = new $control_class( $wp_customize, $slug, array_merge( $default_args, $args ) );
 				$wp_customize->add_control( $control );
 			
-			}else{
+			} else{
 				
 				if( isset( $args['control'] ) ){
 					unset( $args['control'] );

inc/the-events-calendar.php

Indentation +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  */
 
 function lsx_events_styles() {
-    wp_enqueue_style( 'events', get_template_directory_uri() . '/css/the-events-calendar.css' );
+	wp_enqueue_style( 'events', get_template_directory_uri() . '/css/the-events-calendar.css' );
 }
 add_action( 'wp_enqueue_scripts', 'lsx_events_styles' );
 

Spacing +24 added lines, -24 removed lines

@@ -18,9 +18,9 @@ 
  */
 
 function lsx_events_styles() {
-    wp_enqueue_style( 'events', get_template_directory_uri() . '/css/the-events-calendar.css' );
+    wp_enqueue_style('events', get_template_directory_uri() . '/css/the-events-calendar.css');
 }
-add_action( 'wp_enqueue_scripts', 'lsx_events_styles' );
+add_action('wp_enqueue_scripts', 'lsx_events_styles');
 
 
 /**
@@ -32,41 +32,41 @@ 
 
 function lsx_tribe_breadcrumbs($output) {
 	global $wp_query;
-	if( (isset($wp_query->tribe_is_event) && true === $wp_query->tribe_is_event) || (isset($wp_query->query_vars['post_type']) && !is_array($wp_query->query_vars['post_type']) && 'tribe_venue' === $wp_query->query_vars['post_type'])){
-		if(function_exists('woocommerce_breadcrumb')){
+	if ((isset($wp_query->tribe_is_event) && true === $wp_query->tribe_is_event) || (isset($wp_query->query_vars['post_type']) && ! is_array($wp_query->query_vars['post_type']) && 'tribe_venue' === $wp_query->query_vars['post_type'])) {
+		if (function_exists('woocommerce_breadcrumb')) {
 		 	$closing_div = '</nav>';
 
-		 	if( is_single()) {
-		 		$output = str_replace('Page','<a href="'.get_post_type_archive_link( 'tribe_events' ).'">'.__('Events','lsx').'</a>',$output);
-		 		if(isset($wp_query->query_vars['eventDisplay']) && 'all' === $wp_query->query_vars['eventDisplay']){
-		 			$output = str_replace($closing_div,get_the_title($wp_query->query_vars['post_parent']).$closing_div,$output);
-		 		}else{
+		 	if (is_single()) {
+		 		$output = str_replace('Page', '<a href="' . get_post_type_archive_link('tribe_events') . '">' . __('Events', 'lsx') . '</a>', $output);
+		 		if (isset($wp_query->query_vars['eventDisplay']) && 'all' === $wp_query->query_vars['eventDisplay']) {
+		 			$output = str_replace($closing_div, get_the_title($wp_query->query_vars['post_parent']) . $closing_div, $output);
+		 		} else {
 		 			$single_event = get_queried_object();
-		 			$output = str_replace($closing_div,apply_filters('the_title',$single_event->post_title).$closing_div,$output);		 			
+		 			$output = str_replace($closing_div, apply_filters('the_title', $single_event->post_title) . $closing_div, $output);		 			
 		 		}
-		 	}elseif( is_tax()) {
+		 	}elseif (is_tax()) {
 		 		$tax_event = get_queried_object();
-		 		$output = str_replace('Page','<a href="'.get_post_type_archive_link( 'tribe_events' ).'">'.__('Events','lsx').'</a>',$output);
-		 		$output = str_replace($closing_div,'&nbsp;/&nbsp;'.apply_filters('the_title',$tax_event->name).$closing_div,$output);
-		 	}else{
-		 		$output = str_replace('Page',__('Events','lsx'),$output);
+		 		$output = str_replace('Page', '<a href="' . get_post_type_archive_link('tribe_events') . '">' . __('Events', 'lsx') . '</a>', $output);
+		 		$output = str_replace($closing_div, '&nbsp;/&nbsp;' . apply_filters('the_title', $tax_event->name) . $closing_div, $output);
+		 	} else {
+		 		$output = str_replace('Page', __('Events', 'lsx'), $output);
 		 	}		 	
-		 }elseif(function_exists('yoast_breadcrumb')){
+		 }elseif (function_exists('yoast_breadcrumb')) {
 		 	$closing_div = '</div>';
-		 	$last_breadcrumb = '<span class="breadcrumb_last">'.__('Events','lsx').'</span>';
+		 	$last_breadcrumb = '<span class="breadcrumb_last">' . __('Events', 'lsx') . '</span>';
 		 	
-		 	if( is_single()) {
+		 	if (is_single()) {
 		 		$single_event = get_queried_object();
-		 		$output = str_replace($closing_div,'<a href="'.get_post_type_archive_link( 'tribe_events' ).'">'.__('Events','lsx').'</a>&nbsp;/&nbsp;'.apply_filters('the_title',$single_event->post_title),$output);
-		 	}elseif( is_tax()) {
+		 		$output = str_replace($closing_div, '<a href="' . get_post_type_archive_link('tribe_events') . '">' . __('Events', 'lsx') . '</a>&nbsp;/&nbsp;' . apply_filters('the_title', $single_event->post_title), $output);
+		 	}elseif (is_tax()) {
 		 		$tax_event = get_queried_object();
-		 		$output = str_replace($last_breadcrumb,'<a href="'.get_post_type_archive_link( 'tribe_events' ).'">'.__('Events','lsx').'</a>&nbsp;/&nbsp;'.apply_filters('the_title',$tax_event->name),$output);
+		 		$output = str_replace($last_breadcrumb, '<a href="' . get_post_type_archive_link('tribe_events') . '">' . __('Events', 'lsx') . '</a>&nbsp;/&nbsp;' . apply_filters('the_title', $tax_event->name), $output);
 		 		
-		 	}else{
-		 		$output = str_replace('Page',__('Events','lsx'),$output);
+		 	} else {
+		 		$output = str_replace('Page', __('Events', 'lsx'), $output);
 		 	}		 	
 		 }		
 	}
 	return $output;
 }
-add_filter( 'lsx_breadcrumbs', 'lsx_tribe_breadcrumbs',1,10 );
\ No newline at end of file
+add_filter('lsx_breadcrumbs', 'lsx_tribe_breadcrumbs', 1, 10);
\ No newline at end of file

Braces +6 added lines, -6 removed lines

@@ -40,29 +40,29 @@
 		 		$output = str_replace('Page','<a href="'.get_post_type_archive_link( 'tribe_events' ).'">'.__('Events','lsx').'</a>',$output);
 		 		if(isset($wp_query->query_vars['eventDisplay']) && 'all' === $wp_query->query_vars['eventDisplay']){
 		 			$output = str_replace($closing_div,get_the_title($wp_query->query_vars['post_parent']).$closing_div,$output);
-		 		}else{
+		 		} else{
 		 			$single_event = get_queried_object();
 		 			$output = str_replace($closing_div,apply_filters('the_title',$single_event->post_title).$closing_div,$output);		 			
 		 		}
-		 	}elseif( is_tax()) {
+		 	} elseif( is_tax()) {
 		 		$tax_event = get_queried_object();
 		 		$output = str_replace('Page','<a href="'.get_post_type_archive_link( 'tribe_events' ).'">'.__('Events','lsx').'</a>',$output);
 		 		$output = str_replace($closing_div,'&nbsp;/&nbsp;'.apply_filters('the_title',$tax_event->name).$closing_div,$output);
-		 	}else{
+		 	} else{
 		 		$output = str_replace('Page',__('Events','lsx'),$output);
 		 	}		 	
-		 }elseif(function_exists('yoast_breadcrumb')){
+		 } elseif(function_exists('yoast_breadcrumb')){
 		 	$closing_div = '</div>';
 		 	$last_breadcrumb = '<span class="breadcrumb_last">'.__('Events','lsx').'</span>';
 		 	
 		 	if( is_single()) {
 		 		$single_event = get_queried_object();
 		 		$output = str_replace($closing_div,'<a href="'.get_post_type_archive_link( 'tribe_events' ).'">'.__('Events','lsx').'</a>&nbsp;/&nbsp;'.apply_filters('the_title',$single_event->post_title),$output);
-		 	}elseif( is_tax()) {
+		 	} elseif( is_tax()) {
 		 		$tax_event = get_queried_object();
 		 		$output = str_replace($last_breadcrumb,'<a href="'.get_post_type_archive_link( 'tribe_events' ).'">'.__('Events','lsx').'</a>&nbsp;/&nbsp;'.apply_filters('the_title',$tax_event->name),$output);
 		 		
-		 	}else{
+		 	} else{
 		 		$output = str_replace('Page',__('Events','lsx'),$output);
 		 	}		 	
 		 }		

inc/customizer-layout.php

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) return; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	return;
+}
+// Exit if accessed directly
 
 /**
  * Customize Swatch Control Class

Spacing +15 added lines, -15 removed lines

@@ -1,12 +1,12 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) return; // Exit if accessed directly
+if ( ! defined('ABSPATH')) return; // Exit if accessed directly
 
 /**
  * Customize Swatch Control Class
  *
  * @since 1.0.0
  */
-if( !class_exists( 'WP_Customize_Control' ) ){
+if ( ! class_exists('WP_Customize_Control')) {
 	return;
 }
 class LSX_Customize_Layout_Control extends WP_Customize_Control {
@@ -38,9 +38,9 @@ 
 	 * @param string $id
 	 * @param array $args
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
-		parent::__construct( $manager, $id, $args );
-		if( !empty( $args['choices'] ) ){
+	public function __construct($manager, $id, $args = array()) {
+		parent::__construct($manager, $id, $args);
+		if ( ! empty($args['choices'])) {
 			$this->layouts = $args['choices'];
 		}
 	}
@@ -52,7 +52,7 @@ 
 	 */
 	public function enqueue() {
 		// 
-		wp_enqueue_script( 'lsx-layout-control', get_template_directory_uri() .'/js/customizer-layout.js', array('jquery'), null, true );
+		wp_enqueue_script('lsx-layout-control', get_template_directory_uri() . '/js/customizer-layout.js', array('jquery'), null, true);
 	}
 
 	/**
@@ -62,30 +62,30 @@ 
 	 */
 	public function render_content() {
 		
-		$post_id    = 'customize-control-' . str_replace( '[', '-', str_replace( ']', '', $this->id ) );
+		$post_id = 'customize-control-' . str_replace('[', '-', str_replace(']', '', $this->id));
 		$class = 'customize-control customize-control-' . $this->type;
 		$value = $this->value();
 
 		?>
 		<label>
-			<?php if ( ! empty( $this->label ) ) { ?>
-				<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+			<?php if ( ! empty($this->label)) { ?>
+				<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 			<?php }
-			if ( ! empty( $this->description ) ) { ?>
-				<span class="description customize-control-description"><?php echo esc_html( $this->description ); ?></span>
+			if ( ! empty($this->description)) { ?>
+				<span class="description customize-control-description"><?php echo esc_html($this->description); ?></span>
 			<?php } ?>
 			<div class="layouts-selector">
 			<?php
-			foreach( $this->layouts as $layout ){
+			foreach ($this->layouts as $layout) {
 				$sel = 'border: 1px solid transparent;';
-				if( $value == $layout ){
+				if ($value == $layout) {
 					$sel = 'border: 1px solid rgb(43, 166, 203);';
 				}
-				echo '<img class="layout-button" style="padding:2px;'. esc_attr( $sel ) .'" src="' . esc_attr( get_template_directory_uri() ) .'/img/' . esc_attr( $layout ) . '.png" data-option="' . esc_attr( $layout ) . '">';
+				echo '<img class="layout-button" style="padding:2px;' . esc_attr($sel) . '" src="' . esc_attr(get_template_directory_uri()) . '/img/' . esc_attr($layout) . '.png" data-option="' . esc_attr($layout) . '">';
 			}
 
 			?>
-			<input <?php $this->link(); ?> class="selected-layout <?php echo esc_attr( $class ); ?>" id="<?php echo esc_attr( $post_id ); ?>" type="hidden" value="<?php echo esc_attr( $value ); ?>" <?php $this->input_attrs(); ?>>
+			<input <?php $this->link(); ?> class="selected-layout <?php echo esc_attr($class); ?>" id="<?php echo esc_attr($post_id); ?>" type="hidden" value="<?php echo esc_attr($value); ?>" <?php $this->input_attrs(); ?>>
 			</div>
 		</label>
 	<?php

functions.php

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) return; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	return;
+}
+// Exit if accessed directly
 
 /**
  * Customize Swatch Control Class

Spacing +44 added lines, -44 removed lines

@@ -4,7 +4,7 @@ 
  *
  * @package lsx
  */
-if ( ! defined( 'ABSPATH' ) ) return; // Exit if accessed directly
+if ( ! defined('ABSPATH')) return; // Exit if accessed directly
 
 define('LSX_VERSION', '1.7.3');
 
@@ -21,22 +21,22 @@ 
 require get_template_directory() . '/inc/comment-walker.php';
 require get_template_directory() . '/inc/jetpack.php';
 require get_template_directory() . '/inc/lazyload.php';
-if(class_exists('BuddyPress')){
+if (class_exists('BuddyPress')) {
 	require get_template_directory() . '/inc/buddypress.php';
 }
-if(class_exists('WooCommerce')){
+if (class_exists('WooCommerce')) {
 	require get_template_directory() . '/inc/woocommerce.php';
 }
-if(class_exists('WP_Job_Manager')){
+if (class_exists('WP_Job_Manager')) {
 	require get_template_directory() . '/inc/wp-job-manager.php';
 }
-if(class_exists('Tribe__Events__Main')){
+if (class_exists('Tribe__Events__Main')) {
 	require get_template_directory() . '/inc/the-events-calendar.php';
 }
 require get_template_directory() . '/inc/template-tags.php';
 require get_template_directory() . '/inc/extras.php';
 require get_template_directory() . '/inc/wp_bootstrap_navwalker.php';
-if(class_exists('Sensei_WC')){
+if (class_exists('Sensei_WC')) {
 	require get_template_directory() . '/inc/sensei.php';
 }
 
@@ -48,10 +48,10 @@ 
  * @category	customizer
  * @return		$lsx_controls array()
  */
-function lsx_customizer_core_controls( $lsx_controls ) {
+function lsx_customizer_core_controls($lsx_controls) {
 	$lsx_controls['sections']['lsx-core'] = array(
-		'title'       =>  esc_html__( 'Core Settings', 'lsx' ),
-		'description' => __( 'Change the core settings.', 'lsx' ),
+		'title'       =>  esc_html__('Core Settings', 'lsx'),
+		'description' => __('Change the core settings.', 'lsx'),
 		'priority'    => 21
 	);
 
@@ -62,7 +62,7 @@ 
 	);
 
 	$lsx_controls['fields']['lsx_lazyload_status'] = array(
-		'label'         =>  __( 'Lazy Loading Images', 'lsx' ),
+		'label'         =>  __('Lazy Loading Images', 'lsx'),
 		'section'       =>  'lsx-core',
 		'type'          =>  'checkbox',
 	);
@@ -74,14 +74,14 @@ 
 	);
 
 	$lsx_controls['fields']['lsx_preloader_content_status'] = array(
-		'label'         =>  __( 'Preloader Content', 'lsx' ),
+		'label'         =>  __('Preloader Content', 'lsx'),
 		'section'       =>  'lsx-core',
 		'type'          =>  'checkbox',
 	);
 
 	return $lsx_controls;
 }
-add_filter( 'lsx_customizer_controls', 'lsx_customizer_core_controls' );
+add_filter('lsx_customizer_controls', 'lsx_customizer_core_controls');
 
 /**
  * Returns an array of the colour scheme picker.
@@ -91,7 +91,7 @@ 
  * @category	customizer
  * @return		$lsx_controls array()
  */
-function lsx_customizer_colour_scheme_controls( $lsx_controls ) {
+function lsx_customizer_colour_scheme_controls($lsx_controls) {
 	global $customizer_colour_names;
 	global $customizer_colour_choices;
 	
@@ -102,7 +102,7 @@ 
 	);
 
 	$lsx_controls['fields']['color_scheme'] = array(
-		'label'         =>  esc_html__( 'Base Color Scheme', 'lsx' ),
+		'label'         =>  esc_html__('Base Color Scheme', 'lsx'),
 		'section'       =>  'colors',
 		'type'          =>  'select',
 		'priority'      =>  1,
@@ -112,7 +112,7 @@ 
 
 	$counter = 0;
 
-	foreach ( $customizer_colour_names as $key => $value ) {
+	foreach ($customizer_colour_names as $key => $value) {
 		$lsx_controls['settings'][$key] = array(
 			'default'       =>  $customizer_colour_choices['default']['colors'][$counter],
 			'type'	        =>  'theme_mod',
@@ -131,7 +131,7 @@ 
 
 	return $lsx_controls;
 }
-add_filter( 'lsx_customizer_controls', 'lsx_customizer_colour_scheme_controls' );
+add_filter('lsx_customizer_controls', 'lsx_customizer_colour_scheme_controls');
 
 /**
  * Returns an array of the layout panel.
@@ -142,56 +142,56 @@ 
  * @return		$lsx_controls array()
  */
 function lsx_customizer_layout_controls($lsx_controls) {
-	$lsx_controls['settings']['lsx_header_layout']  = array(
+	$lsx_controls['settings']['lsx_header_layout'] = array(
 			'default'       =>  'inline', //Default setting/value to save
 			'type'        =>  'theme_mod', //Is this an 'option' or a 'theme_mod'?
 			'transport'     =>  'postMessage', //What triggers a refresh of the setting? 'refresh' or 'postMessage' (instant)?
 	);
 	$lsx_controls['fields']['lsx_header_layout'] = array(
-			'label'         =>  __('Header','lsx'),
+			'label'         =>  __('Header', 'lsx'),
 			'section'       =>  'lsx-layout',
 			'control'   =>  'LSX_Customize_Header_Layout_Control',
-			'choices'		=>	array('central','expanded','inline')
+			'choices'		=>	array('central', 'expanded', 'inline')
 	);	
 	$lsx_controls['sections']['lsx-layout'] = array(
-			'title'       =>  esc_html__( 'Layout', 'lsx' ),
-			'description' => __( 'Change the layout sitewide. If your homepage is set to use a page with a template, the following will not apply to it.', 'lsx' ),
+			'title'       =>  esc_html__('Layout', 'lsx'),
+			'description' => __('Change the layout sitewide. If your homepage is set to use a page with a template, the following will not apply to it.', 'lsx'),
 			'priority' => 22
 	);
-	$lsx_controls['settings']['lsx_layout']  = array(
+	$lsx_controls['settings']['lsx_layout'] = array(
 			'default'       =>  '2cr', //Default setting/value to save
 			'type'        =>  'theme_mod', //Is this an 'option' or a 'theme_mod'?
 			'transport'     =>  'refresh', //What triggers a refresh of the setting? 'refresh' or 'postMessage' (instant)?
 	);
-	$lsx_controls['settings']['lsx_header_fixed']  = array(
+	$lsx_controls['settings']['lsx_header_fixed'] = array(
 			'default'       =>  false, //Default setting/value to save
 			'sanitize_callback' => 'lsx_sanitize_checkbox',
 			'transport'     =>  'postMessage', //What triggers a refresh of the setting? 'refresh' or 'postMessage' (instant)?
 	);
 	$lsx_controls['fields']['lsx_header_fixed'] = array(
-			'label'         =>  __('Fixed Header','lsx'),
+			'label'         =>  __('Fixed Header', 'lsx'),
 			'section'       =>  'lsx-layout',
 			'type'       =>  'checkbox',
 	);
-	$lsx_controls['settings']['lsx_header_search']  = array(
+	$lsx_controls['settings']['lsx_header_search'] = array(
 			'default'       =>  false, //Default setting/value to save
 			'sanitize_callback' => 'lsx_sanitize_checkbox',
 			'transport'     =>  'postMessage', //What triggers a refresh of the setting? 'refresh' or 'postMessage' (instant)?
 	);
 	$lsx_controls['fields']['lsx_header_search'] = array(
-			'label'         =>  __('Search Box in Header','lsx'),
+			'label'         =>  __('Search Box in Header', 'lsx'),
 			'section'       =>  'lsx-layout',
 			'type'       =>  'checkbox',
 	);	
 	$lsx_controls['fields']['lsx_layout'] = array(
-			'label'         =>  __('Body','lsx'),
+			'label'         =>  __('Body', 'lsx'),
 			'section'       =>  'lsx-layout',
 			'control'   =>  'LSX_Customize_Layout_Control',
-			'choices'		=>	array('1c','2cr','2cl')
+			'choices'		=>	array('1c', '2cr', '2cl')
 	);	
 	return $lsx_controls;
 }
-add_filter('lsx_customizer_controls','lsx_customizer_layout_controls');
+add_filter('lsx_customizer_controls', 'lsx_customizer_layout_controls');
 
 /**
  * Returns an array of the font controls.
@@ -203,11 +203,11 @@ 
  */
 function lsx_customizer_font_controls($lsx_controls) {
 	$lsx_controls['sections']['lsx-font'] = array(
-			'title'       =>  __( 'Font', 'lsx' ),
+			'title'       =>  __('Font', 'lsx'),
 			'description' => 'Change the fonts sitewide.',
 			'priority' => 41
 	);
-	$lsx_controls['settings']['lsx_font']  = array(
+	$lsx_controls['settings']['lsx_font'] = array(
 			'default'       =>  'raleway_open_sans', //Default setting/value to save
 			'type'        =>  'theme_mod', //Is this an 'option' or a 'theme_mod'?
 			'transport'     =>  'refresh', //What triggers a refresh of the setting? 'refresh' or 'postMessage' (instant)?
@@ -221,13 +221,13 @@ 
 			'choices'   =>  array(
 					'raleway_open_sans' => array(
 							'header'  => array(
-									"title" => __( 'Raleway', 'lsx' ),
+									"title" => __('Raleway', 'lsx'),
 									"location" => "Raleway",
 									"cssDeclaration" => "'Raleway', sans-serif",
 									"cssClass" => "raleway",
 							),
 							'body'  => array(
-									"title" => __( 'Open Sans', 'lsx' ),
+									"title" => __('Open Sans', 'lsx'),
 									"location" => "Open+Sans",
 									"cssDeclaration" => "'Open Sans', sans-serif",
 									"cssClass" => "openSans"
@@ -235,13 +235,13 @@ 
 					),
 					'noto_serif_noto_sans' => array(
 							'header'  => array(
-									"title" => __( 'Noto Serif', 'lsx' ),
+									"title" => __('Noto Serif', 'lsx'),
 									"location" => "Noto+Serif",
 									"cssDeclaration" => "'Noto Serif', serif",
 									"cssClass" => "notoSerif",
 							),
 							'body'  => array(
-									"title" => __( 'Noto Sans', 'lsx' ),
+									"title" => __('Noto Sans', 'lsx'),
 									"location" => "Noto+Sans",
 									"cssDeclaration" => "'Noto Sans', sans-serif",
 									"cssClass" => "notoSans",
@@ -249,13 +249,13 @@ 
 					),
 					'noto_sans_noto_sans' => array(
 					'header'  => array(
-					"title" => __( 'Noto Sans', 'lsx' ),
+					"title" => __('Noto Sans', 'lsx'),
 					"location" => "Noto+Sans",
 					"cssDeclaration" => "'Noto Sans', sans-serif",
 					"cssClass" => "notoSans",
 					),
 					'body'  => array(
-					"title" => __( 'Noto Sans', 'lsx' ),
+					"title" => __('Noto Sans', 'lsx'),
 					"location" => "Noto+Sans",
 					"cssDeclaration" => "'Noto Sans', sans-serif",
 					"cssClass" => "notoSans",
@@ -263,13 +263,13 @@ 
 					),
 					'alegreya_open_sans' => array(
 					'header'  => array(
-					"title" => __( 'Alegreya', 'lsx' ),
+					"title" => __('Alegreya', 'lsx'),
 					"location" => "Alegreya",
 					"cssDeclaration" => "'Alegreya', serif",
 					"cssClass" => "alegreya",
 					),
 					'body'  => array(
-					"title" => __( 'Open Sans', 'lsx' ),
+					"title" => __('Open Sans', 'lsx'),
 					"location" => "Open+Sans",
 					"cssDeclaration" => "'Open Sans', sans-serif",
 					"cssClass" => "openSans"
@@ -280,7 +280,7 @@ 
 	);	
 	return $lsx_controls;
 }
-add_filter('lsx_customizer_controls','lsx_customizer_font_controls');
+add_filter('lsx_customizer_controls', 'lsx_customizer_font_controls');
 
 /**
  * Returns an array of $controls for the customizer class to generate.
@@ -290,12 +290,12 @@ 
  * @category	customizer
  * @return		$lsx_controls array()
  */
-function lsx_get_customizer_controls(){
+function lsx_get_customizer_controls() {
 	$lsx_controls = array();
 	$lsx_controls = apply_filters('lsx_customizer_controls', $lsx_controls);
 	return $lsx_controls;
 }
-$lsx_customizer = new LSX_Theme_Customizer( lsx_get_customizer_controls() );
+$lsx_customizer = new LSX_Theme_Customizer(lsx_get_customizer_controls());
 
-add_image_size( 'lsx-thumbnail-wide', 350, 230, true );
-add_image_size( 'lsx-thumbnail-single', 750, 350, true );
\ No newline at end of file
+add_image_size('lsx-thumbnail-wide', 350, 230, true);
+add_image_size('lsx-thumbnail-single', 750, 350, true);
\ No newline at end of file

page-templates/template-full-width.php

Spacing +3 added lines, -3 removed lines

@@ -13,9 +13,9 @@ 
 
 			<?php lsx_content_top(); ?>		
 			
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?php while (have_posts()) : the_post(); ?>
 		
-					<?php get_template_part( 'content', 'page' ); ?>
+					<?php get_template_part('content', 'page'); ?>
 		
 				<?php endwhile; // end of the loop. ?>		
 				
@@ -23,7 +23,7 @@ 
 			
 			<?php
 				// If comments are open or we have at least one comment, load up the comment template
-				if ( comments_open() || '0' != get_comments_number() ) :
+				if (comments_open() || '0' != get_comments_number()) :
 					comments_template();
 				endif;
 			?>			

archive.php

Braces +5 added lines, -2 removed lines

@@ -44,9 +44,12 @@
 			
 			<?php lsx_paging_nav(); ?>
 
-		<?php else : ?>
+		<?php else {
+	: ?>
 
-			<?php get_template_part( 'content', 'none' ); ?>
+			<?php get_template_part( 'content', 'none' );
+}
+?>
 
 		<?php endif; ?>
 

Spacing +8 added lines, -8 removed lines

@@ -11,7 +11,7 @@ 
 
 	<?php lsx_content_wrap_before(); ?>
 
-	<div id="primary" class="content-area <?php echo esc_attr( lsx_main_class() ); ?>">
+	<div id="primary" class="content-area <?php echo esc_attr(lsx_main_class()); ?>">
 
 		<?php lsx_content_before(); ?>
 
@@ -19,12 +19,12 @@ 
 
 		<?php lsx_content_top(); ?>
 
-		<?php if ( have_posts() ) : ?>
+		<?php if (have_posts()) : ?>
 			
 			<?php 
-			$layout = get_theme_mod('lsx_layout','2cr');
-			$layout = apply_filters( 'lsx_layout', $layout );
-			if('1c' === $layout && !is_post_type_archive('tribe_events')){
+			$layout = get_theme_mod('lsx_layout', '2cr');
+			$layout = apply_filters('lsx_layout', $layout);
+			if ('1c' === $layout && ! is_post_type_archive('tribe_events')) {
 				lsx_breadcrumbs();
 			}
 			?>
@@ -33,14 +33,14 @@ 
 			?>			
 
 			<?php /* Start the Loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php while (have_posts()) : the_post(); ?>
 
 				<?php
 					/* Include the Post-Format-specific template for the content.
 					 * If you want to override this in a child theme, then include a file
 					 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
 					 */
-					get_template_part( 'content', get_post_format() );
+					get_template_part('content', get_post_format());
 				?>
 
 			<?php endwhile; ?>
@@ -49,7 +49,7 @@ 
 
 		<?php else : ?>
 
-			<?php get_template_part( 'content', 'none' ); ?>
+			<?php get_template_part('content', 'none'); ?>
 
 		<?php endif; ?>
 

index.php

Braces +5 added lines, -2 removed lines

@@ -44,9 +44,12 @@
 			
 			<?php lsx_paging_nav(); ?>
 
-		<?php else : ?>
+		<?php else {
+	: ?>
 
-			<?php get_template_part( 'content', 'none' ); ?>
+			<?php get_template_part( 'content', 'none' );
+}
+?>
 
 		<?php endif; ?>
 

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
 
 	<?php lsx_content_wrap_before(); ?>
 
-	<div id="primary" class="content-area <?php echo esc_attr( lsx_main_class() ); ?>">
+	<div id="primary" class="content-area <?php echo esc_attr(lsx_main_class()); ?>">
 
 		<?php lsx_content_before(); ?>
 
@@ -23,17 +23,17 @@ 
 		
 		<?php lsx_content_top(); ?>
 
-		<?php if ( have_posts() ) : ?>
+		<?php if (have_posts()) : ?>
 
 			<?php /* Start the Loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php while (have_posts()) : the_post(); ?>
 
 				<?php
 					/* Include the Post-Format-specific template for the content.
 					 * If you want to override this in a child theme, then include a file
 					 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
 					 */
-					get_template_part( 'content', get_post_format() );
+					get_template_part('content', get_post_format());
 				?>
 
 			<?php endwhile; ?>
@@ -42,7 +42,7 @@ 
 			
 		<?php else : ?>
 
-			<?php get_template_part( 'content', 'none' ); ?>
+			<?php get_template_part('content', 'none'); ?>
 
 		<?php endif; ?>
 
@@ -56,5 +56,5 @@ 
 
 	<?php lsx_content_wrap_after(); ?>
 
-<?php get_sidebar( 'sidebar' ); ?>
+<?php get_sidebar('sidebar'); ?>
 <?php get_footer();
\ No newline at end of file

inc/customizer-colour-options.php

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) return; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	return;
+}
+// Exit if accessed directly
 
 /**
  * Customize Swatch Control Class

Spacing +61 added lines, -61 removed lines

@@ -1,66 +1,66 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) return; // Exit if accessed directly
+if ( ! defined('ABSPATH')) return; // Exit if accessed directly
 
 global $customizer_colour_names;
 global $customizer_colour_choices;
 
-$customizer_colour_names = apply_filters( 'lsx_customizer_colour_names', array(
-	'button_background_color'           => esc_html__( 'BUTTON: Background', 'lsx' ),
-	'button_background_hover_color'     => esc_html__( 'BUTTON: Background (hover)', 'lsx' ),
-	'button_text_color'                 => esc_html__( 'BUTTON: Text', 'lsx' ),
-	'button_text_color_hover'           => esc_html__( 'BUTTON: Text (hover)', 'lsx' ),
+$customizer_colour_names = apply_filters('lsx_customizer_colour_names', array(
+	'button_background_color'           => esc_html__('BUTTON: Background', 'lsx'),
+	'button_background_hover_color'     => esc_html__('BUTTON: Background (hover)', 'lsx'),
+	'button_text_color'                 => esc_html__('BUTTON: Text', 'lsx'),
+	'button_text_color_hover'           => esc_html__('BUTTON: Text (hover)', 'lsx'),
 
-	'button_cta_background_color'       => esc_html__( 'BUTTON CTA: Background', 'lsx' ),
-	'button_cta_background_hover_color' => esc_html__( 'BUTTON CTA: Background (hover)', 'lsx' ),
-	'button_cta_text_color'             => esc_html__( 'BUTTON CTA: Text', 'lsx' ),
-	'button_cta_text_color_hover'       => esc_html__( 'BUTTON CTA: Text (hover)', 'lsx' ),
+	'button_cta_background_color'       => esc_html__('BUTTON CTA: Background', 'lsx'),
+	'button_cta_background_hover_color' => esc_html__('BUTTON CTA: Background (hover)', 'lsx'),
+	'button_cta_text_color'             => esc_html__('BUTTON CTA: Text', 'lsx'),
+	'button_cta_text_color_hover'       => esc_html__('BUTTON CTA: Text (hover)', 'lsx'),
 
-	'top_menu_background_color'         => esc_html__( 'TOP MENU: Background', 'lsx' ),
-	'top_menu_text_color'               => esc_html__( 'TOP MENU: Text', 'lsx' ),
-	'top_menu_text_hover_color'         => esc_html__( 'TOP MENU: Text (hover)', 'lsx' ),
+	'top_menu_background_color'         => esc_html__('TOP MENU: Background', 'lsx'),
+	'top_menu_text_color'               => esc_html__('TOP MENU: Text', 'lsx'),
+	'top_menu_text_hover_color'         => esc_html__('TOP MENU: Text (hover)', 'lsx'),
 
-	'header_background_color'           => esc_html__( 'HEADER: Background', 'lsx' ),
-	'header_title_color'                => esc_html__( 'HEADER: Title', 'lsx' ),
-	'header_title_hover_color'          => esc_html__( 'HEADER: Title (hover)', 'lsx' ),
-	'header_description_color'          => esc_html__( 'HEADER: Description', 'lsx' ),
+	'header_background_color'           => esc_html__('HEADER: Background', 'lsx'),
+	'header_title_color'                => esc_html__('HEADER: Title', 'lsx'),
+	'header_title_hover_color'          => esc_html__('HEADER: Title (hover)', 'lsx'),
+	'header_description_color'          => esc_html__('HEADER: Description', 'lsx'),
 
-	'main_menu_background_hover1_color' => esc_html__( 'MENU: Background (L1 hover)', 'lsx' ),
-	'main_menu_background_hover2_color' => esc_html__( 'MENU: Background (L2 hover)', 'lsx' ),
-	'main_menu_text_color'              => esc_html__( 'MENU: Text (L1)', 'lsx' ),
-	'main_menu_text_hover1_color'       => esc_html__( 'MENU: Text (L1 hover)', 'lsx' ),
-	'main_menu_text_hover2_color'       => esc_html__( 'MENU: Text (L2 hover)', 'lsx' ),
+	'main_menu_background_hover1_color' => esc_html__('MENU: Background (L1 hover)', 'lsx'),
+	'main_menu_background_hover2_color' => esc_html__('MENU: Background (L2 hover)', 'lsx'),
+	'main_menu_text_color'              => esc_html__('MENU: Text (L1)', 'lsx'),
+	'main_menu_text_hover1_color'       => esc_html__('MENU: Text (L1 hover)', 'lsx'),
+	'main_menu_text_hover2_color'       => esc_html__('MENU: Text (L2 hover)', 'lsx'),
 
-	'banner_background_color'           => esc_html__( 'BANNER: Background', 'lsx' ),
-	'banner_text_color'                 => esc_html__( 'BANNER: Text', 'lsx' ),
-	'banner_text_image_color'           => esc_html__( 'BANNER: Text (over image)', 'lsx' ),
+	'banner_background_color'           => esc_html__('BANNER: Background', 'lsx'),
+	'banner_text_color'                 => esc_html__('BANNER: Text', 'lsx'),
+	'banner_text_image_color'           => esc_html__('BANNER: Text (over image)', 'lsx'),
 
-	'body_background_color'             => esc_html__( 'BODY: Background', 'lsx' ),
-	'body_line_color'                   => esc_html__( 'BODY: Line', 'lsx' ),
-	'body_text_heading_color'           => esc_html__( 'BODY: Text (heading)', 'lsx' ),
-	'body_text_color'                   => esc_html__( 'BODY: Text', 'lsx' ),
-	'body_link_color'                   => esc_html__( 'BODY: Link', 'lsx' ),
-	'body_link_hover_color'             => esc_html__( 'BODY: Link (hover)', 'lsx' ),
+	'body_background_color'             => esc_html__('BODY: Background', 'lsx'),
+	'body_line_color'                   => esc_html__('BODY: Line', 'lsx'),
+	'body_text_heading_color'           => esc_html__('BODY: Text (heading)', 'lsx'),
+	'body_text_color'                   => esc_html__('BODY: Text', 'lsx'),
+	'body_link_color'                   => esc_html__('BODY: Link', 'lsx'),
+	'body_link_hover_color'             => esc_html__('BODY: Link (hover)', 'lsx'),
 
-	'footer_cta_background_color'       => esc_html__( 'FOOTER CTA: Background', 'lsx' ),
-	'footer_cta_text_color'             => esc_html__( 'FOOTER CTA: Text', 'lsx' ),
-	'footer_cta_link_color'             => esc_html__( 'FOOTER CTA: Link', 'lsx' ),
-	'footer_cta_link_hover_color'       => esc_html__( 'FOOTER CTA: Link (hover)', 'lsx' ),
+	'footer_cta_background_color'       => esc_html__('FOOTER CTA: Background', 'lsx'),
+	'footer_cta_text_color'             => esc_html__('FOOTER CTA: Text', 'lsx'),
+	'footer_cta_link_color'             => esc_html__('FOOTER CTA: Link', 'lsx'),
+	'footer_cta_link_hover_color'       => esc_html__('FOOTER CTA: Link (hover)', 'lsx'),
 
-	'footer_widgets_background_color'   => esc_html__( 'FOOTER WIDGETS: Background', 'lsx' ),
-	'footer_widgets_text_color'         => esc_html__( 'FOOTER WIDGETS: Text', 'lsx' ),
-	'footer_widgets_link_color'         => esc_html__( 'FOOTER WIDGETS: Link', 'lsx' ),
-	'footer_widgets_link_hover_color'   => esc_html__( 'FOOTER WIDGETS: Link (hover)', 'lsx' ),
+	'footer_widgets_background_color'   => esc_html__('FOOTER WIDGETS: Background', 'lsx'),
+	'footer_widgets_text_color'         => esc_html__('FOOTER WIDGETS: Text', 'lsx'),
+	'footer_widgets_link_color'         => esc_html__('FOOTER WIDGETS: Link', 'lsx'),
+	'footer_widgets_link_hover_color'   => esc_html__('FOOTER WIDGETS: Link (hover)', 'lsx'),
 
-	'footer_background_color'           => esc_html__( 'FOOTER: Background', 'lsx' ),
-	'footer_text_color'                 => esc_html__( 'FOOTER: Text', 'lsx' ),
-	'footer_link_color'                 => esc_html__( 'FOOTER: Link', 'lsx' ),
-	'footer_link_hover_color'           => esc_html__( 'FOOTER: Link (hover)', 'lsx' )
-) );
+	'footer_background_color'           => esc_html__('FOOTER: Background', 'lsx'),
+	'footer_text_color'                 => esc_html__('FOOTER: Text', 'lsx'),
+	'footer_link_color'                 => esc_html__('FOOTER: Link', 'lsx'),
+	'footer_link_hover_color'           => esc_html__('FOOTER: Link (hover)', 'lsx')
+));
 
-$customizer_colour_choices = apply_filters( 'lsx_customizer_colour_choices', array(
+$customizer_colour_choices = apply_filters('lsx_customizer_colour_choices', array(
 	'default' => array(
-		'label'  => __( 'Default', 'lsx' ),
-		'colors' => apply_filters( 'lsx_customizer_colour_choices_default', array(
+		'label'  => __('Default', 'lsx'),
+		'colors' => apply_filters('lsx_customizer_colour_choices_default', array(
 			// Button
 			'#428bca', '#2a6496', '#ffffff', '#ffffff',
 			// Button CTA
@@ -81,11 +81,11 @@ 
 			'#333333', '#eeeeee', '#dddddd', '#cccccc',
 			// Footer
 			'#232222', '#ffffff', '#337ab7', '#969696'
-		) )
+		))
 	),
 	'red' => array(
-		'label'  => __( 'Red', 'lsx' ),
-		'colors' => apply_filters( 'lsx_customizer_colour_choices_red', array(
+		'label'  => __('Red', 'lsx'),
+		'colors' => apply_filters('lsx_customizer_colour_choices_red', array(
 			// Button
 			'#b64d3f', '#87291c', '#ffffff', '#ffffff',
 			// Button CTA
@@ -106,11 +106,11 @@ 
 			'#333333', '#eeeeee', '#dddddd', '#cccccc',
 			// Footer
 			'#232222', '#ffffff', '#b64d3f', '#969696'
-		) )
+		))
 	),
 	'orange' => array(
-		'label'  => __( 'Orange', 'lsx' ),
-		'colors' => apply_filters( 'lsx_customizer_colour_choices_orange', array(
+		'label'  => __('Orange', 'lsx'),
+		'colors' => apply_filters('lsx_customizer_colour_choices_orange', array(
 			// Button
 			'#fbaf3f', '#e49435', '#260e03', '#260e03',
 			// Button CTA
@@ -131,11 +131,11 @@ 
 			'#333333', '#eeeeee', '#dddddd', '#cccccc',
 			// Footer
 			'#232222', '#ffffff', '#e4701e', '#969696'
-		) )
+		))
 	),
 	'green' => array(
-		'label'  => __( 'Green', 'lsx' ),
-		'colors' => apply_filters( 'lsx_customizer_colour_choices_green', array(
+		'label'  => __('Green', 'lsx'),
+		'colors' => apply_filters('lsx_customizer_colour_choices_green', array(
 			// Button
 			'#596b46', '#3d4a30', '#ffffff', '#ffffff',
 			// Button CTA
@@ -156,11 +156,11 @@ 
 			'#333333', '#eeeeee', '#dddddd', '#cccccc',
 			// Footer
 			'#232222', '#ffffff', '#596b46', '#969696'
-		) )
+		))
 	),
 	'brown' => array(
-		'label'  => __( 'Brown', 'lsx' ),
-		'colors' => apply_filters( 'lsx_customizer_colour_choices_brown', array(
+		'label'  => __('Brown', 'lsx'),
+		'colors' => apply_filters('lsx_customizer_colour_choices_brown', array(
 			// Button
 			'#8c6a45', '#5b452e', '#ffffff', '#ffffff',
 			// Button CTA
@@ -181,6 +181,6 @@ 
 			'#333333', '#eeeeee', '#dddddd', '#cccccc',
 			// Footer
 			'#232222', '#ffffff', '#8c6a45', '#969696'
-		) )
+		))
 	)
-) );
+));