Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.22.5 #133

Merged
merged 2 commits into from
Sep 3, 2024
Merged

2.22.5 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a16d6d
update wc templates
jamesros161 Sep 3, 2024
b5dc3fa
resolves buttons.css gets lost on update to WP 6.6 #131
jamesros161 Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boldgrid-theme-framework",
"version": "2.22.4",
"version": "2.22.5",
"description": "BoldGrid Theme Framework",
"main": "index.js",
"engines": {
Expand Down
24 changes: 18 additions & 6 deletions prime/woocommerce/myaccount/orders.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
* @see https://woocommerce.com/document/template-structure/
* @package WooCommerce\Templates
* @version 9.1.0
* @version 9.2.0
*/

defined( 'ABSPATH' ) || exit;
Expand All @@ -27,7 +27,7 @@
<thead>
<tr>
<?php foreach ( wc_get_account_orders_columns() as $column_id => $column_name ) : ?>
<th class="woocommerce-orders-table__header woocommerce-orders-table__header-<?php echo esc_attr( $column_id ); ?>"><span class="nobr"><?php echo esc_html( $column_name ); ?></span></th>
<th scope="col" class="woocommerce-orders-table__header woocommerce-orders-table__header-<?php echo esc_attr( $column_id ); ?>"><span class="nobr"><?php echo esc_html( $column_name ); ?></span></th>
<?php endforeach; ?>
</tr>
</thead>
Expand All @@ -39,12 +39,19 @@
$item_count = $order->get_item_count() - $order->get_item_count_refunded();
?>
<tr class="woocommerce-orders-table__row woocommerce-orders-table__row--status-<?php echo esc_attr( $order->get_status() ); ?> order">
<?php foreach ( wc_get_account_orders_columns() as $column_id => $column_name ) : ?>
<td class="woocommerce-orders-table__cell woocommerce-orders-table__cell-<?php echo esc_attr( $column_id ); ?>" data-title="<?php echo esc_attr( $column_name ); ?>">
<?php foreach ( wc_get_account_orders_columns() as $column_id => $column_name ) :
$is_order_number = 'order-number' === $column_id;
?>
<?php if ( $is_order_number ) : ?>
<th class="woocommerce-orders-table__cell woocommerce-orders-table__cell-<?php echo esc_attr( $column_id ); ?>" data-title="<?php echo esc_attr( $column_name ); ?>" scope="row">
<?php else : ?>
<td class="woocommerce-orders-table__cell woocommerce-orders-table__cell-<?php echo esc_attr( $column_id ); ?>" data-title="<?php echo esc_attr( $column_name ); ?>">
<?php endif; ?>

<?php if ( has_action( 'woocommerce_my_account_my_orders_column_' . $column_id ) ) : ?>
<?php do_action( 'woocommerce_my_account_my_orders_column_' . $column_id, $order ); ?>

<?php elseif ( 'order-number' === $column_id ) : ?>
<?php elseif ( $is_order_number ) : ?>
<?php /* translators: %s: the order number, usually accompanied by a leading # */ ?>
<a href="<?php echo esc_url( $order->get_view_order_url() ); ?>" aria-label="<?php echo esc_attr( sprintf( __( 'View order number %s', 'crio' ), $order->get_order_number() ) ); ?>">
<?php echo esc_html( _x( '#', 'hash before order number', 'crio' ) . $order->get_order_number() ); ?>
Expand Down Expand Up @@ -73,7 +80,12 @@
}
?>
<?php endif; ?>
</td>

<?php if ( $is_order_number ) : ?>
</th>
<?php else : ?>
</td>
<?php endif; ?>
<?php endforeach; ?>
</tr>
<?php
Expand Down
6 changes: 5 additions & 1 deletion readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Tags: news, blog, e-commerce, sticky-post, theme-options, threaded-comments, ful
Requires PHP: 5.6
Requires at least: 4.8
Tested up to: 6.6
Stable tag: 2.22.4
Stable tag: 2.22.5
License: GPL-3.0-or-later
License URI: https://www.gnu.org/licenses/gpl-3.0-standalone.html

Expand All @@ -22,6 +22,10 @@ This version changes the way the color palette CSS is generated. If you are usin

## Changelog ##

== 2.22.5 ==
* Update: Updated WooCommerce templates [#132](https://github.com/BoldGrid/crio/issues/132)
* Bug Fix: buttons.css gets lost on update to WP 6.6 [#131](https://github.com/BoldGrid/crio/issues/131)

== 2.22.4 ==
* Update: Updated WooCommerce templates [#127](https://github.com/BoldGrid/crio/issues/127)
* Bug Fix: Deprecated errors in wp-admin [#126](https://github.com/BoldGrid/crio/issues/126)
Expand Down
2 changes: 1 addition & 1 deletion src/boldgrid-theme-framework.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: BoldGrid Theme Framework
* Plugin URI: https://www.boldgrid.com/docs/configuration-file
* Description: BoldGrid Theme Framework is a library that allows you to easily make BoldGrid themes. Please see our reference guide for more information: https://www.boldgrid.com/docs/configuration-file
* Version: 2.22.4
* Version: 2.22.5
* Author: BoldGrid.com <[email protected]>
* Author URI: https://www.boldgrid.com/
* Text Domain: bgtfw
Expand Down
10 changes: 9 additions & 1 deletion src/includes/class-boldgrid-framework-styles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,19 @@ public function get_local_editor_styles() {
public function enqueue_buttons( $deps = array() ) {
$button_configs = $this->configs['components']['buttons'];

/*
* For unknown reasons, sometimes the buttons.css file gets deleted.
* This will force rebuilding the buttons.css file if it doesn't exist.
*/
if ( true === $button_configs['enabled'] && ! file_exists( $button_configs['css_file'] ) ) {
$compile = new Boldgrid_Framework_Scss_Compile( $this->configs );
$compile->build_bgtfw();
}

if ( true === $button_configs['enabled'] && file_exists( $button_configs['css_file'] ) ) {
$last_mod = filemtime( $button_configs['css_file'] );
wp_enqueue_style( 'boldgrid-buttons', $button_configs['css_uri'], $deps, $last_mod );
}

}

/**
Expand Down
2 changes: 1 addition & 1 deletion style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Author: BoldGrid
Theme URI: https://www.boldgrid.com/themes/crio/
Author URI: https://www.boldgrid.com/
Description: Crio is a WordPress SuperTheme that allows front-end designers, developers and other web professionals to create without bounds or restrictions. Crio's advanced customization options are completely integrated with the WordPress Customizer API, providing you with a powerful, but familiar interface to customize your website. Our integration gives you granular control over many elements straight from the Customizer, and even device previews so you can see how your site looks on different devices. Crio’s unique color palette system keeps colors consistent across your site. Drag and drop colors in your palette to increase or decrease the usage of that color throughout your website. Use the advanced controls to create a custom Header, Footer, or Blog Page layout. Be Bold and stand above the rest with Prime by BoldGrid!
Version: 2.22.4
Version: 2.22.5
Requires at least: 5.5
Tested up to: 6.6
Requires PHP: 5.6
Expand Down