diff --git a/frontend/assets/css/fonts/morabba.css b/frontend/assets/css/fonts/morabba.css new file mode 100644 index 0000000..d609e04 --- /dev/null +++ b/frontend/assets/css/fonts/morabba.css @@ -0,0 +1,73 @@ +@layer base { + @font-face { + font-family: "Morabba"; + src: url("/fonts/Morabba/IRANYekanX-UltraLight.woff2"); + font-weight: 200; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "Morabba"; + src: url("/fonts/Morabba/Morabba-Light.woff2"); + font-weight: 300; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "Morabba"; + src: url("/fonts/Morabba/Morabba-Regular.woff2"); + font-weight: 400; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "Morabba"; + src: url("/fonts/Morabba/Morabba-Medium.woff2"); + font-weight: 500; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "Morabba"; + src: url("/fonts/Morabba/Morabba-SemiBold.woff2"); + font-weight: 600; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "Morabba"; + src: url("/fonts/Morabba/Morabba-Bold.woff2"); + font-weight: 700; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "Morabba"; + src: url("/fonts/Morabba/Morabba-ExtraBold.woff2"); + font-weight: 800; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "Morabba"; + src: url("/fonts/Morabba/Morabba-Black.woff2"); + font-weight: 900; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "Morabba"; + src: url("/fonts/Morabba/Morabba-Heavy.woff2"); + font-weight: 1000; + font-style: normal; + font-display: swap; + } +} \ No newline at end of file diff --git a/frontend/assets/css/fonts/yekan-bakh.css b/frontend/assets/css/fonts/yekan-bakh.css new file mode 100644 index 0000000..4705c50 --- /dev/null +++ b/frontend/assets/css/fonts/yekan-bakh.css @@ -0,0 +1,41 @@ +@layer base { + @font-face { + font-family: "YekanBakh"; + src: url("/fonts/YekanBakh/YekanBakh-Thin.woff"); + font-weight: 100; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "YekanBakh"; + src: url("/fonts/YekanBakh/YekanBakh-Light.woff"); + font-weight: 300; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "YekanBakh"; + src: url("/fonts/YekanBakh/YekanBakh-Regular.woff"); + font-weight: 400; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "YekanBakh"; + src: url("/fonts/YekanBakh/YekanBakh-SemiBold.woff"); + font-weight: 600; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "YekanBakh"; + src: url("/fonts/YekanBakh/YekanBakh-Bold.woff"); + font-weight: 700; + font-style: normal; + font-display: swap; + } +} \ No newline at end of file diff --git a/frontend/assets/css/other.utils.css b/frontend/assets/css/other.utils.css index a34b0b2..6302eb2 100644 --- a/frontend/assets/css/other.utils.css +++ b/frontend/assets/css/other.utils.css @@ -1,7 +1,7 @@ @utility persian-number { - -moz-font-feature-settings: "ss02"; - -webkit-font-feature-settings: "ss02"; - font-feature-settings: "ss02"; + -moz-font-feature-settings: "ss07"; + -webkit-font-feature-settings: "ss07"; + font-feature-settings: "ss07"; } @utility text-gradient { diff --git a/frontend/assets/css/tailwind.css b/frontend/assets/css/tailwind.css index f0426f4..9eff1e5 100644 --- a/frontend/assets/css/tailwind.css +++ b/frontend/assets/css/tailwind.css @@ -5,6 +5,8 @@ @import "./button.comp.css"; @import "./input.comp.css"; @import "./fonts/iran-yekan-x.css"; +@import "./fonts/morabba.css"; +@import "./fonts/yekan-bakh.css"; @theme { /* COLORS */ @@ -109,6 +111,8 @@ --font-inter: "Inter", sans-serif; --font-dmsans: "DM Sans", sans-serif; --font-iran-yekan-x: "IRANYekanXVF", "sans-serif"; + --font-yekan-bakh: "YekanBakh", "sans-serif"; + --font-morabba: "Morabba", "sans-serif"; /* BREAKPOINTS */ --breakpoint-3xl: 1700px; @@ -128,6 +132,7 @@ /* CONTAINER */ @utility container { + @apply mx-auto; padding-inline: 3rem; @screen xl { padding-inline: 5rem; diff --git a/frontend/assets/css/typo.utils.css b/frontend/assets/css/typo.utils.css index a8fa5c7..43e281a 100644 --- a/frontend/assets/css/typo.utils.css +++ b/frontend/assets/css/typo.utils.css @@ -1,35 +1,35 @@ /* TYPO HERO */ @utility typo-hero-1 { - @apply text-[96px] leading-[96px] font-bold ; + @apply text-[96px] leading-[96px] font-semibold ; } @utility typo-hero-2 { - @apply text-[72px] leading-[72px] font-bold ; + @apply text-[72px] leading-[72px] font-semibold ; } /* TYPE HEADING */ @utility typo-h-1 { - @apply text-[64px] leading-[72px] font-bold ; + @apply text-[64px] leading-[72px] font-semibold ; } @utility typo-h-2 { - @apply text-[56px] leading-[64px] font-bold ; + @apply text-[56px] leading-[64px] font-semibold ; } @utility typo-h-3 { - @apply text-[48px] leading-[56px] font-bold ; + @apply text-[48px] leading-[56px] font-semibold ; } @utility typo-h-4 { - @apply text-[40px] leading-[52px] font-bold ; + @apply text-[40px] leading-[52px] font-semibold ; } @utility typo-h-5 { - @apply text-[32px] leading-[40px] font-bold ; + @apply text-[32px] leading-[40px] font-semibold ; } @utility typo-h-6 { - @apply text-[24px] leading-[32px] font-bold ; + @apply text-[24px] leading-[32px] font-semibold ; } /* TYPE SUBHEADING */ diff --git a/frontend/components/global/product-detail/InfoCard.vue b/frontend/components/global/product-detail/InfoCard.vue index 6972e6e..9ed9cf1 100644 --- a/frontend/components/global/product-detail/InfoCard.vue +++ b/frontend/components/global/product-detail/InfoCard.vue @@ -9,12 +9,12 @@
- Pick up from Store - Usually ready in 2 hours + دریافت حضوری فروشگاه + معمولا طی ۲ ساعت اماده میشود
- Check availability at other stores + برسی موجودی در فروشگاه های دیگر \ No newline at end of file diff --git a/frontend/components/global/product-detail/Rating.vue b/frontend/components/global/product-detail/Rating.vue index 76ae042..ac204dd 100644 --- a/frontend/components/global/product-detail/Rating.vue +++ b/frontend/components/global/product-detail/Rating.vue @@ -4,9 +4,6 @@ \ No newline at end of file diff --git a/frontend/components/global/product-detail/RemainQuantity.vue b/frontend/components/global/product-detail/RemainQuantity.vue index 243a894..63318be 100644 --- a/frontend/components/global/product-detail/RemainQuantity.vue +++ b/frontend/components/global/product-detail/RemainQuantity.vue @@ -3,6 +3,7 @@ // types type Props = { + maxQuantity: number; quantity: number; } @@ -13,16 +14,19 @@ defineProps(); \ No newline at end of file diff --git a/frontend/components/global/product-detail/Share.vue b/frontend/components/global/product-detail/Share.vue index aa5afec..09f0a3d 100644 --- a/frontend/components/global/product-detail/Share.vue +++ b/frontend/components/global/product-detail/Share.vue @@ -1,7 +1,7 @@