Skip to content

Commit e4cba5e

Browse files
Merge pull request #223 from bigboxwc/release/3.3.0
release/3.3.0
2 parents 0733c25 + da294be commit e4cba5e

File tree

23 files changed

+214
-196
lines changed

23 files changed

+214
-196
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## [3.3.0] - 2019-08-03
2+
3+
### New
4+
5+
- WooCommerce 3.7 compatibility.
6+
- Updated block editor support.
7+
18
## [3.2.0] - 2019-04-27
29

310
### New

app/customize/controls.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function bigbox_customize_controls_enqueue_scripts( $wp_customize ) {
4848

4949
wp_enqueue_style(
5050
'bigbox-customize-controls',
51-
get_template_directory_uri() . '/public/css/customize-controls.min.css',
51+
get_template_directory_uri() . '/public/css/customize-controls-css.min.css',
5252
[],
5353
bigbox_get_theme_version()
5454
);

app/integrations/facetwp/template-functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function bigbox_facetwp_wp_enqueue_scripts() {
3737

3838
wp_enqueue_style(
3939
"{$stylesheet}-facetwp",
40-
get_template_directory_uri() . '/public/css/facetwp.min.css',
40+
get_template_directory_uri() . '/public/css/facetwp-css.min.css',
4141
[],
4242
$version
4343
);

app/integrations/gutenberg/class-gutenberg.php

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function add_theme_support() {
6868
add_theme_support( 'editor-styles' );
6969

7070
// Add editor style.
71-
add_editor_style( 'public/css/gutenberg.min.css' );
71+
add_editor_style( 'public/css/gutenberg-css.min.css' );
7272

7373
$palette = [];
7474
$colors = bigbox_get_theme_colors();
@@ -162,6 +162,10 @@ public function inline_editor_css( $settings ) {
162162
$weight_base = bigbox_get_theme_font_weight( 'base' );
163163
$weight_bold = bigbox_get_theme_font_weight( 'bold' );
164164

165+
if ( 'default' === $family ) {
166+
$family = "-apple-system, blinkmacsystemfont, 'Segoe UI', roboto, 'Helvetica Neue', arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'";
167+
}
168+
165169
$config = [];
166170

167171
// Base.
@@ -173,7 +177,7 @@ public function inline_editor_css( $settings ) {
173177
'declarations' => [
174178
'color' => esc_attr( $gray700 ),
175179
'font-size' => ( $size * 16 ) . 'px',
176-
'font-family' => esc_attr( $family ),
180+
'font-family' => $family,
177181
'font-weight' => $weight_base,
178182
],
179183
];
@@ -215,12 +219,6 @@ public function inline_editor_css( $settings ) {
215219
'selectors' => [
216220
'.editor-post-title__block .editor-post-title__input',
217221
'a',
218-
'h1',
219-
'h2',
220-
'h3',
221-
'h4',
222-
'h5',
223-
'h6',
224222
],
225223
'declarations' => [
226224
'color' => esc_attr( $gray800 ),
@@ -255,8 +253,7 @@ public function inline_editor_css( $settings ) {
255253
}
256254

257255
$settings['styles'][] = [
258-
'baseUrl' => null,
259-
'css' => $css->build(),
256+
'css' => $css->build(),
260257
];
261258

262259
return $settings;

app/integrations/woocommerce-bookings/template-functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function bigbox_woocommerce_bookings_enqueue_styles() {
4545

4646
wp_enqueue_style(
4747
$stylesheet,
48-
get_template_directory_uri() . '/public/css/woocommerce-bookings.min.css',
48+
get_template_directory_uri() . '/public/css/woocommerce-bookings-css.min.css',
4949
[],
5050
$version
5151
);

app/integrations/woocommerce-brands/template-functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function bigbox_woocommerce_brands_enqueue_styles() {
5454

5555
wp_enqueue_style(
5656
$stylesheet,
57-
get_template_directory_uri() . '/public/css/woocommerce-brands.min.css',
57+
get_template_directory_uri() . '/public/css/woocommerce-brands-css.min.css',
5858
[],
5959
$version
6060
);

app/integrations/woocommerce-product-vendors/template-functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function bigbox_woocommerce_product_vendors_enqueue_styles() {
4444

4545
wp_enqueue_style(
4646
$stylesheet,
47-
get_template_directory_uri() . '/public/css/woocommerce-product-vendors.min.css',
47+
get_template_directory_uri() . '/public/css/woocommerce-product-vendors-css.min.css',
4848
[],
4949
$version
5050
);

app/integrations/woocommerce/wc-template-functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function woocommerce_subcategory_thumbnail( $category ) {
3030
// End modification.
3131
$small_thumbnail_size = apply_filters( 'subcategory_archive_thumbnail_size', 'woocommerce_thumbnail' );
3232
$dimensions = wc_get_image_size( $small_thumbnail_size );
33-
$thumbnail_id = get_woocommerce_term_meta( $category->term_id, 'thumbnail_id', true );
33+
$thumbnail_id = get_term_meta( $category->term_id, 'thumbnail_id', true );
3434

3535
if ( $thumbnail_id ) {
3636
$image = wp_get_attachment_image_src( $thumbnail_id, $small_thumbnail_size );

app/nux/class-setup-guide.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ function( $a, $b ) {
118118
public function admin_enqueue_scripts() {
119119
$version = bigbox_get_theme_version();
120120

121-
wp_register_style( 'bigbox-nux', get_template_directory_uri() . '/public/css/nux.min.css', [], $version );
121+
wp_register_style( 'bigbox-nux', get_template_directory_uri() . '/public/css/nux-css.min.css', [], $version );
122122
}
123123

124124
/**

app/theme/assets.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function bigbox_enqueue_styles() {
4040
// Base and dynamic styles.
4141
wp_enqueue_style(
4242
$stylesheet,
43-
get_template_directory_uri() . '/public/css/app.min.css',
43+
get_template_directory_uri() . '/public/css/app-css.min.css',
4444
$deps,
4545
$version
4646
);

0 commit comments

Comments
 (0)