From 68ea84c91f74a9608a0a9615717d55338f1eae2a Mon Sep 17 00:00:00 2001 From: Ashu Kumar Gupta <62129914+d-ashuji@users.noreply.github.com> Date: Thu, 4 Mar 2021 15:45:25 +0530 Subject: [PATCH 1/5] Fixed minor issues > Link Color Change Option [in the customizer] > Comment box displaying above the Comment > Logo resolution not right > either remove the top bar or keep it box width. > remove the blank space on the post in archive when there's no image --- comments.php | 56 ++++++++++++++--------------- inc/customizer/controls.php | 15 ++++++++ inc/customizer/custom/separator.php | 17 --------- inc/customizer/js/customizer.js | 5 +++ inc/customizer/live-preview-css.php | 7 +++- inc/defaults.php | 1 + inc/template-functions.php | 22 ++++++++++++ template-parts/content.php | 2 ++ template-parts/top-bar.php | 2 +- 9 files changed, 80 insertions(+), 47 deletions(-) diff --git a/comments.php b/comments.php index ad35491..4bf9fa2 100644 --- a/comments.php +++ b/comments.php @@ -60,44 +60,44 @@ ); ?> -
- -
- ID)->approved; + $comments_count = wp_count_comments($post->ID)->approved; ?> -
+

Comments

- + - 1 && get_option('page_comments')) : - ?> - - + 1 && get_option('page_comments')) : + ?> + + -
+
- comment_status) : ?> - - - - - + comment_status) : ?> + + + + + + +
+ +
diff --git a/inc/customizer/controls.php b/inc/customizer/controls.php index c2e5d13..7a3df8b 100644 --- a/inc/customizer/controls.php +++ b/inc/customizer/controls.php @@ -588,6 +588,21 @@ function mtminimag_customize_register($wp_customize) ) ) ); + $wp_customize->add_setting('color_anchor', array ( + 'default' => $defaultColors['color_anchor'], + 'transport' => 'postMessage', + 'sanitize_callback' => 'sanitize_hex_color' + )); + $wp_customize->add_control( + new WP_Customize_Color_Control( + $wp_customize, + 'color_anchor', + array( + 'label' => __( 'Link Color', 'mtminimag' ), + 'section' => 'main_colors', + ) ) + ); + // Logo Color $wp_customize->add_section('logo_colors', array ( 'title' => __('Logo Color', 'mtminimag'), diff --git a/inc/customizer/custom/separator.php b/inc/customizer/custom/separator.php index b34bb7c..b67c35f 100644 --- a/inc/customizer/custom/separator.php +++ b/inc/customizer/custom/separator.php @@ -34,23 +34,6 @@ public function json() { protected function render_template() { ?> -
diff --git a/inc/customizer/js/customizer.js b/inc/customizer/js/customizer.js index b0b1295..74dd9b0 100644 --- a/inc/customizer/js/customizer.js +++ b/inc/customizer/js/customizer.js @@ -46,6 +46,11 @@ document.documentElement.style.setProperty('--site-color', newval); }); }); + wp.customize( 'color_anchor', function( value ) { + value.bind( function( newval ) { + document.documentElement.style.setProperty('--anchor-color', newval); + }); + }); // Offcanvas colors wp.customize( 'offcanvas_width', function( value ) { diff --git a/inc/customizer/live-preview-css.php b/inc/customizer/live-preview-css.php index ae6deee..955be11 100644 --- a/inc/customizer/live-preview-css.php +++ b/inc/customizer/live-preview-css.php @@ -15,6 +15,7 @@ function mtminimag_customizer_css() --site-color: ; --primary-color: ; + --anchor-color: ; --header-text-color: ; --body-bg-color: ; @@ -44,7 +45,11 @@ function mtminimag_customizer_css() --offcanvas-width: px; --offcanvas-text-color: ; --offcanvas-bg: ; - } + } + + a { + color: var(--anchor-color); + } body.custom-background { background-color: var(--body-bg-color); diff --git a/inc/defaults.php b/inc/defaults.php index 1ede878..9f03af3 100644 --- a/inc/defaults.php +++ b/inc/defaults.php @@ -115,6 +115,7 @@ function mt_get_color_defaults() { 'color_primary' => '#646464', 'color_site' => '#737070', + 'color_anchor' => '#000', 'color_logo_text' => '#FF4642', 'color_header_text' => '#111111', 'color_background' => '#f8f9fa', diff --git a/inc/template-functions.php b/inc/template-functions.php index c5b8acc..43640b9 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -488,6 +488,28 @@ function mtminimag_footer_info() { } } +function mtminimag_customizer_styles() { ?> + + " >
+
+
    diff --git a/template-parts/top-bar.php b/template-parts/top-bar.php index 7b12693..0eb9567 100644 --- a/template-parts/top-bar.php +++ b/template-parts/top-bar.php @@ -1,4 +1,4 @@ -
    +
    From fac22bec985ffbcad1c223be76c0464bee835e22 Mon Sep 17 00:00:00 2001 From: Ashu Kumar Gupta <62129914+d-ashuji@users.noreply.github.com> Date: Thu, 4 Mar 2021 16:21:33 +0530 Subject: [PATCH 2/5] Remove AD Management Control --- inc/customizer/ad-manager.php | 110 ------------------------------- inc/customizer/controls.php | 121 ---------------------------------- inc/defaults.php | 8 --- page.php | 19 ------ single.php | 22 ------- 5 files changed, 280 deletions(-) delete mode 100644 inc/customizer/ad-manager.php diff --git a/inc/customizer/ad-manager.php b/inc/customizer/ad-manager.php deleted file mode 100644 index 90a1144..0000000 --- a/inc/customizer/ad-manager.php +++ /dev/null @@ -1,110 +0,0 @@ -#i', $content, $matches, PREG_SET_ORDER+PREG_OFFSET_CAPTURE); - $middleParagraph = floor($totalParagraphs / 2); - - if( getOption('defaults', 'ads_posts') ) { - if (is_single() && ! is_admin()) { - return mtminimag_insert_after_paragraphs($content, $insertion, array($middleParagraph)); - } - } - - if( getOption('defaults', 'ads_pages') ) { - if (is_page() && ! is_admin()) { - return mtminimag_insert_after_paragraphs($content, $insertion, array($middleParagraph)); - } - } - - return $content; - } - } - - /* Advertisement before the last paragraph */ - if ( getOption('defaults', 'ad_before_last_paragraph') ) { - add_filter('the_content', 'mtminimag_insert_ads_before_last'); - - function mtminimag_insert_ads_before_last($content) { - $insertion = getOption('defaults', 'ad_before_last_paragraph'); - - $totalParagraphs = preg_match_all('#

    #i', $content, $matches, PREG_SET_ORDER+PREG_OFFSET_CAPTURE); - $lastParagraph = floor($totalParagraphs - 1); - - if( getOption('defaults', 'ads_posts') ) { - if (is_single() && ! is_admin()) { - return mtminimag_insert_after_paragraphs($content, $insertion, array($lastParagraph)); - } - } - - if( getOption('defaults', 'ads_pages') ) { - if (is_page() && ! is_admin()) { - return mtminimag_insert_after_paragraphs($content, $insertion, array($lastParagraph)); - } - } - - return $content; - } - } - - /* Advertisement after the numbered paragraph */ - if ( getOption('defaults', 'paragraph_number') && getOption('defaults', 'ad_after_numbered_paragraph') ) { - add_filter('the_content', 'mtminimag_insert_ads_after_number'); - function mtminimag_insert_ads_after_number($content) { - $insertion = getOption('defaults', 'ad_after_numbered_paragraph'); - - $paragraphNumber = (int) getOption('defaults', 'paragraph_number'); - - if( getOption('defaults', 'ads_posts') ) { - if (is_single() && ! is_admin()) { - return mtminimag_insert_after_paragraphs($content, $insertion, array($paragraphNumber)); - } - } - - if( getOption('defaults', 'ads_pages') ) { - if (is_page() && ! is_admin()) { - return mtminimag_insert_after_paragraphs($content, $insertion, array($paragraphNumber)); - } - } - - return $content; - } - } - - // Function that makes the magic happen correctly - function findMatches($match) - { - return $match[0][1] + 4; // return string offset + length of

    Tag - } - - function mtminimag_insert_after_paragraphs($content, $insertion, $paragraph_indexes) { - // find all paragraph ending offsets - preg_match_all('#

    #i', $content, $matches, PREG_SET_ORDER+PREG_OFFSET_CAPTURE); - - // reduce matches to offset positions - /* Compatible with PHP v5 */ - $matches = array_map("findMatches", $matches); - - /* Compatible with PHP v7 */ - // $matches = array_map(function($match) { - // return $match[0][1] + 4; // return string offset + length of

    Tag - // }, $matches); - - // cycle through and insert on demand - foreach ($paragraph_indexes as $paragraph_index) { - if ($paragraph_index <= count($matches)) { - $offset_position = $matches[$paragraph_index-1]; - $content = substr($content, 0, $offset_position) . $insertion . substr($content, $offset_position); - } - } - - return $content; - } -} diff --git a/inc/customizer/controls.php b/inc/customizer/controls.php index 7a3df8b..2a40867 100644 --- a/inc/customizer/controls.php +++ b/inc/customizer/controls.php @@ -3209,128 +3209,7 @@ function mtminimag_customize_register($wp_customize) 'section' => 'header_style' ) )); - // - // ─── AD MANAGEMENT ────────────────────────────────────────────────────────────── - // - $wp_customize->add_panel('ad_mgt', array( - 'title' => __( 'Ad Management', 'mtminimag' ), - )); - - // Enable/Disable Adverts - $wp_customize->add_section('ad_appearance', array ( - 'title' => __('Appearance', 'mtminimag'), - 'description' => 'Enable/Disable Ads on your site.', - 'panel' => 'ad_mgt', - )); - $wp_customize->add_setting( 'ads_posts', array( - 'default' => $defaults['ads_posts'], - 'transport' => 'refresh', - 'sanitize_callback' => 'mtminimag_sanitize_checkbox' - )); - $wp_customize->add_control( - new MightyThemes_Toggle_Switch_Custom_control( - $wp_customize, - 'ads_posts', - array( - 'label' => __( 'Posts', 'mtminimag' ), - 'section' => 'ad_appearance' - ) - )); - - $wp_customize->add_setting( 'ads_pages', array( - 'default' => $defaults['ads_pages'], - 'transport' => 'refresh', - 'sanitize_callback' => 'mtminimag_sanitize_checkbox' - )); - $wp_customize->add_control( - new MightyThemes_Toggle_Switch_Custom_control( - $wp_customize, - 'ads_pages', - array( - 'label' => __( 'Pages', 'mtminimag' ), - 'section' => 'ad_appearance' - ) - )); - - // Adverts on position - $wp_customize->add_section('adverts_position', array ( - 'title' => __('Assign Position', 'mtminimag'), - 'description' => 'Code for showing ad in the specified position.', - 'panel' => 'ad_mgt', - )); - // Adverts on Beginning of Post/Page - $wp_customize->add_setting('ad_code_post_begin', array ( - 'default' => $defaults['ad_code_post_begin'], - 'transport' => 'refresh', - 'sanitize_callback' => 'mtminimag_sanitize_textarea' - )); - $wp_customize->add_control( 'ad_code_post_begin', array( - 'label' => __('Code of advert at the Beginning of Post/Page.', 'mtminimag'), - 'section' => 'adverts_position', - 'type' => 'textarea', - )); - // Adverts on Middle of Post/Page - $wp_customize->add_setting('ad_code_post_middle', array ( - 'default' => $defaults['ad_code_post_middle'], - 'transport' => 'refresh', - 'sanitize_callback' => 'mtminimag_sanitize_textarea' - )); - $wp_customize->add_control( 'ad_code_post_middle', array( - 'label' => __('Code of advert at the Middle of Post/Page.', 'mtminimag'), - 'section' => 'adverts_position', - 'type' => 'textarea', - )); - // Adverts on End of Post/Page - $wp_customize->add_setting('ad_code_post_end', array ( - 'default' => $defaults['ad_code_post_end'], - 'transport' => 'refresh', - 'sanitize_callback' => 'mtminimag_sanitize_textarea' - )); - $wp_customize->add_control( 'ad_code_post_end', array( - 'label' => __('Code of advert at the End of Post/Page.', 'mtminimag'), - 'section' => 'adverts_position', - 'type' => 'textarea', - )); - // Adverts on Right before the last paragraph - $wp_customize->add_setting('ad_before_last_paragraph', array ( - 'default' => $defaults['ad_before_last_paragraph'], - 'transport' => 'refresh', - 'sanitize_callback' => 'mtminimag_sanitize_textarea' - )); - $wp_customize->add_control( 'ad_before_last_paragraph', array( - 'label' => __('Code of advert before the last paragraph.', 'mtminimag'), - 'section' => 'adverts_position', - 'type' => 'textarea', - )); - // Adverts on [number] paragraph - $wp_customize->add_setting('paragraph_number', array ( - 'default' => $defaults['paragraph_number'], - 'transport' => 'refresh', - 'sanitize_callback' => 'mtminimag_sanitize_number' - )); - $wp_customize->add_control( 'paragraph_number', array( - 'label' => __('Paragraph Number', 'mtminimag'), - 'section' => 'adverts_position', - 'type' => 'number', - 'input_attrs' => array( - 'min' => 1, - 'max' => 200, - 'step' => 1, - ), - )); - - $wp_customize->add_setting('ad_after_numbered_paragraph', array ( - 'default' => $defaults['ad_after_numbered_paragraph'], - 'transport' => 'refresh', - 'sanitize_callback' => 'mtminimag_sanitize_textarea' - )); - $wp_customize->add_control( 'ad_after_numbered_paragraph', array( - 'label' => __('Code of advert after the [number] paragraph.', 'mtminimag'), - 'section' => 'adverts_position', - 'type' => 'textarea', - )); - // // ─── MISCELLANEOUS ────────────────────────────────────────────────────────────── // diff --git a/inc/defaults.php b/inc/defaults.php index 9f03af3..9ee1246 100644 --- a/inc/defaults.php +++ b/inc/defaults.php @@ -47,14 +47,6 @@ function mt_get_defaults() { 'show_search' => true, 'show_search_mobile' => true, 'show_topbar' => true, - 'ads_posts' => false, - 'ads_pages' => false, - 'ad_code_post_begin' => '', - 'ad_code_post_middle' => '', - 'ad_code_post_end' => '', - 'ad_before_last_paragraph' => '', - 'paragraph_number' => '', - 'ad_after_numbered_paragraph' => '', 'pagination_type' => 'numbered', 'show_author' => true, 'show_readtime' => true, diff --git a/page.php b/page.php index ab4551a..96847ee 100644 --- a/page.php +++ b/page.php @@ -25,16 +25,6 @@ - -
    - -
    - -
    @@ -63,15 +53,6 @@ endwhile; // End of the loop. ?> - -
    - -
    -
- -
- -
- -
@@ -141,16 +129,6 @@
- -
- -
- -