From 70c4a0eee7668fedb464404e4171fc233a03b8c7 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Fri, 8 Nov 2024 15:43:36 -0300 Subject: [PATCH] Version 0.3.6 --- tainacan-blocksy/README.txt | 9 +++- tainacan-blocksy/functions.php | 4 +- tainacan-blocksy/inc/enqueues.php | 52 ++++++++++++------- tainacan-blocksy/inc/navigation.php | 4 +- tainacan-blocksy/package-lock.json | 2 +- tainacan-blocksy/package.json | 2 +- tainacan-blocksy/tainacan/archive-items.php | 11 ++-- .../tainacan/archive-repository.php | 11 ++-- .../tainacan/archive-taxonomy.php | 11 ++-- 9 files changed, 70 insertions(+), 36 deletions(-) diff --git a/tainacan-blocksy/README.txt b/tainacan-blocksy/README.txt index 89974c9..c646976 100644 --- a/tainacan-blocksy/README.txt +++ b/tainacan-blocksy/README.txt @@ -5,7 +5,7 @@ Tags: museums, archives, collections, tainacan, blocksy Requires at least: 5.9 Tested up to: 6.6 Requires PHP: 7.0 -Stable tag: 0.3.4 +Stable tag: 0.3.6 Requires Plugins: tainacan License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -59,6 +59,13 @@ License details: https://github.com/tainacan/blocksy-tainacan/blob/master/LICENS == Changelog == += 0.3.6 = +* Fixes background color issues with undefined variable in items archive + += 0.3.5 = +* Fixes background color issues in media gallery +* Fixes spacing issues on next and previous links for recent versions of Blocksy. + = 0.3.4 = * Adds support for variable items width in related items carousel diff --git a/tainacan-blocksy/functions.php b/tainacan-blocksy/functions.php index 832a0e3..9b0be39 100644 --- a/tainacan-blocksy/functions.php +++ b/tainacan-blocksy/functions.php @@ -4,7 +4,7 @@ Plugin Name: Tainacan Support for Blocksy Plugin URI: https://tainacan.org/ Description: Tainacan plugin support for Blocksy theme Author: tainacan -Version: 0.3.4 +Version: 0.3.6 Text Domain: tainacan-blocksy License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -15,7 +15,7 @@ if (! defined('WP_DEBUG') ) { } /** Theme/plugin version */ -const TAINACAN_BLOCKSY_VERSION = '0.3.4'; +const TAINACAN_BLOCKSY_VERSION = '0.3.6'; const TAINACAN_BLOCKSY_IS_CHILD_THEME = false; /* Tools to define our next constants */ diff --git a/tainacan-blocksy/inc/enqueues.php b/tainacan-blocksy/inc/enqueues.php index de3f146..62add6a 100644 --- a/tainacan-blocksy/inc/enqueues.php +++ b/tainacan-blocksy/inc/enqueues.php @@ -222,8 +222,11 @@ if ( !function_exists('tainacan_blocksy_tooltip_and_modal_styles') ) { $page_container_style .= '--tainacan-item-hover-background-color:' . $background_color_palette['color3']['color'] . ';'; $page_container_style .= '--tainacan-input-background-color:' . $background_color_palette['color4']['color'] . ';'; $page_container_style .= '--tainacan-primary:' . $background_color_palette['color5']['color'] . ';'; - $page_container_style .= '--tainacan-input-border-color:' . $background_color_palette['color6']['color'] . ';'; - + + if ( isset( $background_color_palette['color6'] ) ) { + $page_container_style .= '--tainacan-input-border-color:' . $background_color_palette['color6']['color'] . ';'; + } + $text_color_palette = get_theme_mod($prefix . '_items_list_text_palette', [ 'color1' => [ 'color' => 'var(--theme-palette-color-1, var(--paletteColor1, #3eaf7c))' ], @@ -267,28 +270,37 @@ function tainacan_blocksy_add_background_color_variable($args) { 'tablet' => 'var(--theme-palette-color-7, var(--paletteColor7, #ffffff))', 'mobile' => 'var(--theme-palette-color-7, var(--paletteColor7, #ffffff))' ); - $site_background = get_theme_mod( 'site_background', $site_background_fallback ); - + $site_background = blocksy_get_theme_mod( + 'site_background', + blocksy_background_default_value([ + 'backgroundColor' => [ + 'default' => [ + 'color' => 'var(--theme-palette-color-7)' + ], + ], + ]) + ); + + $site_desktop_background = isset($site_background['desktop']) ? $site_background['desktop'] : $site_background; $site_desktop_background = ( - isset($site_background['desktop']) && - isset($site_background['desktop']['backgroundColor']) && - isset($site_background['desktop']['backgroundColor']['default']) && - isset($site_background['desktop']['backgroundColor']['default']['color']) - ) ? $site_background['desktop']['backgroundColor']['default']['color'] : false; + isset($site_desktop_background['backgroundColor']) && + isset($site_desktop_background['backgroundColor']['default']) && + isset($site_desktop_background['backgroundColor']['default']['color']) + ) ? $site_desktop_background['backgroundColor']['default']['color'] : false; + $site_tablet_background = isset($site_background['tablet']) ? $site_background['tablet'] : $site_background; $site_tablet_background = ( - isset($site_background['tablet']) && - isset($site_background['tablet']['backgroundColor']) && - isset($site_background['tablet']['backgroundColor']['default']) && - isset($site_background['tablet']['backgroundColor']['default']['color']) - ) ? $site_background['tablet']['backgroundColor']['default']['color'] : false; + isset($site_tablet_background['backgroundColor']) && + isset($site_tablet_background['backgroundColor']['default']) && + isset($site_tablet_background['backgroundColor']['default']['color']) + ) ? $site_tablet_background['backgroundColor']['default']['color'] : false; + $site_mobile_background = isset($site_background['mobile']) ? $site_background['mobile'] : $site_background; $site_mobile_background = ( - isset($site_background['mobile']) && - isset($site_background['mobile']['backgroundColor']) && - isset($site_background['mobile']['backgroundColor']['default']) && - isset($site_background['mobile']['backgroundColor']['default']['color']) - ) ? $site_background['mobile']['backgroundColor']['default']['color'] : false; + isset($site_mobile_background['backgroundColor']) && + isset($site_mobile_background['backgroundColor']['default']) && + isset($site_mobile_background['backgroundColor']['default']['color']) + ) ? $site_mobile_background['backgroundColor']['default']['color'] : false; blocksy_output_css_vars([ 'css' => $args['css'], @@ -305,5 +317,5 @@ function tainacan_blocksy_add_background_color_variable($args) { ]); } -add_action( 'blocksy:global-dynamic-css:enqueue', 'tainacan_blocksy_add_background_color_variable' ); +add_action( 'blocksy:global-dynamic-css:enqueue:inline', 'tainacan_blocksy_add_background_color_variable' ); diff --git a/tainacan-blocksy/inc/navigation.php b/tainacan-blocksy/inc/navigation.php index 76963b0..56d2c65 100644 --- a/tainacan-blocksy/inc/navigation.php +++ b/tainacan-blocksy/inc/navigation.php @@ -174,7 +174,7 @@ if ( !function_exists('blocksy_default_post_navigation') ) { ] )); - $container_class = 'post-navigation'; + $container_class = 'post-navigation ct-constrained-width'; $container_class .= ' ' . blocksy_visibility_classes(get_theme_mod( $prefix . '_post_nav_visibility', @@ -352,7 +352,7 @@ if ( !function_exists('tainacan_blocksy_item_navigation') ) { if (get_theme_mod( $prefix . '_has_post_nav', $prefix === 'single_blog_post' ? 'yes' : 'no' ) === 'yes') { - $container_class = 'post-navigation'; + $container_class = 'post-navigation ct-constrained-width'; $container_class .= ' ' . blocksy_visibility_classes(get_theme_mod( $prefix . '_post_nav_visibility', diff --git a/tainacan-blocksy/package-lock.json b/tainacan-blocksy/package-lock.json index 7f09979..1c91286 100644 --- a/tainacan-blocksy/package-lock.json +++ b/tainacan-blocksy/package-lock.json @@ -1,6 +1,6 @@ { "name": "tainacan-blocksy", - "version": "0.3.4", + "version": "0.3.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/tainacan-blocksy/package.json b/tainacan-blocksy/package.json index 8dae35e..10c322b 100644 --- a/tainacan-blocksy/package.json +++ b/tainacan-blocksy/package.json @@ -1,6 +1,6 @@ { "name": "tainacan-blocksy", - "version": "0.3.4", + "version": "0.3.6", "description": "A Blocksy plugin/child theme compatible with Tainacan", "main": "index.js", "scripts": { diff --git a/tainacan-blocksy/tainacan/archive-items.php b/tainacan-blocksy/tainacan/archive-items.php index 2a2a007..2f824bd 100644 --- a/tainacan-blocksy/tainacan/archive-items.php +++ b/tainacan-blocksy/tainacan/archive-items.php @@ -31,8 +31,11 @@ $page_container_style .= '--tainacan-item-background-color:' . $background_color $page_container_style .= '--tainacan-item-hover-background-color:' . $background_color_palette['color3']['color'] . ';'; $page_container_style .= '--tainacan-input-background-color:' . $background_color_palette['color4']['color'] . ';'; $page_container_style .= '--tainacan-primary:' . $background_color_palette['color5']['color'] . ';'; -$page_container_style .= '--tainacan-input-border-color:' . $background_color_palette['color6']['color'] . ';'; -$page_container_style .= '--theme-form-field-border-initial-color:' . $background_color_palette['color6']['color'] . ';'; + +if ( isset( $background_color_palette['color6'] ) ) { + $page_container_style .= '--tainacan-input-border-color:' . $background_color_palette['color6']['color'] . ';'; + $page_container_style .= '--theme-form-field-border-initial-color:' . $background_color_palette['color6']['color'] . ';'; +} $text_color_palette = get_theme_mod($prefix . '_items_list_text_palette', [ @@ -243,11 +246,13 @@ if ( $page_hero_section_style === 'type-2' ) { 'hide_advanced_search' => get_theme_mod($prefix . '_show_advanced_search', 'yes') == 'no', 'hide_sorting_area' => get_theme_mod($prefix . '_show_sorting_area', 'yes') == 'no', 'hide_sort_by_button' => get_theme_mod($prefix . '_show_sort_by_button', 'yes') == 'no', - 'hide_displayed_metadata_dropdown' => get_theme_mod($prefix . '_show_displayed_metadata_dropdown', 'yes') == 'no', + 'hide_displayed_metadata_button' => get_theme_mod($prefix . '_show_displayed_metadata_dropdown', 'yes') == 'no', 'show_inline_view_mode_options' => get_theme_mod($prefix . '_show_inline_view_mode_options', 'no') == 'yes', 'show_fullscreen_with_view_modes' => get_theme_mod($prefix . '_show_fullscreen_with_view_modes', 'no') == 'yes', 'hide_exposers_button' => get_theme_mod($prefix . '_show_exposers_button', 'yes') == 'no', 'hide_pagination_area' => get_theme_mod($prefix . '_has_pagination', 'yes') == 'no', + 'hide_items_per_page_button' => get_theme_mod($prefix . '_show_items_per_page_button', 'yes') == 'no', + 'hide_go_to_page_button' => get_theme_mod($prefix . '_show_go_to_page_button', 'yes') == 'no', 'should_not_hide_filters_on_mobile' => get_theme_mod($prefix . '_should_not_hide_filters_on_mobile', 'no') == 'yes', 'display_filters_horizontally' => get_theme_mod($prefix . '_display_filters_horizontally', 'no') == 'yes', 'hide_filter_collapses' => get_theme_mod($prefix . '_hide_filter_collapses', 'no') == 'yes', diff --git a/tainacan-blocksy/tainacan/archive-repository.php b/tainacan-blocksy/tainacan/archive-repository.php index e62c2df..52f8ca2 100644 --- a/tainacan-blocksy/tainacan/archive-repository.php +++ b/tainacan-blocksy/tainacan/archive-repository.php @@ -32,8 +32,11 @@ $page_container_style .= '--tainacan-item-background-color:' . $background_color $page_container_style .= '--tainacan-item-hover-background-color:' . $background_color_palette['color3']['color'] . ';'; $page_container_style .= '--tainacan-input-background-color:' . $background_color_palette['color4']['color'] . ';'; $page_container_style .= '--tainacan-primary:' . $background_color_palette['color5']['color'] . ';'; -$page_container_style .= '--tainacan-input-border-color:' . $background_color_palette['color6']['color'] . ';'; -$page_container_style .= '--theme-form-field-border-initial-color:' . $background_color_palette['color6']['color'] . ';'; + +if ( isset( $background_color_palette['color6'] ) ) { + $page_container_style .= '--tainacan-input-border-color:' . $background_color_palette['color6']['color'] . ';'; + $page_container_style .= '--theme-form-field-border-initial-color:' . $background_color_palette['color6']['color'] . ';'; +} $text_color_palette = get_theme_mod($repository_items_prefix . '_items_list_text_palette', [ @@ -160,11 +163,13 @@ if ( $page_hero_section_style === 'type-2' ) { 'hide_advanced_search' => get_theme_mod($repository_items_prefix . '_show_advanced_search', 'yes') == 'no', 'hide_sorting_area' => get_theme_mod($repository_items_prefix . '_show_sorting_area', 'yes') == 'no', 'hide_sort_by_button' => get_theme_mod($repository_items_prefix . '_show_sort_by_button', 'yes') == 'no', - 'hide_displayed_metadata_dropdown' => get_theme_mod($repository_items_prefix . '_show_displayed_metadata_dropdown', 'yes') == 'no', + 'hide_displayed_metadata_button' => get_theme_mod($repository_items_prefix . '_show_displayed_metadata_dropdown', 'yes') == 'no', 'show_inline_view_mode_options' => get_theme_mod($repository_items_prefix . '_show_inline_view_mode_options', 'no') == 'yes', 'show_fullscreen_with_view_modes' => get_theme_mod($repository_items_prefix . '_show_fullscreen_with_view_modes', 'no') == 'yes', 'hide_exposers_button' => get_theme_mod($repository_items_prefix . '_show_exposers_button', 'yes') == 'no', 'hide_pagination_area' => get_theme_mod($repository_items_prefix . '_has_pagination', 'yes') == 'no', + 'hide_items_per_page_button' => get_theme_mod($repository_items_prefix . '_show_items_per_page_button', 'yes') == 'no', + 'hide_go_to_page_button' => get_theme_mod($repository_items_prefix . '_show_go_to_page_button', 'yes') == 'no', 'default_view_mode' => get_theme_mod($repository_items_prefix . '_default_view_mode', 'masonry'), 'should_not_hide_filters_on_mobile' => get_theme_mod($repository_items_prefix . '_should_not_hide_filters_on_mobile', 'no') == 'yes', 'display_filters_horizontally' => get_theme_mod($repository_items_prefix . '_display_filters_horizontally', 'no') == 'yes', diff --git a/tainacan-blocksy/tainacan/archive-taxonomy.php b/tainacan-blocksy/tainacan/archive-taxonomy.php index 40c142a..275f28e 100644 --- a/tainacan-blocksy/tainacan/archive-taxonomy.php +++ b/tainacan-blocksy/tainacan/archive-taxonomy.php @@ -32,8 +32,11 @@ $page_container_style .= '--tainacan-item-background-color:' . $background_color $page_container_style .= '--tainacan-item-hover-background-color:' . $background_color_palette['color3']['color'] . ';'; $page_container_style .= '--tainacan-input-background-color:' . $background_color_palette['color4']['color'] . ';'; $page_container_style .= '--tainacan-primary:' . $background_color_palette['color5']['color'] . ';'; -$page_container_style .= '--tainacan-input-border-color:' . $background_color_palette['color6']['color'] . ';'; -$page_container_style .= '--theme-form-field-border-initial-color:' . $background_color_palette['color6']['color'] . ';'; + +if ( isset( $background_color_palette['color6'] ) ) { + $page_container_style .= '--tainacan-input-border-color:' . $background_color_palette['color6']['color'] . ';'; + $page_container_style .= '--theme-form-field-border-initial-color:' . $background_color_palette['color6']['color'] . ';'; +} $text_color_palette = get_theme_mod($term_items_prefix . '_items_list_text_palette', [ @@ -240,11 +243,13 @@ if ( $page_hero_section_style === 'type-2' ) { 'hide_advanced_search' => get_theme_mod($term_items_prefix . '_show_advanced_search', 'yes') == 'no', 'hide_sorting_area' => get_theme_mod($term_items_prefix . '_show_sorting_area', 'yes') == 'no', 'hide_sort_by_button' => get_theme_mod($term_items_prefix . '_show_sort_by_button', 'yes') == 'no', - 'hide_displayed_metadata_dropdown' => get_theme_mod($term_items_prefix . '_show_displayed_metadata_dropdown', 'yes') == 'no', + 'hide_displayed_metadata_button' => get_theme_mod($term_items_prefix . '_show_displayed_metadata_dropdown', 'yes') == 'no', 'show_inline_view_mode_options' => get_theme_mod($term_items_prefix . '_show_inline_view_mode_options', 'no') == 'yes', 'show_fullscreen_with_view_modes' => get_theme_mod($term_items_prefix . '_show_fullscreen_with_view_modes', 'no') == 'yes', 'hide_exposers_button' => get_theme_mod($term_items_prefix . '_show_exposers_button', 'yes') == 'no', 'hide_pagination_area' => get_theme_mod($term_items_prefix . '_has_pagination', 'yes') == 'no', + 'hide_items_per_page_button' => get_theme_mod($term_items_prefix . '_show_items_per_page_button', 'yes') == 'no', + 'hide_go_to_page_button' => get_theme_mod($term_items_prefix . '_show_go_to_page_button', 'yes') == 'no', 'default_view_mode' => get_theme_mod($term_items_prefix . '_default_view_mode', 'masonry'), 'should_not_hide_filters_on_mobile' => get_theme_mod($term_items_prefix . '_should_not_hide_filters_on_mobile', 'no') == 'yes', 'display_filters_horizontally' => get_theme_mod($term_items_prefix . '_display_filters_horizontally', 'no') == 'yes',