From 4b5a4128b175ccd85a8a964f60a2ee3855b8dba0 Mon Sep 17 00:00:00 2001 From: Giucu Date: Mon, 20 Mar 2017 14:30:17 +0200 Subject: [PATCH 1/4] #176 --- CHANGELOG.txt | 3 +++ layout/css/main.css | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b127e8b..033988b 100755 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,6 @@ +### V2.0.1 + - Fixed left sidebar mobile issue. ( https://github.com/puikinsh/illdy/issues/176 ) + ### V2.0.0 - Added new Welcome Page. - Remove static fronpate action from Illdy theme and added to Illdy companion diff --git a/layout/css/main.css b/layout/css/main.css index ee17c78..7f7a1b8 100755 --- a/layout/css/main.css +++ b/layout/css/main.css @@ -1661,7 +1661,6 @@ a.button:hover { margin: 50px 0 40px 0; padding-left: 10%; border-left: 1px solid #ebebeb; - float: right; } .page-template-left-sidebar #sidebar { @@ -1669,7 +1668,6 @@ a.button:hover { padding-left: 0; border-right: 1px solid #ebebeb; border-left: none; - float: left; } .widget { From f68b2343edf9ebcdcf36cb64cae1460adabf750d Mon Sep 17 00:00:00 2001 From: Giucu Date: Mon, 20 Mar 2017 16:06:34 +0200 Subject: [PATCH 2/4] #179 --- CHANGELOG.txt | 1 + layout/js/scripts.js | 27 +-------------------------- layout/js/scripts.min.js | 2 +- 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 033988b..380f7d9 100755 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,6 @@ ### V2.0.1 - Fixed left sidebar mobile issue. ( https://github.com/puikinsh/illdy/issues/176 ) + - Woocommerce "Additional Information" Tab issue. ( https://github.com/puikinsh/illdy/issues/179 ) ### V2.0.0 - Added new Welcome Page. diff --git a/layout/js/scripts.js b/layout/js/scripts.js index c9484ab..aebf908 100755 --- a/layout/js/scripts.js +++ b/layout/js/scripts.js @@ -18,7 +18,7 @@ jQuery( document ).ready( function($) { // Smooth Scroll Anchors function smoothScrollAnchors() { - $('a[href*="#"]:not([href="#"])').on('click', function() { + $('body:not(.single-product) a[href*="#"]:not([href="#"])').on('click', function() { if (location.pathname.replace(/^\//, '') == this.pathname.replace(/^\//, '') && location.hostname == this.hostname) { var target = $(this.hash); target = target.length ? target : $('[name=' + this.hash.slice(1) + ']'); @@ -101,30 +101,6 @@ jQuery( document ).ready( function($) { } } - // WooCommerce Tabs - function woocommerceTabs() { - var descriptionTab = $( 'li.description_tab' ); - var descriptionTabLink = $( 'li.description_tab a' ); - var reviewsTab = $( 'li.reviews_tab' ); - var reviewsTabLink = $( 'li.reviews_tab a' ); - var panelDescription = $( '.panel#tab-description' ); - var panelReviews = $( '.panel#tab-reviews' ); - - $( descriptionTabLink ).click( function() { - $( this ).parent().addClass( 'active' ); - $( reviewsTab ).removeClass( 'active' ); - $( panelDescription ).show(); - $( panelReviews ).hide(); - }); - - $( reviewsTabLink ).click( function() { - $( this ).parent().addClass( 'active' ); - $( descriptionTab ).removeClass( 'active' ); - $( panelReviews ).show(); - $( panelDescription ).hide(); - }); - } - // Called Functions $( function() { isIsIOS(); @@ -135,7 +111,6 @@ jQuery( document ).ready( function($) { setColorOnFrontPagePerson(); subMenu(); alignSubSubMenu(); - woocommerceTabs(); }); // Window Resize diff --git a/layout/js/scripts.min.js b/layout/js/scripts.min.js index 290ab82..8ae72e5 100755 --- a/layout/js/scripts.min.js +++ b/layout/js/scripts.min.js @@ -1,2 +1,2 @@ -jQuery(document).ready(function(a){function b(){a.browser.device=/iphone|ipad|ipod/i.test(navigator.userAgent.toLowerCase()),1==a.browser.device&&(a("#counter").css("background-attachment","scroll"),a("#testimonials").css("background-attachment","scroll"))}function c(){a('a[href*="#"]:not([href="#"])').on("click",function(){if(location.pathname.replace(/^\//,"")==this.pathname.replace(/^\//,"")&&location.hostname==this.hostname){var b=a(this.hash);if(b=b.length?b:a("[name="+this.hash.slice(1)+"]"),b.length)return a("html,body").animate({scrollTop:b.offset().top},1e3),!1}})}function d(){a(".open-responsive-menu").click(function(){a(".responsive-menu").toggle("slow",function(){a(this).toggleClass("active")})})}function e(){var b=a("#projects .project"),c=a(b).width();a(b).css("height",c)}function f(){a("#services .section-content .service").length&&a("#services .section-content .service").each(function(){var b=a(this),c=a(b).children(".service-icon"),d=a(b).children(".service-title"),e=a(b).data("service-color");a(c).css("color",e),a(d).css("color",e)})}function g(){a("#team .section-content .person").length&&a("#team .section-content .person").each(function(){var b=a(this),c=a(b).data("person-color"),d=a(b).children(".person-content").children(".person-position"),e=a(b).children(".person-content").children(".person-content-social.clearfix").children("li").children("a");a(d).css("color",c),a(e).css({"border-color":c, 'color':c})})}function h(){a("#header .top-header .header-navigation ul li.menu-item-has-children").hover(function(){a(this).children("ul").css("visibility","visible")},function(){a(this).children("ul").css("visibility","hidden")})}function i(){if(a("#header .top-header .header-navigation ul li.menu-item-has-children").length){var b=a("#header .top-header .header-navigation ul li.menu-item-has-children ul");a(b).each(function(){k-a(this).offset().left<210&&a(this).css("left","-200px")})}}function j(){var b=a("li.description_tab"),c=a("li.description_tab a"),d=a("li.reviews_tab"),e=a("li.reviews_tab a"),f=a(".panel#tab-description"),g=a(".panel#tab-reviews");a(c).click(function(){a(this).parent().addClass("active"),a(d).removeClass("active"),a(f).show(),a(g).hide()}),a(e).click(function(){a(this).parent().addClass("active"),a(b).removeClass("active"),a(g).show(),a(f).hide()})}var k=a(window).width();a(window).height(),a(document).width(),a(document).height();a(function(){b(),c(),d(),e(),f(),g(),h(),i(),j()}),a(window).resize(function(){a(function(){e()})})}); +jQuery(document).ready(function(a){function b(){a.browser.device=/iphone|ipad|ipod/i.test(navigator.userAgent.toLowerCase()),1==a.browser.device&&(a("#counter").css("background-attachment","scroll"),a("#testimonials").css("background-attachment","scroll"))}function c(){a('body:not(.single-product) a[href*="#"]:not([href="#"])').on("click",function(){if(location.pathname.replace(/^\//,"")==this.pathname.replace(/^\//,"")&&location.hostname==this.hostname){var b=a(this.hash);if(b=b.length?b:a("[name="+this.hash.slice(1)+"]"),b.length)return a("html,body").animate({scrollTop:b.offset().top},1e3),!1}})}function d(){a(".open-responsive-menu").click(function(){a(".responsive-menu").toggle("slow",function(){a(this).toggleClass("active")})})}function e(){var b=a("#projects .project"),c=a(b).width();a(b).css("height",c)}function f(){a("#services .section-content .service").length&&a("#services .section-content .service").each(function(){var b=a(this),c=a(b).children(".service-icon"),d=a(b).children(".service-title"),e=a(b).data("service-color");a(c).css("color",e),a(d).css("color",e)})}function g(){a("#team .section-content .person").length&&a("#team .section-content .person").each(function(){var b=a(this),c=a(b).data("person-color"),d=a(b).children(".person-content").children(".person-position"),e=a(b).children(".person-content").children(".person-content-social.clearfix").children("li").children("a");a(d).css("color",c),a(e).css({"border-color":c,color:c})})}function h(){a("#header .top-header .header-navigation ul li.menu-item-has-children").hover(function(){a(this).children("ul").css("visibility","visible")},function(){a(this).children("ul").css("visibility","hidden")})}function i(){if(a("#header .top-header .header-navigation ul li.menu-item-has-children").length){var b=a("#header .top-header .header-navigation ul li.menu-item-has-children ul");a(b).each(function(){j-a(this).offset().left<200&&a(this).css("left","-200px")})}}var j=a(window).width();a(window).height(),a(document).width(),a(document).height();a(function(){b(),c(),d(),e(),f(),g(),h(),i()}),a(window).resize(function(){a(function(){e()})})}); //# sourceMappingURL=scripts.min.js.map \ No newline at end of file From 8985ae1d0b27c1df623748c67d0d500b5ef6914b Mon Sep 17 00:00:00 2001 From: Giucu Date: Mon, 20 Mar 2017 17:10:43 +0200 Subject: [PATCH 3/4] #180 --- CHANGELOG.txt | 1 + inc/back-compatible.php | 37 ++++++++++++++++++ inc/customizer/panels/jumbotron.php | 54 ++++++--------------------- sections/front-page-bottom-header.php | 24 +++--------- 4 files changed, 54 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 380f7d9..e98da30 100755 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,7 @@ ### V2.0.1 - Fixed left sidebar mobile issue. ( https://github.com/puikinsh/illdy/issues/176 ) - Woocommerce "Additional Information" Tab issue. ( https://github.com/puikinsh/illdy/issues/179 ) + - Allow change of font for title and also make the period optional( https://github.com/puikinsh/illdy/issues/180 ) ### V2.0.0 - Added new Welcome Page. diff --git a/inc/back-compatible.php b/inc/back-compatible.php index 3aa7165..6dcefc9 100755 --- a/inc/back-compatible.php +++ b/inc/back-compatible.php @@ -119,4 +119,41 @@ } + + // Jumbotron Title + $first_word = get_theme_mod( 'illdy_jumbotron_general_first_row_from_title' ); + $second_word = get_theme_mod( 'illdy_jumbotron_general_second_row_from_title' ); + $third_word = get_theme_mod( 'illdy_jumbotron_general_third_row_from_title' ); + + if ( $first_word || $second_word || $third_word ) { + + $title = ''; + if ( $first_word ) { + $title = $first_word; + } + if ( $second_word ) { + if ( $title != '' ) { + $title .= '.'; + } + $title .= $second_word; + } + if ( $third_word ) { + if ( $title != '' ) { + $title .= '.'; + } + $title .= $third_word; + } + + + set_theme_mod( 'illdy_jumbotron_title', $title ); + remove_theme_mod( 'illdy_jumbotron_general_first_row_from_title'); + remove_theme_mod( 'illdy_jumbotron_general_second_row_from_title'); + remove_theme_mod( 'illdy_jumbotron_general_third_row_from_title'); + + + } + + + + } diff --git a/inc/customizer/panels/jumbotron.php b/inc/customizer/panels/jumbotron.php index d2fd5fd..3ed077c 100755 --- a/inc/customizer/panels/jumbotron.php +++ b/inc/customizer/panels/jumbotron.php @@ -43,53 +43,21 @@ 'section' => $prefix . '_jumbotron_general', ) ) ); -// First word from title -$wp_customize->add_setting( $prefix . '_jumbotron_general_first_row_from_title', array( - 'sanitize_callback' => 'illdy_sanitize_html', - 'default' => __( 'Clean', 'illdy' ), +$wp_customize->add_setting( $prefix . '_jumbotron_title', array( + 'sanitize_callback' => 'wp_kses_post', + 'default' => __( 'Clean . Slick. Pixel Perfect', 'illdy' ), 'transport' => 'postMessage', ) ); -$wp_customize->add_control( $prefix . '_jumbotron_general_first_row_from_title', array( - 'label' => __( 'First word from title', 'illdy' ), - 'section' => $prefix . '_jumbotron_general', -) ); - -$wp_customize->selective_refresh->add_partial( $prefix .'_jumbotron_general_first_row_from_title', array( - 'selector' => '#header .bottom-header.front-page h1 span:nth-child(1)', - 'render_callback' => $prefix .'_jumbotron_general_first_row_from_title', -) ); - -// Second word from title -$wp_customize->add_setting( $prefix . '_jumbotron_general_second_row_from_title', array( - 'sanitize_callback' => 'illdy_sanitize_html', - 'default' => __( 'Slick', 'illdy' ), - 'transport' => 'postMessage', -) ); -$wp_customize->add_control( $prefix . '_jumbotron_general_second_row_from_title', array( - 'label' => __( 'Second word from title', 'illdy' ), - 'section' => $prefix . '_jumbotron_general', -) ); - -$wp_customize->selective_refresh->add_partial( $prefix .'_jumbotron_general_second_row_from_title', array( - 'selector' => '#header .bottom-header.front-page h1 span:nth-child(3)', - 'render_callback' => $prefix .'_jumbotron_general_second_row_from_title', -) ); - -// Third word from title -$wp_customize->add_setting( $prefix . '_jumbotron_general_third_row_from_title', array( - 'sanitize_callback' => 'illdy_sanitize_html', - 'default' => __( 'Pixel Perfect', 'illdy' ), - 'transport' => 'postMessage', -) ); -$wp_customize->add_control( $prefix . '_jumbotron_general_third_row_from_title', array( - 'label' => __( 'Third word from title', 'illdy' ), - 'section' => $prefix . '_jumbotron_general', +$wp_customize->add_control( new Epsilon_Editor_Custom_Control( + $wp_customize, $prefix . '_jumbotron_title', array( + 'label' => __( 'Title', 'illdy' ), + 'description' => __( 'Add the title for this section.', 'illdy' ), + 'section' => $prefix . '_jumbotron_general', +) ) ); +$wp_customize->selective_refresh->add_partial( $prefix .'_jumbotron_title', array( + 'selector' => '#header .bottom-header.front-page h1', ) ); -$wp_customize->selective_refresh->add_partial( $prefix .'_jumbotron_general_third_row_from_title', array( - 'selector' => '#header .bottom-header.front-page h1 span:nth-child(5)', - // 'render_callback' => $prefix .'_jumbotron_general_second_row_from_title', -) ); // Entry if ( get_theme_mod( $prefix . '_jumbotron_general_entry' ) ) { diff --git a/sections/front-page-bottom-header.php b/sections/front-page-bottom-header.php index 319192e..9423fd5 100755 --- a/sections/front-page-bottom-header.php +++ b/sections/front-page-bottom-header.php @@ -8,18 +8,14 @@ ?> . Slick. Pixel Perfect', 'illdy' ) ); $entry = get_theme_mod( 'illdy_jumbotron_general_entry', __( 'lldy is a great one-page theme, perfect for developers and designers but also for someone who just wants a new website for his business. Try it now!', 'illdy' ) ); $first_button_title = get_theme_mod( 'illdy_jumbotron_general_first_button_title', __( 'Learn more', 'illdy' ) ); $first_button_url = get_theme_mod( 'illdy_jumbotron_general_first_button_url', esc_url( '#' ) ); $second_button_title = get_theme_mod( 'illdy_jumbotron_general_second_button_title', __( 'Download', 'illdy' ) ); $second_button_url = get_theme_mod( 'illdy_jumbotron_general_second_button_url', esc_url( '#' ) ); } else { - $first_row_from_title = get_theme_mod( 'illdy_jumbotron_general_first_row_from_title', get_the_title() ); - $second_row_from_title = get_theme_mod( 'illdy_jumbotron_general_second_row_from_title' ); - $third_row_from_title = get_theme_mod( 'illdy_jumbotron_general_third_row_from_title' ); + $jumbotron_title = get_theme_mod( 'illdy_jumbotron_title', __( 'Clean . Slick. Pixel Perfect', 'illdy' ) ); $entry = get_theme_mod( 'illdy_jumbotron_general_entry' ); $first_button_title = get_theme_mod( 'illdy_jumbotron_general_first_button_title' ); $first_button_url = get_theme_mod( 'illdy_jumbotron_general_first_button_url' ); @@ -27,25 +23,15 @@ $second_button_url = get_theme_mod( 'illdy_jumbotron_general_second_button_url' ); } -if ( $first_row_from_title || $second_row_from_title || $third_row_from_title || $entry || $first_button_title || $second_button_title ) { +if ( $jumbotron_title || $entry || $first_button_title || $second_button_title ) { ?>
- +
-

' . illdy_sanitize_html( $first_row_from_title ) . '' . __( '.', 'illdy' ) . ''; - } ?> - ' . illdy_sanitize_html( $second_row_from_title ) . '' . __( '.', 'illdy' ) . ''; - } ?> - - ' . illdy_sanitize_html( $third_row_from_title ) . ''; - } ?> -

+

From 0cdee48c3294d32ed4d57d59e62486f3a29f4f0c Mon Sep 17 00:00:00 2001 From: Giucu Date: Mon, 20 Mar 2017 18:44:44 +0200 Subject: [PATCH 4/4] #181 --- CHANGELOG.txt | 1 + inc/back-compatible.php | 19 ++++++++++++++++++- inc/customizer/customizer.php | 6 +++--- inc/customizer/panels/contact-us.php | 24 +++++++++--------------- 4 files changed, 31 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index e98da30..12e5bd7 100755 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -2,6 +2,7 @@ - Fixed left sidebar mobile issue. ( https://github.com/puikinsh/illdy/issues/176 ) - Woocommerce "Additional Information" Tab issue. ( https://github.com/puikinsh/illdy/issues/179 ) - Allow change of font for title and also make the period optional( https://github.com/puikinsh/illdy/issues/180 ) + - Contact Us Title not displaying on front end. ( https://github.com/puikinsh/illdy/issues/181 ) ### V2.0.0 - Added new Welcome Page. diff --git a/inc/back-compatible.php b/inc/back-compatible.php index 6dcefc9..78b0ea2 100755 --- a/inc/back-compatible.php +++ b/inc/back-compatible.php @@ -150,10 +150,27 @@ remove_theme_mod( 'illdy_jumbotron_general_second_row_from_title'); remove_theme_mod( 'illdy_jumbotron_general_third_row_from_title'); - } + // Contact US Title + $contacus_title = get_theme_mod( 'illdy_contact_us_title' ); + if ( $contacus_title ) { + set_theme_mod( 'illdy_contact_us_general_title', $contacus_title ); + remove_theme_mod( 'illdy_contact_us_title'); + } + //Adress Title + $address_title = get_theme_mod( 'illdy_contact_us_address_title' ); + if ( $address_title ) { + set_theme_mod( 'illdy_contact_us_general_address_title', $address_title ); + remove_theme_mod( 'illdy_contact_us_address_title'); + } + //Support Title + $support_title = get_theme_mod( 'illdy_contact_us_customer_support_title' ); + if ( $support_title ) { + set_theme_mod( 'illdy_contact_us_general_customer_support_title', $support_title ); + remove_theme_mod( 'illdy_contact_us_customer_support_title'); + } } diff --git a/inc/customizer/customizer.php b/inc/customizer/customizer.php index 0917797..8001ec4 100755 --- a/inc/customizer/customizer.php +++ b/inc/customizer/customizer.php @@ -345,10 +345,10 @@ function illdy_create_contact_tab_sections() { $prefix = 'illdy'; $sections = array( $prefix . '_contact_us_show', - $prefix . '_contact_us_title', + $prefix . '_contact_us_general_title', $prefix . '_contact_us_entry', - $prefix . '_contact_us_address_title', - $prefix . '_contact_us_customer_support_title', + $prefix . '_contact_us_general_address_title', + $prefix . '_contact_us_general_customer_support_title', ); if ( illdy_is_not_active_contact_form_7() ) { diff --git a/inc/customizer/panels/contact-us.php b/inc/customizer/panels/contact-us.php index 00a8a34..42d4efb 100755 --- a/inc/customizer/panels/contact-us.php +++ b/inc/customizer/panels/contact-us.php @@ -73,7 +73,7 @@ ); // Title -$wp_customize->add_setting( $prefix .'_contact_us_title', +$wp_customize->add_setting( $prefix .'_contact_us_general_title', array( 'sanitize_callback' => 'illdy_sanitize_html', 'default' => __( 'Contact us', 'illdy' ), @@ -81,7 +81,7 @@ ) ); $wp_customize->add_control( - $prefix .'_contact_us_title', + $prefix .'_contact_us_general_title', array( 'label' => __( 'Title', 'illdy' ), 'description' => __( 'Add the title for this section.', 'illdy'), @@ -89,9 +89,8 @@ 'priority' => 2 ) ); -$wp_customize->selective_refresh->add_partial( $prefix .'_contact_us_title', array( +$wp_customize->selective_refresh->add_partial( $prefix .'_contact_us_general_title', array( 'selector' => '#contact-us .section-header h3', - 'render_callback' => $prefix .'_contact_us_title', ) ); // Entry @@ -140,11 +139,10 @@ } $wp_customize->selective_refresh->add_partial( $prefix .'_contact_us_entry', array( 'selector' => '#contact-us .section-header .section-description', - 'render_callback' => $prefix .'_contact_us_entry', ) ); // Address Title -$wp_customize->add_setting( $prefix .'_contact_us_address_title', +$wp_customize->add_setting( $prefix .'_contact_us_general_address_title', array( 'sanitize_callback' => 'illdy_sanitize_html', 'default' => __( 'Address', 'illdy' ), @@ -152,20 +150,19 @@ ) ); $wp_customize->add_control( - $prefix .'_contact_us_address_title', + $prefix .'_contact_us_general_address_title', array( 'label' => __( 'Address Title', 'illdy' ), 'section' => $prefix . '_contact_us', 'priority' => 4 ) ); -$wp_customize->selective_refresh->add_partial( $prefix .'_contact_us_address_title', array( +$wp_customize->selective_refresh->add_partial( $prefix .'_contact_us_general_address_title', array( 'selector' => '#contact-us .section-content .row .col-sm-4 .box-left', - 'render_callback' => $prefix .'_contact_us_address_title', ) ); // Customer Support Title -$wp_customize->add_setting( $prefix .'_contact_us_customer_support_title', +$wp_customize->add_setting( $prefix .'_contact_us_general_customer_support_title', array( 'sanitize_callback' => 'illdy_sanitize_html', 'default' => __( 'Customer Support', 'illdy' ), @@ -173,16 +170,15 @@ ) ); $wp_customize->add_control( - $prefix .'_contact_us_customer_support_title', + $prefix .'_contact_us_general_customer_support_title', array( 'label' => __( 'Customer Support Title', 'illdy' ), 'section' => $prefix . '_contact_us', 'priority' => 5 ) ); -$wp_customize->selective_refresh->add_partial( $prefix .'_contact_us_customer_support_title', array( +$wp_customize->selective_refresh->add_partial( $prefix .'_contact_us_general_customer_support_title', array( 'selector' => '#contact-us .section-content .row .col-sm-5 .box-left', - 'render_callback' => $prefix .'_contact_us_customer_support_title', ) ); // Contact Form 7 @@ -447,7 +443,6 @@ ); $wp_customize->selective_refresh->add_partial( $prefix .'_phone', array( 'selector' => '#contact-us .section-content .row .col-sm-5 .box-right span:nth-child(2)', - 'render_callback' => $prefix .'_phone', ) ); // Address 1 @@ -470,7 +465,6 @@ ); $wp_customize->selective_refresh->add_partial( $prefix .'_address1', array( 'selector' => '#contact-us .section-content .row .col-sm-4 .box-right span:first-child', - 'render_callback' => $prefix .'_address1', ) ); // Address 2