diff --git a/assets/css/style.scss b/assets/css/style.scss index 00430e66f0c..7d72d79a03e 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -95,7 +95,6 @@ .wc-block-grid__product-rating { display: block; - color: #000; .wc-block-grid__product-rating__stars, .star-rating { @@ -118,7 +117,6 @@ right: 0; position: absolute; opacity: 0.5; - color: #aaa; white-space: nowrap; } span { diff --git a/assets/js/atomic/blocks/product-elements/price/index.js b/assets/js/atomic/blocks/product-elements/price/index.js index 8972e727109..6d285f72887 100644 --- a/assets/js/atomic/blocks/product-elements/price/index.js +++ b/assets/js/atomic/blocks/product-elements/price/index.js @@ -35,7 +35,7 @@ const blockConfig = { ...( isFeaturePluginBuild() && { color: { text: true, - background: false, + background: true, link: false, __experimentalSkipSerialization: true, }, diff --git a/assets/js/base/hooks/use-typography-props.ts b/assets/js/base/hooks/use-typography-props.ts index 9cdce8fde30..1255fc00eb5 100644 --- a/assets/js/base/hooks/use-typography-props.ts +++ b/assets/js/base/hooks/use-typography-props.ts @@ -23,6 +23,7 @@ export const useTypographyProps = ( attributes: unknown ): WithStyle => { : typography.fontSize, lineHeight: typography.lineHeight, fontWeight: typography.fontWeight, + fontStyle: typography.fontStyle, textTransform: typography.textTransform, fontFamily: attributesObject.fontFamily, }, diff --git a/src/BlockTypes/ProductButton.php b/src/BlockTypes/ProductButton.php index ca7e2dc29cb..96842f78697 100644 --- a/src/BlockTypes/ProductButton.php +++ b/src/BlockTypes/ProductButton.php @@ -88,7 +88,7 @@ protected function render( $attributes, $content, $block ) { if ( $product ) { $cart_redirect_after_add = get_option( 'woocommerce_cart_redirect_after_add' ) === 'yes'; $html_element = ( ! $product->has_options() && $product->is_purchasable() && $product->is_in_stock() && ! $cart_redirect_after_add ) ? 'button' : 'a'; - $styles_and_classes = StyleAttributesUtils::get_classes_and_styles_by_attributes( $attributes, array( 'border_radius', 'font_size', 'text_color' ) ); + $styles_and_classes = StyleAttributesUtils::get_classes_and_styles_by_attributes( $attributes, array( 'border_radius', 'font_size', 'font_weight', 'padding', 'text_color' ) ); $text_align_styles_and_classes = StyleAttributesUtils::get_text_align_class_and_style( $attributes ); return apply_filters( diff --git a/src/BlockTypes/ProductPrice.php b/src/BlockTypes/ProductPrice.php index a4444b3540e..43a8ca7fe60 100644 --- a/src/BlockTypes/ProductPrice.php +++ b/src/BlockTypes/ProductPrice.php @@ -82,13 +82,16 @@ protected function render( $attributes, $content, $block ) { $product = wc_get_product( $post_id ); if ( $product ) { - $classes_and_styles = StyleAttributesUtils::get_text_align_class_and_style( $attributes ); + $styles_and_classes = StyleAttributesUtils::get_classes_and_styles_by_attributes( $attributes, array( 'font_size', 'font_weight', 'font_style', 'text_color', 'background_color' ) ); + $text_align_styles_and_classes = StyleAttributesUtils::get_text_align_class_and_style( $attributes ); return sprintf( - '