Skip to content
This repository has been archived by the owner on Feb 23, 2024. It is now read-only.

Product Gallery: Lock the Sale Badge and the Next/Prev Buttons #10869

Merged
merged 31 commits into from
Sep 11, 2023
Merged
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
564ed00
Fix "On sale" badge class for shop
albarin Aug 17, 2023
c5c867e
Add class to sale badge
albarin Aug 17, 2023
5432433
Merge branch 'trunk' into fix-sale-css-selector
albarin Aug 17, 2023
1315edb
erge branch 'trunk' of https://github.com/woocommerce/woocommerce-blo…
danieldudzic Aug 17, 2023
63456a4
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Aug 18, 2023
c174af9
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Aug 21, 2023
adaee4f
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Aug 21, 2023
ef4d5ad
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Aug 22, 2023
db2e25a
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Aug 23, 2023
30db083
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Aug 23, 2023
a072b87
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Aug 24, 2023
3131fd0
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Aug 24, 2023
f6b5a13
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Aug 25, 2023
b3050df
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Aug 25, 2023
9c28d71
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Aug 28, 2023
e48dce0
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Aug 28, 2023
59a04df
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Aug 29, 2023
941f76f
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Aug 30, 2023
b399807
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Aug 31, 2023
685a884
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Sep 1, 2023
ca01de3
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Sep 1, 2023
e88fef3
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Sep 1, 2023
81f2a05
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Sep 5, 2023
2d4011e
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Sep 5, 2023
83c1cdf
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Sep 5, 2023
d26008c
Apply styleProps.styles to elements using them
tjcafferkey Sep 6, 2023
d48736d
Merge branch 'update/product-image-to-use-styles' of https://github.c…
danieldudzic Sep 6, 2023
901bfac
Merge branch 'trunk' of https://github.com/woocommerce/woocommerce-bl…
danieldudzic Sep 7, 2023
316b82c
Product Gallery: Lock the Sale Badge and the Next/Prev Buttons
danieldudzic Sep 7, 2023
1af0317
Merge branch 'trunk' into fix/10868-product-gallery-sale-badge-lock
danieldudzic Sep 8, 2023
06410e9
Merge branch 'trunk' into fix/10868-product-gallery-sale-badge-lock
danieldudzic Sep 11, 2023
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: 2 additions & 0 deletions assets/js/blocks/product-gallery/edit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ const TEMPLATE: InnerBlockTemplate[] = [
},
},
},
lock: { move: true },
},
],
[
Expand All @@ -70,6 +71,7 @@ const TEMPLATE: InnerBlockTemplate[] = [
type: 'flex',
verticalAlignment: 'bottom',
},
lock: { move: true, remove: true },
danieldudzic marked this conversation as resolved.
Show resolved Hide resolved
},
],
],
Expand Down