lightspeeddevelopment / lsx-customizer

classes/class-lsx-customizer-wysiwyg-control.php

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! class_exists( 'LSX_Customizer_Wysiwyg_Control' ) ) {
+if ( ! class_exists('LSX_Customizer_Wysiwyg_Control')) {
 
 	/**
 	 * LSX Customizer Wysiwyg Control Class
@@ -22,8 +22,8 @@ 
 		public function render_content() {
 			?>
 			<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 } ?>
 				<?php
 					$settings = array(
@@ -32,12 +32,12 @@ 
 					);
 
 					$this->filter_editor_setting_link();
-					wp_editor( $this->value(), $this->id, $settings );
+					wp_editor($this->value(), $this->id, $settings);
 				?>
 			</label>
 			<?php
-			do_action( 'admin_footer' );
-			do_action( 'admin_print_footer_scripts' );
+			do_action('admin_footer');
+			do_action('admin_print_footer_scripts');
 		}
 
 		/**
@@ -46,8 +46,8 @@ 
 		 * @since 1.1.1
 		 */
 		private function filter_editor_setting_link() {
-			add_filter( 'the_editor', function( $output ) {
-				return preg_replace( '/<textarea/', '<textarea ' . $this->get_link(), $output, 1 );
+			add_filter('the_editor', function($output) {
+				return preg_replace('/<textarea/', '<textarea ' . $this->get_link(), $output, 1);
 			} );
 		}
 

classes/class-lsx-customizer-colour.php

Spacing +141 added lines, -141 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! class_exists( 'LSX_Customizer_Colour' ) ) {
+if ( ! class_exists('LSX_Customizer_Colour')) {
 
 	/**
 	 * LSX Customizer Colour Class
@@ -114,9 +114,9 @@ 
 		 * @since 1.0.0
 		 */
 		public function __construct() {
-			add_action( 'after_setup_theme',                       array( $this, 'after_setup_theme' ), 20 );
-			add_action( 'customize_register',                      array( $this, 'customize_register' ), 20 );
-			add_action( 'customize_controls_print_footer_scripts', array( $this, 'colour_scheme_css_template' ) );
+			add_action('after_setup_theme', array($this, 'after_setup_theme'), 20);
+			add_action('customize_register', array($this, 'customize_register'), 20);
+			add_action('customize_controls_print_footer_scripts', array($this, 'colour_scheme_css_template'));
 		}
 
 		/**
@@ -126,48 +126,48 @@ 
 		 * @since 1.0.0
 		 */
 		public function after_setup_theme() {
-			require_once( LSX_CUSTOMIZER_PATH . 'includes/lsx-customizer-colour-options.php' );
-			require_once( LSX_CUSTOMIZER_PATH . 'includes/lsx-customizer-colour-deprecated.php' );
-			require_once( LSX_CUSTOMIZER_PATH . 'includes/lsx-customizer-templates.php' );
+			require_once(LSX_CUSTOMIZER_PATH . 'includes/lsx-customizer-colour-options.php');
+			require_once(LSX_CUSTOMIZER_PATH . 'includes/lsx-customizer-colour-deprecated.php');
+			require_once(LSX_CUSTOMIZER_PATH . 'includes/lsx-customizer-templates.php');
 
-			if ( class_exists( 'WP_Customize_Control' ) ) {
-				require_once( LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-control.php' );
+			if (class_exists('WP_Customize_Control')) {
+				require_once(LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-control.php');
 			}
 
-			require_once( LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-button.php' );
+			require_once(LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-button.php');
 			$this->button = new LSX_Customizer_Colour_Button();
 
-			require_once( LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-button-cta.php' );
+			require_once(LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-button-cta.php');
 			$this->button_cta = new LSX_Customizer_Colour_Button_CTA();
 
-			require_once( LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-button-secondary.php' );
+			require_once(LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-button-secondary.php');
 			$this->button_secondary = new LSX_Customizer_Colour_Button_Secondary();
 
-			require_once( LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-button-tertiary.php' );
+			require_once(LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-button-tertiary.php');
 			$this->button_tertiary = new LSX_Customizer_Colour_Button_Tertiary();
 
-			require_once( LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-top-menu.php' );
+			require_once(LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-top-menu.php');
 			$this->top_menu = new LSX_Customizer_Colour_Top_Menu();
 
-			require_once( LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-header.php' );
+			require_once(LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-header.php');
 			$this->header = new LSX_Customizer_Colour_Header();
 
-			require_once( LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-main-menu.php' );
+			require_once(LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-main-menu.php');
 			$this->main_menu = new LSX_Customizer_Colour_Main_Menu();
 
-			require_once( LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-banner.php' );
+			require_once(LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-banner.php');
 			$this->banner = new LSX_Customizer_Colour_Banner();
 
-			require_once( LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-body.php' );
+			require_once(LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-body.php');
 			$this->body = new LSX_Customizer_Colour_Body();
 
-			require_once( LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-footer-cta.php' );
+			require_once(LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-footer-cta.php');
 			$this->footer_cta = new LSX_Customizer_Colour_Footer_CTA();
 
-			require_once( LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-footer-widgets.php' );
+			require_once(LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-footer-widgets.php');
 			$this->footer_widgets = new LSX_Customizer_Colour_Footer_Widgets();
 
-			require_once( LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-footer.php' );
+			require_once(LSX_CUSTOMIZER_PATH . 'classes/class-lsx-customizer-colour-footer.php');
 			$this->footer = new LSX_Customizer_Colour_Footer();
 		}
 
@@ -177,124 +177,124 @@ 
 		 * @param WP_Customize_Manager $wp_customize Theme Customizer object.
 		 * @since 1.0.0
 		 */
-		public function customize_register( $wp_customize ) {
+		public function customize_register($wp_customize) {
 			global $customizer_colour_names;
 			global $customizer_colour_choices;
 
 			/**
 			 * Colors
 			 */
-			$wp_customize->add_panel( 'colors', array(
-				'title'             => esc_html__( 'Colors', 'lsx-customizer' ),
+			$wp_customize->add_panel('colors', array(
+				'title'             => esc_html__('Colors', 'lsx-customizer'),
 				'priority'          => 60,
-			) );
+			));
 
 			/**
 			 * Colors - Sections
 			 */
-			$wp_customize->add_section( 'colors-core', array(
-				'title'             => esc_html__( 'Color Scheme', 'lsx-customizer' ),
+			$wp_customize->add_section('colors-core', array(
+				'title'             => esc_html__('Color Scheme', 'lsx-customizer'),
 				'priority'          => 1,
 				'panel'             => 'colors',
-			) );
+			));
 
-			$wp_customize->add_section( 'colors-palette', array(
-				'title'             => esc_html__( 'Block Editor Color Palette', 'lsx-customizer' ),
-				'description' => esc_html__( 'Add colors to use within the Gutenberg editor color palette.', 'lsx-customizer' ),
+			$wp_customize->add_section('colors-palette', array(
+				'title'             => esc_html__('Block Editor Color Palette', 'lsx-customizer'),
+				'description' => esc_html__('Add colors to use within the Gutenberg editor color palette.', 'lsx-customizer'),
 				'priority'          => 2,
 				'panel'             => 'colors',
-			) );
+			));
 
-			$wp_customize->add_section( 'colors-button', array(
-				'title'             => esc_html__( 'Button', 'lsx-customizer' ),
+			$wp_customize->add_section('colors-button', array(
+				'title'             => esc_html__('Button', 'lsx-customizer'),
 				'priority'          => 3,
 				'panel'             => 'colors',
-			) );
+			));
 
-			$wp_customize->add_section( 'colors-button-cta', array(
-				'title'             => esc_html__( 'Button CTA', 'lsx-customizer' ),
+			$wp_customize->add_section('colors-button-cta', array(
+				'title'             => esc_html__('Button CTA', 'lsx-customizer'),
 				'priority'          => 4,
 				'panel'             => 'colors',
-			) );
+			));
 
-			$wp_customize->add_section( 'colors-button-secondary', array(
-				'title'             => esc_html__( 'Button Secondary', 'lsx-customizer' ),
+			$wp_customize->add_section('colors-button-secondary', array(
+				'title'             => esc_html__('Button Secondary', 'lsx-customizer'),
 				'priority'          => 5,
 				'panel'             => 'colors',
-			) );
+			));
 
-			$wp_customize->add_section( 'colors-button-tertiary', array(
-				'title'             => esc_html__( 'Button Tertiary', 'lsx-customizer' ),
+			$wp_customize->add_section('colors-button-tertiary', array(
+				'title'             => esc_html__('Button Tertiary', 'lsx-customizer'),
 				'priority'          => 6,
 				'panel'             => 'colors',
-			) );
+			));
 
-			$wp_customize->add_section( 'colors-top-menu', array(
-				'title'             => esc_html__( 'Top Menu', 'lsx-customizer' ),
+			$wp_customize->add_section('colors-top-menu', array(
+				'title'             => esc_html__('Top Menu', 'lsx-customizer'),
 				'priority'          => 7,
 				'panel'             => 'colors',
-			) );
+			));
 
-			$wp_customize->add_section( 'colors-header', array(
-				'title'             => esc_html__( 'Header', 'lsx-customizer' ),
+			$wp_customize->add_section('colors-header', array(
+				'title'             => esc_html__('Header', 'lsx-customizer'),
 				'priority'          => 8,
 				'panel'             => 'colors',
-			) );
+			));
 
-			$wp_customize->add_section( 'colors-main-menu', array(
-				'title'             => esc_html__( 'Main Menu', 'lsx-customizer' ),
+			$wp_customize->add_section('colors-main-menu', array(
+				'title'             => esc_html__('Main Menu', 'lsx-customizer'),
 				'priority'          => 9,
 				'panel'             => 'colors',
-			) );
+			));
 
-			$wp_customize->add_section( 'colors-banner', array(
-				'title'             => esc_html__( 'Banner', 'lsx-customizer' ),
+			$wp_customize->add_section('colors-banner', array(
+				'title'             => esc_html__('Banner', 'lsx-customizer'),
 				'priority'          => 10,
 				'panel'             => 'colors',
-			) );
+			));
 
-			$wp_customize->add_section( 'colors-body', array(
-				'title'             => esc_html__( 'Body', 'lsx-customizer' ),
+			$wp_customize->add_section('colors-body', array(
+				'title'             => esc_html__('Body', 'lsx-customizer'),
 				'priority'          => 11,
 				'panel'             => 'colors',
-			) );
+			));
 
-			$wp_customize->add_section( 'colors-footer-cta', array(
-				'title'             => esc_html__( 'Footer CTA', 'lsx-customizer' ),
+			$wp_customize->add_section('colors-footer-cta', array(
+				'title'             => esc_html__('Footer CTA', 'lsx-customizer'),
 				'priority'          => 12,
 				'panel'             => 'colors',
-			) );
+			));
 
-			$wp_customize->add_section( 'colors-footer-widgets', array(
-				'title'             => esc_html__( 'Footer Widgets', 'lsx-customizer' ),
+			$wp_customize->add_section('colors-footer-widgets', array(
+				'title'             => esc_html__('Footer Widgets', 'lsx-customizer'),
 				'priority'          => 13,
 				'panel'             => 'colors',
-			) );
+			));
 
-			$wp_customize->add_section( 'colors-footer', array(
-				'title'             => esc_html__( 'Footer', 'lsx-customizer' ),
+			$wp_customize->add_section('colors-footer', array(
+				'title'             => esc_html__('Footer', 'lsx-customizer'),
 				'priority'          => 14,
 				'panel'             => 'colors',
-			) );
+			));
 
 			/**
 			 * Color Scheme
 			 */
-			$wp_customize->add_setting( 'color_scheme', array(
+			$wp_customize->add_setting('color_scheme', array(
 				'default'           => 'default',
 				'type'              => 'theme_mod',
 				'transport'         => 'postMessage',
-			) );
+			));
 
-			$wp_customize->add_control( new LSX_Customizer_Colour_Control(
+			$wp_customize->add_control(new LSX_Customizer_Colour_Control(
 				$wp_customize, 'color_scheme', array(
-					'label'             => esc_html__( 'Base Color Scheme', 'lsx-customizer' ),
+					'label'             => esc_html__('Base Color Scheme', 'lsx-customizer'),
 					'section'           => 'colors-core',
 					'type'              => 'select',
 					'priority'          => 1,
 					'choices'           => $customizer_colour_choices,
 				)
-			) );
+			));
 
 			/**
 			 * Color Palette
@@ -302,30 +302,30 @@ 
 			$colors = $this->get_color_scheme();
 
 			$customizer_colour_defaults = array(
-				__( 'Primary', 'lsx-customizer' )        => get_theme_mod( 'button_background_color', $colors['button_background_color'] ),
-				__( 'Strong Primary', 'lsx-button_shadow' ) => get_theme_mod( 'button_shadow', $colors['body_link_color'] ),
-				__( 'Call To Action', 'lsx-customizer' ) => get_theme_mod( 'button_cta_background_color', $colors['button_cta_background_color'] ),
-				__( 'Strong CTA', 'lsx-button_shadow' )  => get_theme_mod( 'button_cta_shadow', $colors['button_cta_shadow'] ),
-				__( 'Secondary', 'lsx-customizer' )      => get_theme_mod( 'button_secondary_background_color', $colors['button_secondary_background_color'] ),
-				__( 'Strong Secondary', 'lsx-button_shadow' ) => get_theme_mod( 'button_secondary_shadow', $colors['button_secondary_shadow'] ),
-				__( 'Tertiary', 'lsx-customizer' )       => get_theme_mod( 'button_tertiary_background_color', $colors['button_tertiary_background_color'] ),
-				__( 'Strong Tertiary', 'lsx-button_shadow' ) => get_theme_mod( 'button_tertiary_shadow', $colors['button_tertiary_shadow'] ),
-				__( 'Heading Color', 'lsx-customizer' )  => get_theme_mod( 'body_text_heading_color', $colors['body_text_heading_color'] ),
-				__( 'Body Text color', 'lsx-button_shadow' ) => get_theme_mod( 'body_text_color', $colors['body_text_color'] ),
-				__( 'White', 'lsx-button_shadow' )       => '#ffffff',
-				__( 'Black', 'lsx-button_shadow' )       => '#000000',
+				__('Primary', 'lsx-customizer')        => get_theme_mod('button_background_color', $colors['button_background_color']),
+				__('Strong Primary', 'lsx-button_shadow') => get_theme_mod('button_shadow', $colors['body_link_color']),
+				__('Call To Action', 'lsx-customizer') => get_theme_mod('button_cta_background_color', $colors['button_cta_background_color']),
+				__('Strong CTA', 'lsx-button_shadow')  => get_theme_mod('button_cta_shadow', $colors['button_cta_shadow']),
+				__('Secondary', 'lsx-customizer')      => get_theme_mod('button_secondary_background_color', $colors['button_secondary_background_color']),
+				__('Strong Secondary', 'lsx-button_shadow') => get_theme_mod('button_secondary_shadow', $colors['button_secondary_shadow']),
+				__('Tertiary', 'lsx-customizer')       => get_theme_mod('button_tertiary_background_color', $colors['button_tertiary_background_color']),
+				__('Strong Tertiary', 'lsx-button_shadow') => get_theme_mod('button_tertiary_shadow', $colors['button_tertiary_shadow']),
+				__('Heading Color', 'lsx-customizer')  => get_theme_mod('body_text_heading_color', $colors['body_text_heading_color']),
+				__('Body Text color', 'lsx-button_shadow') => get_theme_mod('body_text_color', $colors['body_text_color']),
+				__('White', 'lsx-button_shadow')       => '#ffffff',
+				__('Black', 'lsx-button_shadow')       => '#000000',
 			);
-			foreach ( $customizer_colour_defaults as $key => $value ) {
+			foreach ($customizer_colour_defaults as $key => $value) {
 
-				$color_name = strtolower( str_replace( ' ', '_', $key ) );
+				$color_name = strtolower(str_replace(' ', '_', $key));
 				$color_name = $color_name . '_color';
 
-				$wp_customize->add_setting( $color_name, array(
+				$wp_customize->add_setting($color_name, array(
 					'default'           => $value,
 					'type'              => 'theme_mod',
 					'transport'         => 'postMessage',
 					'sanitize_callback' => 'sanitize_hex_color',
-				) );
+				));
 				$wp_customize->add_control(
 					new WP_Customize_Color_Control(
 						$wp_customize,
@@ -342,53 +342,53 @@ 
 			/**
 			 * Colors
 			 */
-			foreach ( $customizer_colour_names as $key => $value ) {
+			foreach ($customizer_colour_names as $key => $value) {
 				$sanitize_callback = 'sanitize_hex_color';
 
-				if ( 'background_color' === $key ) {
+				if ('background_color' === $key) {
 					$sanitize_callback = 'sanitize_hex_color_no_hash';
 				}
 
 				$section = 'colors-core';
 
-				if ( preg_match( '/^button_cta_.*/', $key ) ) {
+				if (preg_match('/^button_cta_.*/', $key)) {
 					$section = 'colors-button-cta';
-				} elseif ( preg_match( '/^button_secondary_.*/', $key ) ) {
+				} elseif (preg_match('/^button_secondary_.*/', $key)) {
 					$section = 'colors-button-secondary';
-				} elseif ( preg_match( '/^button_tertiary_.*/', $key ) ) {
+				} elseif (preg_match('/^button_tertiary_.*/', $key)) {
 					$section = 'colors-button-tertiary';
-				} elseif ( preg_match( '/^button_.*/', $key ) ) {
+				} elseif (preg_match('/^button_.*/', $key)) {
 					$section = 'colors-button';
-				} elseif ( preg_match( '/^top_menu_.*/', $key ) ) {
+				} elseif (preg_match('/^top_menu_.*/', $key)) {
 					$section = 'colors-top-menu';
-				} elseif ( preg_match( '/^header_.*/', $key ) ) {
+				} elseif (preg_match('/^header_.*/', $key)) {
 					$section = 'colors-header';
-				} elseif ( preg_match( '/^main_menu_.*/', $key ) ) {
+				} elseif (preg_match('/^main_menu_.*/', $key)) {
 					$section = 'colors-main-menu';
-				} elseif ( preg_match( '/^banner_.*/', $key ) ) {
+				} elseif (preg_match('/^banner_.*/', $key)) {
 					$section = 'colors-banner';
-				} elseif ( preg_match( '/^body_.*/', $key ) || 'background_color' === $key ) {
+				} elseif (preg_match('/^body_.*/', $key) || 'background_color' === $key) {
 					$section = 'colors-body';
-				} elseif ( preg_match( '/^footer_cta_.*/', $key ) ) {
+				} elseif (preg_match('/^footer_cta_.*/', $key)) {
 					$section = 'colors-footer-cta';
-				} elseif ( preg_match( '/^footer_widgets_.*/', $key ) ) {
+				} elseif (preg_match('/^footer_widgets_.*/', $key)) {
 					$section = 'colors-footer-widgets';
-				} elseif ( preg_match( '/^footer_.*/', $key ) ) {
+				} elseif (preg_match('/^footer_.*/', $key)) {
 					$section = 'colors-footer';
 				}
 
-				$wp_customize->add_setting( $key, array(
-					'default'           => $customizer_colour_choices['default']['colors'][ $key ],
+				$wp_customize->add_setting($key, array(
+					'default'           => $customizer_colour_choices['default']['colors'][$key],
 					'type'              => 'theme_mod',
 					'transport'         => 'postMessage',
 					'sanitize_callback' => $sanitize_callback,
-				) );
+				));
 
-				$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, $key, array(
+				$wp_customize->add_control(new WP_Customize_Color_Control($wp_customize, $key, array(
 					'label'             => $value,
 					'section'           => $section,
 					'settings'          => $key,
-				) ) );
+				)));
 			}
 		}
 
@@ -402,26 +402,26 @@ 
 
 			$colors = array();
 
-			foreach ( $customizer_colour_names as $key => $value ) {
-				$colors[ $key ] = 'unquote("{{ data.' . $key . ' }}")';
+			foreach ($customizer_colour_names as $key => $value) {
+				$colors[$key] = 'unquote("{{ data.' . $key . ' }}")';
 			}
 			?>
 			<script type="text/html" id="tmpl-lsx-color-scheme">
-				<?php echo esc_attr( $this->top_menu->get_css( $colors ) ); ?>
-				<?php echo esc_attr( $this->header->get_css( $colors ) ); ?>
-				<?php echo esc_attr( $this->main_menu->get_css( $colors ) ); ?>
+				<?php echo esc_attr($this->top_menu->get_css($colors)); ?>
+				<?php echo esc_attr($this->header->get_css($colors)); ?>
+				<?php echo esc_attr($this->main_menu->get_css($colors)); ?>
 
-				<?php echo esc_attr( $this->banner->get_css( $colors ) ); ?>
-				<?php echo esc_attr( $this->body->get_css( $colors ) ); ?>
+				<?php echo esc_attr($this->banner->get_css($colors)); ?>
+				<?php echo esc_attr($this->body->get_css($colors)); ?>
 
-				<?php echo esc_attr( $this->footer_cta->get_css( $colors ) ); ?>
-				<?php echo esc_attr( $this->footer_widgets->get_css( $colors ) ); ?>
-				<?php echo esc_attr( $this->footer->get_css( $colors ) ); ?>
+				<?php echo esc_attr($this->footer_cta->get_css($colors)); ?>
+				<?php echo esc_attr($this->footer_widgets->get_css($colors)); ?>
+				<?php echo esc_attr($this->footer->get_css($colors)); ?>
 
-				<?php echo esc_attr( $this->button->get_css( $colors ) ); ?>
-				<?php echo esc_attr( $this->button_cta->get_css( $colors ) ); ?>
-				<?php echo esc_attr( $this->button_secondary->get_css( $colors ) ); ?>
-				<?php echo esc_attr( $this->button_tertiary->get_css( $colors ) ); ?>
+				<?php echo esc_attr($this->button->get_css($colors)); ?>
+				<?php echo esc_attr($this->button_cta->get_css($colors)); ?>
+				<?php echo esc_attr($this->button_secondary->get_css($colors)); ?>
+				<?php echo esc_attr($this->button_tertiary->get_css($colors)); ?>
 			</script>
 			<?php
 		}
@@ -431,16 +431,16 @@ 
 		 *
 		 * @since 1.0.0
 		 */
-		public function scss_to_css( $scss ) {
+		public function scss_to_css($scss) {
 			$css                 = '';
 			$scss_php_file       = LSX_CUSTOMIZER_PATH . 'vendor/leafo/scssphp/scss.inc.php';
 			$lsx_theme_sass_file = get_template_directory() . '/assets/css/scss/lsx.scss';
 
-			if ( ! empty( $scss ) && file_exists( $scss_php_file ) && file_exists( $lsx_theme_sass_file ) ) {
+			if ( ! empty($scss) && file_exists($scss_php_file) && file_exists($lsx_theme_sass_file)) {
 				require_once $scss_php_file;
 
 				$compiler = new \Leafo\ScssPhp\Compiler();
-				$compiler->setFormatter( 'Leafo\ScssPhp\Formatter\Compact' );
+				$compiler->setFormatter('Leafo\ScssPhp\Formatter\Compact');
 
 				try {
 					$scss = '
@@ -450,8 +450,8 @@ 
 						' . $scss . '
 					';
 
-					$css = $compiler->compile( $scss );
-				} catch ( \Exception $e ) {
+					$css = $compiler->compile($scss);
+				} catch (\Exception $e) {
 					$error = $e->getMessage();
 					return "/*\n\n\$error:\n\n{$error}\n\n\$scss:\n\n{$scss} */";
 				}
@@ -465,17 +465,17 @@ 
 		 *
 		 * @since 1.0.0
 		 */
-		public static function hex2rgb( $color ) {
-			$color = trim( $color, '#' );
-
-			if ( strlen( $color ) === 3 ) {
-				$r = hexdec( substr( $color, 0, 1 ) . substr( $color, 0, 1 ) );
-				$g = hexdec( substr( $color, 1, 1 ) . substr( $color, 1, 1 ) );
-				$b = hexdec( substr( $color, 2, 1 ) . substr( $color, 2, 1 ) );
-			} elseif ( strlen( $color ) === 6 ) {
-				$r = hexdec( substr( $color, 0, 2 ) );
-				$g = hexdec( substr( $color, 2, 2 ) );
-				$b = hexdec( substr( $color, 4, 2 ) );
+		public static function hex2rgb($color) {
+			$color = trim($color, '#');
+
+			if (strlen($color) === 3) {
+				$r = hexdec(substr($color, 0, 1) . substr($color, 0, 1));
+				$g = hexdec(substr($color, 1, 1) . substr($color, 1, 1));
+				$b = hexdec(substr($color, 2, 1) . substr($color, 2, 1));
+			} elseif (strlen($color) === 6) {
+				$r = hexdec(substr($color, 0, 2));
+				$g = hexdec(substr($color, 2, 2));
+				$b = hexdec(substr($color, 4, 2));
 			} else {
 				return array();
 			}
@@ -495,11 +495,11 @@ 
 		public function get_color_scheme() {
 			global $customizer_colour_choices;
 
-			$color_scheme_option = get_theme_mod( 'color_scheme', 'default' );
+			$color_scheme_option = get_theme_mod('color_scheme', 'default');
 			$color_schemes = $customizer_colour_choices;
 
-			if ( array_key_exists( $color_scheme_option, $color_schemes ) ) {
-				return $color_schemes[ $color_scheme_option ]['colors'];
+			if (array_key_exists($color_scheme_option, $color_schemes)) {
+				return $color_schemes[$color_scheme_option]['colors'];
 			}
 
 			return $color_schemes['default']['colors'];

classes/class-lsx-customizer-woocommerce.php

Spacing +226 added lines, -226 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! class_exists( 'LSX_Customizer_WooCommerce' ) ) {
+if ( ! class_exists('LSX_Customizer_WooCommerce')) {
 
 	/**
 	 * LSX Customizer WooCommerce Class
@@ -18,24 +18,24 @@ 
 		 * @since 1.1.1
 		 */
 		public function __construct() {
-			add_action( 'customize_register', array( $this, 'customize_register' ), 20 );
+			add_action('customize_register', array($this, 'customize_register'), 20);
 
-			add_filter( 'body_class', array( $this, 'body_class' ), 2999 );
+			add_filter('body_class', array($this, 'body_class'), 2999);
 
-			add_action( 'template_redirect', array( $this, 'thankyou_page' ), 2999 );
+			add_action('template_redirect', array($this, 'thankyou_page'), 2999);
 
-			if ( empty( get_theme_mod( 'lsx_two_step_checkout', false ) ) ) {
-				add_action( 'lsx_entry_inside_top', array( $this, 'checkout_steps' ), 15 );
+			if (empty(get_theme_mod('lsx_two_step_checkout', false))) {
+				add_action('lsx_entry_inside_top', array($this, 'checkout_steps'), 15);
 			}
 
-			add_action( 'wp', array( $this, 'cart_extra_html' ), 2999 );
-			add_action( 'wp', array( $this, 'checkout_extra_html' ), 2999 );
-			add_action( 'lsx_wc_cart_menu_item_position', array( $this, 'cart_menu_item_position' ) );
-			add_action( 'lsx_wc_cart_menu_item_class', array( $this, 'cart_menu_item_class' ) );
+			add_action('wp', array($this, 'cart_extra_html'), 2999);
+			add_action('wp', array($this, 'checkout_extra_html'), 2999);
+			add_action('lsx_wc_cart_menu_item_position', array($this, 'cart_menu_item_position'));
+			add_action('lsx_wc_cart_menu_item_class', array($this, 'cart_menu_item_class'));
 
-			add_filter( 'wp_nav_menu_items', array( $this, 'my_account_menu_item' ), 9, 2 );
-			add_action( 'lsx_wc_my_account_menu_item_position', array( $this, 'my_account_menu_item_position' ) );
-			add_action( 'lsx_wc_my_account_menu_item_class', array( $this, 'my_account_menu_item_class' ) );
+			add_filter('wp_nav_menu_items', array($this, 'my_account_menu_item'), 9, 2);
+			add_action('lsx_wc_my_account_menu_item_position', array($this, 'my_account_menu_item_position'));
+			add_action('lsx_wc_my_account_menu_item_class', array($this, 'my_account_menu_item_class'));
 
 			// Shop Layout Switcher.
 			//add_action( 'wp_head', array( $this, 'show_layout_switcher' ), 1 );
@@ -48,254 +48,254 @@ 
 		 * @param WP_Customize_Manager $wp_customize Theme Customizer object.
 		 * @since 1.1.1
 		 */
-		public function customize_register( $wp_customize ) {
+		public function customize_register($wp_customize) {
 			/**
 			 * Checkout.
 			 */
 
-			$wp_customize->add_section( 'lsx-wc-checkout', array(
-				'title'       => esc_html__( 'LSX Checkout', 'lsx-customizer' ),
-				'description' => esc_html__( 'Change the WooCommerce checkout settings.', 'lsx-customizer' ),
+			$wp_customize->add_section('lsx-wc-checkout', array(
+				'title'       => esc_html__('LSX Checkout', 'lsx-customizer'),
+				'description' => esc_html__('Change the WooCommerce checkout settings.', 'lsx-customizer'),
 				'panel'       => 'woocommerce',
 				'priority'    => 3,
-			) );
+			));
 
-			$wp_customize->add_setting( 'lsx_checkout_steps', array(
+			$wp_customize->add_setting('lsx_checkout_steps', array(
 				'default'           => true,
-				'sanitize_callback' => array( $this, 'sanitize_checkbox' ),
-			) );
+				'sanitize_callback' => array($this, 'sanitize_checkbox'),
+			));
 
-			$wp_customize->add_control( new WP_Customize_Control( $wp_customize, 'lsx_checkout_steps', array(
-				'label'       => esc_html__( 'Steps', 'lsx-customizer' ),
-				'description' => esc_html__( 'Enable the checkout steps header.', 'lsx-customizer' ),
+			$wp_customize->add_control(new WP_Customize_Control($wp_customize, 'lsx_checkout_steps', array(
+				'label'       => esc_html__('Steps', 'lsx-customizer'),
+				'description' => esc_html__('Enable the checkout steps header.', 'lsx-customizer'),
 				'section'     => 'lsx-wc-checkout',
 				'settings'    => 'lsx_checkout_steps',
 				'type'        => 'checkbox',
 				'priority'    => 1,
-			) ) );
+			)));
 
 			/**
 			 * Checkout Layout
 			 */
-			$wp_customize->add_setting( 'lsx_wc_checkout_layout', array(
+			$wp_customize->add_setting('lsx_wc_checkout_layout', array(
 				'default' => 'default',
-				'sanitize_callback' => array( $this, 'sanitize_select' ),
-			) );
+				'sanitize_callback' => array($this, 'sanitize_select'),
+			));
 
-			$wp_customize->add_control( new WP_Customize_Control( $wp_customize, 'lsx_wc_checkout_layout', array(
-				'label'       => esc_html__( 'Layout', 'lsx-customizer' ),
-				'description' => esc_html__( 'WooCommerce checkout layout.', 'lsx-customizer' ),
+			$wp_customize->add_control(new WP_Customize_Control($wp_customize, 'lsx_wc_checkout_layout', array(
+				'label'       => esc_html__('Layout', 'lsx-customizer'),
+				'description' => esc_html__('WooCommerce checkout layout.', 'lsx-customizer'),
 				'section'     => 'lsx-wc-checkout',
 				'settings'    => 'lsx_wc_checkout_layout',
 				'type'        => 'select',
 				'priority'    => 2,
 				'choices'     => array(
-					'default' => esc_html__( 'Default', 'lsx-customizer' ),
-					'stacked' => esc_html__( 'Stacked', 'lsx-customizer' ),
-					'columns' => esc_html__( 'Columns', 'lsx-customizer' ),
+					'default' => esc_html__('Default', 'lsx-customizer'),
+					'stacked' => esc_html__('Stacked', 'lsx-customizer'),
+					'columns' => esc_html__('Columns', 'lsx-customizer'),
 				),
-			) ) );
+			)));
 
-			$wp_customize->add_setting( 'lsx_wc_checkout_thankyou_page', array(
+			$wp_customize->add_setting('lsx_wc_checkout_thankyou_page', array(
 				'default' => '0',
-				'sanitize_callback' => array( $this, 'sanitize_select' ),
-			) );
+				'sanitize_callback' => array($this, 'sanitize_select'),
+			));
 
 			$choices = array(
-				'0' => esc_html__( 'Default', 'lsx-customizer' ),
+				'0' => esc_html__('Default', 'lsx-customizer'),
 			);
 
 			/**
 			 * Distraction Free Checkout
 			 */
-			$wp_customize->add_setting( 'lsx_distraction_free_checkout', array(
-				'sanitize_callback' => array( $this, 'sanitize_checkbox' ),
-			) );
+			$wp_customize->add_setting('lsx_distraction_free_checkout', array(
+				'sanitize_callback' => array($this, 'sanitize_checkbox'),
+			));
 
-			$wp_customize->add_control( new WP_Customize_Control(
+			$wp_customize->add_control(new WP_Customize_Control(
 				$wp_customize,
 				'lsx_distraction_free_checkout',
 				array(
-					'label'       => esc_html__( 'Distraction Free Checkout', 'lsx-customizer' ),
-					'description' => esc_html__( 'Removes all clutter from the checkout, allowing the customer to focus entirely on that procedure. Removes the stepped cart and checkout.', 'lsx-customizer' ),
+					'label'       => esc_html__('Distraction Free Checkout', 'lsx-customizer'),
+					'description' => esc_html__('Removes all clutter from the checkout, allowing the customer to focus entirely on that procedure. Removes the stepped cart and checkout.', 'lsx-customizer'),
 					'section'     => 'lsx-wc-checkout',
 					'settings'    => 'lsx_distraction_free_checkout',
 					'type'        => 'checkbox',
 					'priority'    => 3,
 				)
-			) );
+			));
 
 			/**
 			 * Two Step Checkout
 			 */
-			$wp_customize->add_setting( 'lsx_two_step_checkout', array(
-				'sanitize_callback' => array( $this, 'sanitize_checkbox' ),
-			) );
+			$wp_customize->add_setting('lsx_two_step_checkout', array(
+				'sanitize_callback' => array($this, 'sanitize_checkbox'),
+			));
 
-			$wp_customize->add_control( new WP_Customize_Control(
+			$wp_customize->add_control(new WP_Customize_Control(
 				$wp_customize,
 				'lsx_two_step_checkout',
 				array(
-					'label'       => esc_html__( 'Two Step Checkout', 'lsx-customizer' ),
-					'description' => esc_html__( 'Separates the customer details collection form, and the order summary / payment details form in to two separate pages. Removes the stepped cart and checkout.', 'lsx-customizer' ),
+					'label'       => esc_html__('Two Step Checkout', 'lsx-customizer'),
+					'description' => esc_html__('Separates the customer details collection form, and the order summary / payment details form in to two separate pages. Removes the stepped cart and checkout.', 'lsx-customizer'),
 					'section'     => 'lsx-wc-checkout',
 					'settings'    => 'lsx_two_step_checkout',
 					'type'        => 'checkbox',
 					'priority'    => 4,
 				)
-			) );
+			));
 
 			/**
 			 * Thank you page options
 			 */
 			$pages = get_pages();
 
-			foreach ( $pages as $key => $page ) {
-				$choices[ $page->ID ] = $page->post_title;
+			foreach ($pages as $key => $page) {
+				$choices[$page->ID] = $page->post_title;
 			}
 
-			$wp_customize->add_control( new WP_Customize_Control( $wp_customize, 'lsx_wc_checkout_thankyou_page', array(
-				'label'       => esc_html__( 'Thank You Page', 'lsx-customizer' ),
-				'description' => esc_html__( 'WooCommerce checkout thank you page.', 'lsx-customizer' ),
+			$wp_customize->add_control(new WP_Customize_Control($wp_customize, 'lsx_wc_checkout_thankyou_page', array(
+				'label'       => esc_html__('Thank You Page', 'lsx-customizer'),
+				'description' => esc_html__('WooCommerce checkout thank you page.', 'lsx-customizer'),
 				'section'     => 'lsx-wc-checkout',
 				'settings'    => 'lsx_wc_checkout_thankyou_page',
 				'type'        => 'select',
 				'priority'    => 5,
 				'choices'     => $choices,
-			) ) );
+			)));
 
-			$wp_customize->add_setting( 'lsx_wc_checkout_extra_html', array(
+			$wp_customize->add_setting('lsx_wc_checkout_extra_html', array(
 				'default'           => '',
 				'sanitize_callback' => 'wp_kses_post',
-			) );
+			));
 
-			$wp_customize->add_control( new LSX_Customizer_Wysiwyg_Control( $wp_customize, 'lsx_wc_checkout_extra_html', array(
-				'label'       => esc_html__( 'Extra HTML', 'lsx-customizer' ),
-				'description' => esc_html__( 'Extra HTML to display at checkout page (bottom/right).', 'lsx-customizer' ),
+			$wp_customize->add_control(new LSX_Customizer_Wysiwyg_Control($wp_customize, 'lsx_wc_checkout_extra_html', array(
+				'label'       => esc_html__('Extra HTML', 'lsx-customizer'),
+				'description' => esc_html__('Extra HTML to display at checkout page (bottom/right).', 'lsx-customizer'),
 				'section'     => 'lsx-wc-checkout',
 				'settings'    => 'lsx_wc_checkout_extra_html',
 				'priority'    => 6,
 				'type'        => 'wysiwyg',
-			) ) );
+			)));
 
 			/**
 			 * Cart.
 			 */
 
-			$wp_customize->add_setting( 'lsx_wc_cart_menu_item_style', array(
+			$wp_customize->add_setting('lsx_wc_cart_menu_item_style', array(
 				'default' => 'extended',
-				'sanitize_callback' => array( $this, 'sanitize_select' ),
-			) );
+				'sanitize_callback' => array($this, 'sanitize_select'),
+			));
 
-			$wp_customize->add_control( new WP_Customize_Control( $wp_customize, 'lsx_wc_cart_menu_item_style', array(
-				'label'       => esc_html__( 'Menu Item Style', 'lsx-customizer' ),
-				'description' => esc_html__( 'WooCommerce menu item cart style.', 'lsx-customizer' ),
+			$wp_customize->add_control(new WP_Customize_Control($wp_customize, 'lsx_wc_cart_menu_item_style', array(
+				'label'       => esc_html__('Menu Item Style', 'lsx-customizer'),
+				'description' => esc_html__('WooCommerce menu item cart style.', 'lsx-customizer'),
 				'section'     => 'lsx-wc-cart',
 				'settings'    => 'lsx_wc_cart_menu_item_style',
 				'type'        => 'select',
 				'priority'    => 2,
 				'choices'     => array(
-					'simple'   => esc_html__( 'Simple', 'lsx-customizer' ),
-					'extended' => esc_html__( 'Extended', 'lsx-customizer' ),
+					'simple'   => esc_html__('Simple', 'lsx-customizer'),
+					'extended' => esc_html__('Extended', 'lsx-customizer'),
 				),
-			) ) );
+			)));
 
-			$wp_customize->add_setting( 'lsx_wc_cart_menu_item_position', array(
+			$wp_customize->add_setting('lsx_wc_cart_menu_item_position', array(
 				'default' => 'main-menu-in',
-				'sanitize_callback' => array( $this, 'sanitize_select' ),
-			) );
+				'sanitize_callback' => array($this, 'sanitize_select'),
+			));
 
-			$wp_customize->add_control( new WP_Customize_Control( $wp_customize, 'lsx_wc_cart_menu_item_position', array(
-				'label'       => esc_html__( 'Menu Item Position', 'lsx-customizer' ),
-				'description' => esc_html__( 'WooCommerce menu item cart position.', 'lsx-customizer' ),
+			$wp_customize->add_control(new WP_Customize_Control($wp_customize, 'lsx_wc_cart_menu_item_position', array(
+				'label'       => esc_html__('Menu Item Position', 'lsx-customizer'),
+				'description' => esc_html__('WooCommerce menu item cart position.', 'lsx-customizer'),
 				'section'     => 'lsx-wc-cart',
 				'settings'    => 'lsx_wc_cart_menu_item_position',
 				'type'        => 'select',
 				'priority'    => 3,
 				'choices'     => array(
-					'main-menu-in'   => esc_html__( 'Main Menu (as last item)', 'lsx-customizer' ),
-					'main-menu-out'  => esc_html__( 'Main Menu (as last item, right aligned)', 'lsx-customizer' ),
-					'top-menu-left'  => esc_html__( 'Top Menu (left)', 'lsx-customizer' ),
-					'top-menu-right' => esc_html__( 'Top Menu (right)', 'lsx-customizer' ),
+					'main-menu-in'   => esc_html__('Main Menu (as last item)', 'lsx-customizer'),
+					'main-menu-out'  => esc_html__('Main Menu (as last item, right aligned)', 'lsx-customizer'),
+					'top-menu-left'  => esc_html__('Top Menu (left)', 'lsx-customizer'),
+					'top-menu-right' => esc_html__('Top Menu (right)', 'lsx-customizer'),
 				),
-			) ) );
+			)));
 
-			$wp_customize->add_setting( 'lsx_wc_cart_extra_html', array(
+			$wp_customize->add_setting('lsx_wc_cart_extra_html', array(
 				'default'           => '',
 				'sanitize_callback' => 'wp_kses_post',
-			) );
+			));
 
-			$wp_customize->add_control( new LSX_Customizer_Wysiwyg_Control( $wp_customize, 'lsx_wc_cart_extra_html', array(
-				'label'       => esc_html__( 'Extra HTML', 'lsx-customizer' ),
-				'description' => esc_html__( 'Extra HTML to display at cart page (bottom/left).', 'lsx-customizer' ),
+			$wp_customize->add_control(new LSX_Customizer_Wysiwyg_Control($wp_customize, 'lsx_wc_cart_extra_html', array(
+				'label'       => esc_html__('Extra HTML', 'lsx-customizer'),
+				'description' => esc_html__('Extra HTML to display at cart page (bottom/left).', 'lsx-customizer'),
 				'section'     => 'lsx-wc-cart',
 				'settings'    => 'lsx_wc_cart_extra_html',
 				'priority'    => 4,
 				'type'        => 'wysiwyg',
-			) ) );
+			)));
 
 			/**
 			 * My Account.
 			 */
 
-			$wp_customize->add_section( 'lsx-wc-my-account', array(
-				'title'       => esc_html__( 'LSX My Account', 'lsx-customizer' ),
-				'description' => esc_html__( 'Change the WooCommerce My Account settings.', 'lsx-customizer' ),
+			$wp_customize->add_section('lsx-wc-my-account', array(
+				'title'       => esc_html__('LSX My Account', 'lsx-customizer'),
+				'description' => esc_html__('Change the WooCommerce My Account settings.', 'lsx-customizer'),
 				'panel'       => 'woocommerce',
 				'priority'    => 4,
-			) );
+			));
 
-			$wp_customize->add_setting( 'lsx_wc_my_account_menu_item', array(
+			$wp_customize->add_setting('lsx_wc_my_account_menu_item', array(
 				'default'           => false,
-				'sanitize_callback' => array( $this, 'sanitize_checkbox' ),
-			) );
+				'sanitize_callback' => array($this, 'sanitize_checkbox'),
+			));
 
-			$wp_customize->add_control( new WP_Customize_Control( $wp_customize, 'lsx_wc_my_account_menu_item', array(
-				'label'       => esc_html__( 'Menu Item', 'lsx-customizer' ),
-				'description' => esc_html__( 'Enable the My Account menu item.', 'lsx-customizer' ),
+			$wp_customize->add_control(new WP_Customize_Control($wp_customize, 'lsx_wc_my_account_menu_item', array(
+				'label'       => esc_html__('Menu Item', 'lsx-customizer'),
+				'description' => esc_html__('Enable the My Account menu item.', 'lsx-customizer'),
 				'section'     => 'lsx-wc-my-account',
 				'settings'    => 'lsx_wc_my_account_menu_item',
 				'type'        => 'checkbox',
 				'priority'    => 1,
-			) ) );
+			)));
 
-			$wp_customize->add_setting( 'lsx_wc_my_account_menu_item_style', array(
+			$wp_customize->add_setting('lsx_wc_my_account_menu_item_style', array(
 				'default' => 'extended',
-				'sanitize_callback' => array( $this, 'sanitize_select' ),
-			) );
+				'sanitize_callback' => array($this, 'sanitize_select'),
+			));
 
-			$wp_customize->add_control( new WP_Customize_Control( $wp_customize, 'lsx_wc_my_account_menu_item_style', array(
-				'label'       => esc_html__( 'Menu Item Style', 'lsx-customizer' ),
-				'description' => esc_html__( 'WooCommerce menu item My Account style.', 'lsx-customizer' ),
+			$wp_customize->add_control(new WP_Customize_Control($wp_customize, 'lsx_wc_my_account_menu_item_style', array(
+				'label'       => esc_html__('Menu Item Style', 'lsx-customizer'),
+				'description' => esc_html__('WooCommerce menu item My Account style.', 'lsx-customizer'),
 				'section'     => 'lsx-wc-my-account',
 				'settings'    => 'lsx_wc_my_account_menu_item_style',
 				'type'        => 'select',
 				'priority'    => 2,
 				'choices'     => array(
-					'simple'   => esc_html__( 'Simple', 'lsx-customizer' ),
-					'extended' => esc_html__( 'Extended', 'lsx-customizer' ),
+					'simple'   => esc_html__('Simple', 'lsx-customizer'),
+					'extended' => esc_html__('Extended', 'lsx-customizer'),
 				),
-			) ) );
+			)));
 
-			$wp_customize->add_setting( 'lsx_wc_my_account_menu_item_position', array(
+			$wp_customize->add_setting('lsx_wc_my_account_menu_item_position', array(
 				'default' => 'main-menu-in',
-				'sanitize_callback' => array( $this, 'sanitize_select' ),
-			) );
+				'sanitize_callback' => array($this, 'sanitize_select'),
+			));
 
-			$wp_customize->add_control( new WP_Customize_Control( $wp_customize, 'lsx_wc_my_account_menu_item_position', array(
-				'label'       => esc_html__( 'Menu Item Position', 'lsx-customizer' ),
-				'description' => esc_html__( 'WooCommerce menu item My Account position.', 'lsx-customizer' ),
+			$wp_customize->add_control(new WP_Customize_Control($wp_customize, 'lsx_wc_my_account_menu_item_position', array(
+				'label'       => esc_html__('Menu Item Position', 'lsx-customizer'),
+				'description' => esc_html__('WooCommerce menu item My Account position.', 'lsx-customizer'),
 				'section'     => 'lsx-wc-my-account',
 				'settings'    => 'lsx_wc_my_account_menu_item_position',
 				'type'        => 'select',
 				'priority'    => 3,
 				'choices'     => array(
-					'main-menu-in'   => esc_html__( 'Main Menu (as last item)', 'lsx-customizer' ),
-					'main-menu-out'  => esc_html__( 'Main Menu (as last item, right aligned)', 'lsx-customizer' ),
-					'top-menu-left'  => esc_html__( 'Top Menu (left)', 'lsx-customizer' ),
-					'top-menu-right' => esc_html__( 'Top Menu (right)', 'lsx-customizer' ),
+					'main-menu-in'   => esc_html__('Main Menu (as last item)', 'lsx-customizer'),
+					'main-menu-out'  => esc_html__('Main Menu (as last item, right aligned)', 'lsx-customizer'),
+					'top-menu-left'  => esc_html__('Top Menu (left)', 'lsx-customizer'),
+					'top-menu-right' => esc_html__('Top Menu (right)', 'lsx-customizer'),
 				),
-			) ) );
+			)));
 		}
 
 		/**
@@ -303,23 +303,23 @@ 
 		 *
 		 * @since 1.1.1
 		 */
-		public function body_class( $classes ) {
-			$distraction_free = get_theme_mod( 'lsx_distraction_free_checkout', false );
-			$two_step_checkout = get_theme_mod( 'lsx_two_step_checkout', false );
-			if ( is_checkout() ) {
-				$layout = get_theme_mod( 'lsx_wc_checkout_layout', 'default' );
+		public function body_class($classes) {
+			$distraction_free = get_theme_mod('lsx_distraction_free_checkout', false);
+			$two_step_checkout = get_theme_mod('lsx_two_step_checkout', false);
+			if (is_checkout()) {
+				$layout = get_theme_mod('lsx_wc_checkout_layout', 'default');
 
-				if ( 'default' === $layout ) {
+				if ('default' === $layout) {
 					$classes[] = 'lsx-wc-checkout-layout-default';
-				} elseif ( 'stacked' === $layout ) {
+				} elseif ('stacked' === $layout) {
 					$classes[] = 'lsx-wc-checkout-layout-stacked';
-				} elseif ( 'columns' === $layout ) {
+				} elseif ('columns' === $layout) {
 					$classes[] = 'lsx-wc-checkout-layout-two-column-addreses';
 				}
-				if ( ! empty( $distraction_free ) ) {
+				if ( ! empty($distraction_free)) {
 					$classes[] = 'lsx-wc-checkout-distraction-free';
 				}
-				if ( ! empty( $two_step_checkout ) ) {
+				if ( ! empty($two_step_checkout)) {
 					$classes[] = 'lsx-wc-checkout-two-steps';
 				}
 			}
@@ -335,15 +335,15 @@ 
 		public function thankyou_page() {
 			global $wp;
 
-			if ( is_checkout() && ! empty( $wp->query_vars['order-received'] ) ) {
-				$thankyou_page = get_theme_mod( 'lsx_wc_checkout_thankyou_page', '0' );
+			if (is_checkout() && ! empty($wp->query_vars['order-received'])) {
+				$thankyou_page = get_theme_mod('lsx_wc_checkout_thankyou_page', '0');
 
-				if ( ! empty( $thankyou_page ) && ! is_page( $thankyou_page ) ) {
-					$order_id  = apply_filters( 'woocommerce_thankyou_order_id', absint( $wp->query_vars['order-received'] ) );
-					$order_key = apply_filters( 'woocommerce_thankyou_order_key', empty( $_GET['key'] ) ? '' : wc_clean( $_GET['key'] ) );
+				if ( ! empty($thankyou_page) && ! is_page($thankyou_page)) {
+					$order_id  = apply_filters('woocommerce_thankyou_order_id', absint($wp->query_vars['order-received']));
+					$order_key = apply_filters('woocommerce_thankyou_order_key', empty($_GET['key']) ? '' : wc_clean($_GET['key']));
 
-					if ( $order_id > 0 ) {
-						wp_safe_redirect( get_permalink( $thankyou_page ) . '?order-received=' . $order_id . '&key=' . $order_key, 302 );
+					if ($order_id > 0) {
+						wp_safe_redirect(get_permalink($thankyou_page) . '?order-received=' . $order_id . '&key=' . $order_key, 302);
 						exit;
 					}
 				}
@@ -356,95 +356,95 @@ 
 		 * @since 1.1.1
 		 */
 		public function checkout_steps() {
-			$cart_url = function_exists( 'wc_get_cart_url' ) ? wc_get_cart_url() : WC()->cart->get_cart_url();
-			if ( ( is_checkout() || is_cart() ) && ! empty( get_theme_mod( 'lsx_checkout_steps', '1' ) ) ) :
+			$cart_url = function_exists('wc_get_cart_url') ? wc_get_cart_url() : WC()->cart->get_cart_url();
+			if ((is_checkout() || is_cart()) && ! empty(get_theme_mod('lsx_checkout_steps', '1'))) :
 				global $wp;
 				?>
 				<div class="lsx-wc-checkout-steps">
 					<ul class="lsx-wc-checkout-steps-items">
 
-						<?php if ( is_cart() ) : ?>
+						<?php if (is_cart()) : ?>
 
 							<li class="lsx-wc-checkout-steps-item lsx-wc-checkout-steps-item-done">
-								<a href="<?php echo esc_url( get_permalink( wc_get_page_id( 'shop' ) ) ); ?>" class="lsx-wc-checkout-steps-link">
+								<a href="<?php echo esc_url(get_permalink(wc_get_page_id('shop'))); ?>" class="lsx-wc-checkout-steps-link">
 									<i class="fa fa-check-circle" aria-hidden="true"></i>
-									<span><span><?php esc_html_e( 'Shop', 'lsx-customizer' ); ?></span></span>
+									<span><span><?php esc_html_e('Shop', 'lsx-customizer'); ?></span></span>
 								</a>
 
 								<i class="fa fa-angle-right" aria-hidden="true"></i>
 							</li>
 
 							<li class="lsx-wc-checkout-steps-item lsx-wc-checkout-steps-item-current lsx-wc-checkout-steps-item-cart">
-								<i class="lsx-wc-checkout-steps-counter" aria-hidden="true"><?php esc_html_e( '2', 'lsx-customizer' ); ?></i>
-								<span><span><?php esc_html_e( 'My Cart', 'lsx-customizer' ); ?></span></span>
+								<i class="lsx-wc-checkout-steps-counter" aria-hidden="true"><?php esc_html_e('2', 'lsx-customizer'); ?></i>
+								<span><span><?php esc_html_e('My Cart', 'lsx-customizer'); ?></span></span>
 								<i class="fa fa-angle-right" aria-hidden="true"></i>
 							</li>
 
 							<li class="lsx-wc-checkout-steps-item lsx-wc-checkout-steps-item-disabled lsx-wc-checkout-steps-item-payment">
-								<i class="lsx-wc-checkout-steps-counter" aria-hidden="true"><?php esc_html_e( '3', 'lsx-customizer' ); ?></i>
-								<span><span><?php esc_html_e( 'Billing details', 'lsx-customizer' ); ?></span></span>
+								<i class="lsx-wc-checkout-steps-counter" aria-hidden="true"><?php esc_html_e('3', 'lsx-customizer'); ?></i>
+								<span><span><?php esc_html_e('Billing details', 'lsx-customizer'); ?></span></span>
 								<i class="fa fa-angle-right" aria-hidden="true"></i>
 							</li>
 
 							<li class="lsx-wc-checkout-steps-item lsx-wc-checkout-steps-item-disabled lsx-wc-checkout-steps-item-thankyou">
-								<i class="lsx-wc-checkout-steps-counter" aria-hidden="true"><?php esc_html_e( '4', 'lsx-customizer' ); ?></i>
-								<span><span><?php esc_html_e( 'Payment', 'lsx-customizer' ); ?></span></span>
+								<i class="lsx-wc-checkout-steps-counter" aria-hidden="true"><?php esc_html_e('4', 'lsx-customizer'); ?></i>
+								<span><span><?php esc_html_e('Payment', 'lsx-customizer'); ?></span></span>
 							</li>
 
-						<?php elseif ( is_checkout() && empty( $wp->query_vars['order-received'] ) ) : ?>
+						<?php elseif (is_checkout() && empty($wp->query_vars['order-received'])) : ?>
 
 							<li class="lsx-wc-checkout-steps-item lsx-wc-checkout-steps-item-done">
-								<a href="<?php echo esc_url( get_permalink( wc_get_page_id( 'shop' ) ) ); ?>" class="lsx-wc-checkout-steps-link">
+								<a href="<?php echo esc_url(get_permalink(wc_get_page_id('shop'))); ?>" class="lsx-wc-checkout-steps-link">
 									<i class="fa fa-check-circle" aria-hidden="true"></i>
-									<span><span><?php esc_html_e( 'Shop', 'lsx-customizer' ); ?></span></span>
+									<span><span><?php esc_html_e('Shop', 'lsx-customizer'); ?></span></span>
 								</a>
 
 								<i class="fa fa-angle-right" aria-hidden="true"></i>
 							</li>
 
 							<li class="lsx-wc-checkout-steps-item lsx-wc-checkout-steps-item-done lsx-wc-checkout-steps-item-cart">
-								<a href="<?php echo esc_url( $cart_url ); ?>" class="lsx-wc-checkout-steps-link">
+								<a href="<?php echo esc_url($cart_url); ?>" class="lsx-wc-checkout-steps-link">
 									<i class="fa fa-check-circle" aria-hidden="true"></i>
-									<span><span><?php esc_html_e( 'My Cart', 'lsx-customizer' ); ?></span></span>
+									<span><span><?php esc_html_e('My Cart', 'lsx-customizer'); ?></span></span>
 								</a>
 
 								<i class="fa fa-angle-right" aria-hidden="true"></i>
 							</li>
 
 							<li class="lsx-wc-checkout-steps-item lsx-wc-checkout-steps-item-current lsx-wc-checkout-steps-item-payment">
-								<i class="lsx-wc-checkout-steps-counter" aria-hidden="true"><?php esc_html_e( '3', 'lsx-customizer' ); ?></i>
-								<span><span><?php esc_html_e( 'Billing details', 'lsx-customizer' ); ?></span></span>
+								<i class="lsx-wc-checkout-steps-counter" aria-hidden="true"><?php esc_html_e('3', 'lsx-customizer'); ?></i>
+								<span><span><?php esc_html_e('Billing details', 'lsx-customizer'); ?></span></span>
 								<i class="fa fa-angle-right" aria-hidden="true"></i>
 							</li>
 
 							<li class="lsx-wc-checkout-steps-item lsx-wc-checkout-steps-item-disabled lsx-wc-checkout-steps-item-thankyou">
-								<i class="lsx-wc-checkout-steps-counter" aria-hidden="true"><?php esc_html_e( '4', 'lsx-customizer' ); ?></i>
-								<span><span><?php esc_html_e( 'Payment', 'lsx-customizer' ); ?></span></span>
+								<i class="lsx-wc-checkout-steps-counter" aria-hidden="true"><?php esc_html_e('4', 'lsx-customizer'); ?></i>
+								<span><span><?php esc_html_e('Payment', 'lsx-customizer'); ?></span></span>
 							</li>
 
-						<?php elseif ( is_checkout() ) : ?>
+						<?php elseif (is_checkout()) : ?>
 
 							<li class="lsx-wc-checkout-steps-item lsx-wc-checkout-steps-item-done">
 								<i class="fa fa-check-circle" aria-hidden="true"></i>
-								<span><span><?php esc_html_e( 'Shop', 'lsx-customizer' ); ?></span></span>
+								<span><span><?php esc_html_e('Shop', 'lsx-customizer'); ?></span></span>
 								<i class="fa fa-angle-right" aria-hidden="true"></i>
 							</li>
 
 							<li class="lsx-wc-checkout-steps-item lsx-wc-checkout-steps-item-done lsx-wc-checkout-steps-item-cart">
 								<i class="fa fa-check-circle" aria-hidden="true"></i>
-								<span><span><?php esc_html_e( 'My Cart', 'lsx-customizer' ); ?></span></span>
+								<span><span><?php esc_html_e('My Cart', 'lsx-customizer'); ?></span></span>
 								<i class="fa fa-angle-right" aria-hidden="true"></i>
 							</li>
 
 							<li class="lsx-wc-checkout-steps-item lsx-wc-checkout-steps-item-done lsx-wc-checkout-steps-item-payment">
 								<i class="fa fa-check-circle" aria-hidden="true"></i>
-								<span><span><?php esc_html_e( 'Billing details', 'lsx-customizer' ); ?></span></span>
+								<span><span><?php esc_html_e('Billing details', 'lsx-customizer'); ?></span></span>
 								<i class="fa fa-angle-right" aria-hidden="true"></i>
 							</li>
 
 							<li class="lsx-wc-checkout-steps-item lsx-wc-checkout-steps-item-current lsx-wc-checkout-steps-item-thankyou">
-								<i class="lsx-wc-checkout-steps-counter" aria-hidden="true"><?php esc_html_e( '4', 'lsx-customizer' ); ?></i>
-								<span><span><?php esc_html_e( 'Payment', 'lsx-customizer' ); ?></span></span>
+								<i class="lsx-wc-checkout-steps-counter" aria-hidden="true"><?php esc_html_e('4', 'lsx-customizer'); ?></i>
+								<span><span><?php esc_html_e('Payment', 'lsx-customizer'); ?></span></span>
 							</li>
 
 						<?php endif; ?>
@@ -461,11 +461,11 @@ 
 		 * @since 1.1.1
 		 */
 		public function checkout_extra_html() {
-			if ( is_checkout() ) {
-				$checkout_extra_html = get_theme_mod( 'lsx_wc_checkout_extra_html', '' );
+			if (is_checkout()) {
+				$checkout_extra_html = get_theme_mod('lsx_wc_checkout_extra_html', '');
 
-				if ( ! empty( $checkout_extra_html ) ) {
-					add_action( 'woocommerce_review_order_after_payment', array( $this, 'checkout_extra_html_echo' ), 9 );
+				if ( ! empty($checkout_extra_html)) {
+					add_action('woocommerce_review_order_after_payment', array($this, 'checkout_extra_html_echo'), 9);
 				}
 			}
 		}
@@ -476,13 +476,13 @@ 
 		 * @since 1.1.1
 		 */
 		public function checkout_extra_html_echo() {
-			if ( is_checkout() ) {
-				$checkout_extra_html = get_theme_mod( 'lsx_wc_checkout_extra_html', '' );
+			if (is_checkout()) {
+				$checkout_extra_html = get_theme_mod('lsx_wc_checkout_extra_html', '');
 
-				if ( ! empty( $checkout_extra_html ) ) {
+				if ( ! empty($checkout_extra_html)) {
 					?>
 					<div class="lsx-wc-checkout-extra-html">
-						<?php echo wp_kses_post( $checkout_extra_html ); ?>
+						<?php echo wp_kses_post($checkout_extra_html); ?>
 					</div>
 				<?php
 				}
@@ -495,12 +495,12 @@ 
 		 * @since 1.1.1
 		 */
 		public function cart_extra_html() {
-			if ( is_cart() ) {
-				$cart_extra_html = get_theme_mod( 'lsx_wc_cart_extra_html', '' );
+			if (is_cart()) {
+				$cart_extra_html = get_theme_mod('lsx_wc_cart_extra_html', '');
 
-				if ( ! empty( $cart_extra_html ) ) {
-					remove_action( 'woocommerce_cart_collaterals', 'woocommerce_cross_sell_display' );
-					add_action( 'woocommerce_cart_collaterals', array( $this, 'cart_extra_html_echo' ), 9 );
+				if ( ! empty($cart_extra_html)) {
+					remove_action('woocommerce_cart_collaterals', 'woocommerce_cross_sell_display');
+					add_action('woocommerce_cart_collaterals', array($this, 'cart_extra_html_echo'), 9);
 				}
 			}
 		}
@@ -511,13 +511,13 @@ 
 		 * @since 1.1.1
 		 */
 		public function cart_extra_html_echo() {
-			if ( is_cart() ) {
-				$cart_extra_html = get_theme_mod( 'lsx_wc_cart_extra_html', '' );
+			if (is_cart()) {
+				$cart_extra_html = get_theme_mod('lsx_wc_cart_extra_html', '');
 
-				if ( ! empty( $cart_extra_html ) ) { 
+				if ( ! empty($cart_extra_html)) { 
                 ?>
 					<div class="lsx-wc-cart-extra-html">
-						<?php echo wp_kses_post( $cart_extra_html ); ?>
+						<?php echo wp_kses_post($cart_extra_html); ?>
 					</div>
 				<?php 
                 }
@@ -529,11 +529,11 @@ 
 		 *
 		 * @since 1.1.1
 		 */
-		public function cart_menu_item_position( $menu_position ) {
-			$position = get_theme_mod( 'lsx_wc_cart_menu_item_position', '' );
+		public function cart_menu_item_position($menu_position) {
+			$position = get_theme_mod('lsx_wc_cart_menu_item_position', '');
 
-			if ( ! empty( $position ) ) {
-				switch ( $position ) {
+			if ( ! empty($position)) {
+				switch ($position) {
 					case 'main-menu-in':
 					case 'main-menu-out':
 						$menu_position = 'primary';
@@ -557,16 +557,16 @@ 
 		 *
 		 * @since 1.1.1
 		 */
-		public function cart_menu_item_class( $item_class ) {
-			$position = get_theme_mod( 'lsx_wc_cart_menu_item_position', '' );
+		public function cart_menu_item_class($item_class) {
+			$position = get_theme_mod('lsx_wc_cart_menu_item_position', '');
 
-			if ( 'main-menu-out' === $position ) {
+			if ('main-menu-out' === $position) {
 				$item_class .= ' lsx-wc-cart-menu-item-right-aligned';
 			}
 
-			$style = get_theme_mod( 'lsx_wc_cart_menu_item_style', '' );
+			$style = get_theme_mod('lsx_wc_cart_menu_item_style', '');
 
-			if ( 'simple' === $style ) {
+			if ('simple' === $style) {
 				$item_class .= ' lsx-wc-cart-menu-item-simple';
 			}
 
@@ -578,47 +578,47 @@ 
 		 *
 		 * @since 1.1.1
 		 */
-		public function my_account_menu_item( $items, $args ) {
-			$my_account_menu_item_position = apply_filters( 'lsx_wc_my_account_menu_item_position', 'primary' );
+		public function my_account_menu_item($items, $args) {
+			$my_account_menu_item_position = apply_filters('lsx_wc_my_account_menu_item_position', 'primary');
 
-			if ( $my_account_menu_item_position === $args->theme_location || ( 'primary_logged_out' === $args->theme_location && 'primary' === $my_account_menu_item_position ) ) {
-				$customizer_option  = get_theme_mod( 'lsx_wc_my_account_menu_item', false );
+			if ($my_account_menu_item_position === $args->theme_location || ('primary_logged_out' === $args->theme_location && 'primary' === $my_account_menu_item_position)) {
+				$customizer_option = get_theme_mod('lsx_wc_my_account_menu_item', false);
 
-				if ( ! empty( $customizer_option ) ) {
-					if ( is_account_page() ) {
+				if ( ! empty($customizer_option)) {
+					if (is_account_page()) {
 						$class = 'current-menu-item';
 					} else {
 						$class = '';
 					}
 
 					$item_class = 'menu-item menu-item-type-custom menu-item-object-custom menu-item-has-children dropdown lsx-wc-my-account-menu-item ' . $class;
-					$item_class = apply_filters( 'lsx_wc_my_account_menu_item_class', $item_class );
+					$item_class = apply_filters('lsx_wc_my_account_menu_item_class', $item_class);
 
 					$endpoints = WC()->query->get_query_vars();
 
-					if ( is_user_logged_in() ) {
+					if (is_user_logged_in()) {
 						$item  = '<li class="' . $item_class . '">';
-						$item .= '<a title="' . esc_attr__( 'View your account', 'lsx-customizer' ) . '" href="' . esc_url( get_permalink( wc_get_page_id( 'myaccount' ) ) ) . '" data-toggle="dropdown" class="dropdown-toggle" aria-haspopup="true"><span>' . esc_attr__( 'My Account', 'lsx-customizer' ) . '</span></a>';
+						$item .= '<a title="' . esc_attr__('View your account', 'lsx-customizer') . '" href="' . esc_url(get_permalink(wc_get_page_id('myaccount'))) . '" data-toggle="dropdown" class="dropdown-toggle" aria-haspopup="true"><span>' . esc_attr__('My Account', 'lsx-customizer') . '</span></a>';
 						$item .= '<ul role="menu" class=" dropdown-menu lsx-wc-my-account-sub-menu">';
-							foreach ( wc_get_account_menu_items() as $endpoint => $label ) {
+							foreach (wc_get_account_menu_items() as $endpoint => $label) {
 								$slug = $endpoint;
-								if ( isset( $endpoints[ $endpoint ] ) && '' !== $endpoints[ $endpoint ] ) {
-									$slug = $endpoints[ $endpoint ];
+								if (isset($endpoints[$endpoint]) && '' !== $endpoints[$endpoint]) {
+									$slug = $endpoints[$endpoint];
 								}
-								if ( 'dashboard' === $slug ) {
+								if ('dashboard' === $slug) {
 									$slug = '';
 								}
-								$item .= '<li class="menu-item"><a title="" href="' . esc_url( get_permalink( wc_get_page_id( 'myaccount' ) ) . $slug ) . '">' . $label . '</a></li>';
+								$item .= '<li class="menu-item"><a title="" href="' . esc_url(get_permalink(wc_get_page_id('myaccount')) . $slug) . '">' . $label . '</a></li>';
 							}
 						$item .= '</ul></li>';
 
 					} else {
 						$item = '<li class="' . $item_class . '">' .
-									'<a title="' . esc_attr__( 'View your account', 'lsx-customizer' ) . '" href="' . esc_url( get_permalink( wc_get_page_id( 'myaccount' ) ) ) . '"><span>' . esc_attr__( 'Login', 'lsx-customizer' ) . '</span></a>' .
+									'<a title="' . esc_attr__('View your account', 'lsx-customizer') . '" href="' . esc_url(get_permalink(wc_get_page_id('myaccount'))) . '"><span>' . esc_attr__('Login', 'lsx-customizer') . '</span></a>' .
 								'</li>';
 					}
 
-					if ( 'top-menu' === $args->theme_location ) {
+					if ('top-menu' === $args->theme_location) {
 						$items = $item . $items;
 					} else {
 						$items = $items . $item;
@@ -634,11 +634,11 @@ 
 		 *
 		 * @since 1.1.1
 		 */
-		public function my_account_menu_item_position( $menu_position ) {
-			$position = get_theme_mod( 'lsx_wc_my_account_menu_item_position', '' );
+		public function my_account_menu_item_position($menu_position) {
+			$position = get_theme_mod('lsx_wc_my_account_menu_item_position', '');
 
-			if ( ! empty( $position ) ) {
-				switch ( $position ) {
+			if ( ! empty($position)) {
+				switch ($position) {
 					case 'main-menu-in':
 					case 'main-menu-out':
 						$menu_position = 'primary';
@@ -662,20 +662,20 @@ 
 		 *
 		 * @since 1.1.1
 		 */
-		public function my_account_menu_item_class( $item_class ) {
-			$position = get_theme_mod( 'lsx_wc_my_account_menu_item_position', '' );
+		public function my_account_menu_item_class($item_class) {
+			$position = get_theme_mod('lsx_wc_my_account_menu_item_position', '');
 
-			if ( 'main-menu-out' === $position ) {
+			if ('main-menu-out' === $position) {
 				$item_class .= ' lsx-wc-my-account-menu-item-right-aligned';
 			}
 
-			if ( ! is_user_logged_in() ) {
+			if ( ! is_user_logged_in()) {
 				$item_class .= ' lsx-wc-my-account-login';
 			}
 
-			$style = get_theme_mod( 'lsx_wc_my_account_menu_item_style', '' );
+			$style = get_theme_mod('lsx_wc_my_account_menu_item_style', '');
 
-			if ( 'simple' === $style ) {
+			if ('simple' === $style) {
 				$item_class .= ' lsx-wc-my-account-menu-item-simple';
 			}
 
@@ -686,13 +686,13 @@ 
 		 */
 		public function show_layout_switcher() {
 			$body_classes = get_body_class();
-			if ( in_array( 'post-type-archive-product', $body_classes ) ) {
+			if (in_array('post-type-archive-product', $body_classes)) {
 				global $WC_List_Grid;
-				if ( null !== $WC_List_Grid ) {
-					remove_action( 'woocommerce_before_shop_loop', array( $WC_List_Grid, 'gridlist_toggle_button' ), 30 );
-					add_action( 'lsx_banner_inner_bottom', array( $this, 'shop_gridlist_toggle_button' ), 90 );
-					add_action( 'lsx_global_header_inner_bottom', array( $this, 'shop_gridlist_toggle_button' ), 90 );
-					wp_deregister_style( 'grid-list-button' );
+				if (null !== $WC_List_Grid) {
+					remove_action('woocommerce_before_shop_loop', array($WC_List_Grid, 'gridlist_toggle_button'), 30);
+					add_action('lsx_banner_inner_bottom', array($this, 'shop_gridlist_toggle_button'), 90);
+					add_action('lsx_global_header_inner_bottom', array($this, 'shop_gridlist_toggle_button'), 90);
+					wp_deregister_style('grid-list-button');
 				}
 			}
 		}
@@ -703,13 +703,13 @@ 
 			global $WC_List_Grid;
 			?>
 			<div class="lsx-layout-switcher">
-				<span class="lsx-layout-switcher-label"><?php esc_html_e( 'Select view:', 'lsx-blog-customizer' ); ?></span>
+				<span class="lsx-layout-switcher-label"><?php esc_html_e('Select view:', 'lsx-blog-customizer'); ?></span>
 				<?php $WC_List_Grid->gridlist_toggle_button(); ?>
 			</div>
 			<?php
 		}
-		public function gridlist_toggle_button_output( $output, $grid_view, $list_view ) {
-			$output = sprintf( '<div class="gridlist-toggle lsx-layout-switcher-options"><a href="#" class="lsx-layout-switcher-option" id="grid" title="%1$s"><span class="fa fa fa-th"></span></a><a href="#" class="lsx-layout-switcher-option" id="list" title="%2$s"><span class="fa fa-bars"></span></a></div>', $grid_view, $list_view );
+		public function gridlist_toggle_button_output($output, $grid_view, $list_view) {
+			$output = sprintf('<div class="gridlist-toggle lsx-layout-switcher-options"><a href="#" class="lsx-layout-switcher-option" id="grid" title="%1$s"><span class="fa fa fa-th"></span></a><a href="#" class="lsx-layout-switcher-option" id="list" title="%2$s"><span class="fa fa-bars"></span></a></div>', $grid_view, $list_view);
 			return $output;
 		}
 	}