Merge branch 'release' into development

# Conflicts:
#	src/pages/shop/product/variant/[slug].jsx

1 files changed, 58 insertions, 0 deletions

diff --git a/src-migrate/modules/product-promo/styles/card.module.css b/src-migrate/modules/product-promo/styles/card.module.css
new file mode 100644
index 00000000..faa3b370
--- /dev/null
+++ b/src-migrate/modules/product-promo/styles/card.module.css
@@ -0,0 +1,58 @@
+.card {
+    @apply border border-gray_r-7
+        rounded-lg 
+        h-fit
+        py-3;
+}
+
+.title {
+    @apply font-semibold text-h-md;
+}
+
+.badgeType {
+    @apply p-2 flex gap-x-1.5 rounded-md border border-danger-500 text-danger-500;
+}
+
+.productSection {
+    @apply flex gap-x-2 overflow-x-auto overflow-y-hidden mt-4 min-h-[160px];
+}
+
+.priceSection {
+    @apply flex items-center justify-between mt-4;
+}
+
+.priceCol {
+    @apply flex flex-col gap-y-1;
+}
+
+.priceRow {
+    @apply flex gap-x-2 items-center;
+}
+
+.basePrice {
+    @apply line-through;
+}
+
+.savingAmt {
+    @apply text-success-600 font-medium;
+}
+
+.price {
+    @apply text-body-1 text-danger-600 font-medium;
+}
+
+.totalItems {
+    @apply text-gray_r-9;
+}
+
+@media only screen and (max-width: 384px) {
+    .basePrice {
+        @apply text-[13px];
+    }
+    .price{
+        @apply  text-[15px];
+    }
+    .totalItems{
+        @apply  text-[11px];
+    }
+  }
\ No newline at end of file