diff --git a/components.d.ts b/components.d.ts index 43ea738..751269f 100644 --- a/components.d.ts +++ b/components.d.ts @@ -15,13 +15,16 @@ declare module 'vue' { AInputPassword: typeof import('ant-design-vue/es')['InputPassword'] AModal: typeof import('ant-design-vue/es')['Modal'] AppCreditLink: typeof import('./src/components/AppCreditLink.vue')['default'] + ARadio: typeof import('ant-design-vue/es')['Radio'] ARadioButton: typeof import('ant-design-vue/es')['RadioButton'] ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup'] ASelect: typeof import('ant-design-vue/es')['Select'] ASelectOption: typeof import('ant-design-vue/es')['SelectOption'] ASlider: typeof import('ant-design-vue/es')['Slider'] ASpin: typeof import('ant-design-vue/es')['Spin'] + ASwitch: typeof import('ant-design-vue/es')['Switch'] ATag: typeof import('ant-design-vue/es')['Tag'] + ATextarea: typeof import('ant-design-vue/es')['Textarea'] ATooltip: typeof import('ant-design-vue/es')['Tooltip'] BaseDatePicker: typeof import('./src/components/BasicPacks/BaseDatePicker/src/BaseDatePicker.vue')['default'] Basic: typeof import('./src/components/BasicPacks/BaseDatePicker/src/datePick/demo/basic.vue')['default'] @@ -67,5 +70,6 @@ declare module 'vue' { TransactionSkeleton: typeof import('./src/components/TransactionSkeleton.vue')['default'] VanActionSheet: typeof import('vant/es')['ActionSheet'] VanDialog: typeof import('vant/es')['Dialog'] + VanField: typeof import('vant/es')['Field'] } } diff --git a/src/assets/css/fonts.less b/src/assets/css/fonts.less index 4a60221..fb100bc 100644 --- a/src/assets/css/fonts.less +++ b/src/assets/css/fonts.less @@ -1,86 +1,110 @@ @import (less) './var.less'; +/** + * Dana Pro (FaNum) — اعداد فارسی + * منبع: DanaPro Webfonts / Farsi numerals + */ + @font-face { - font-family: @prefixCls-font-family; - src: url("../fonts/iranSans/woff2/IRANSansWeb(FaNum).woff2") format("woff2"); - font-weight: normal; + font-family: dana; font-style: normal; + font-weight: 10; + src: url('../fonts/Dana/woff2/DanaFaNum-Hairline.woff2') format('woff2'), + url('../fonts/Dana/woff/DanaFaNum-Hairline.woff') format('woff'); } @font-face { - font-family: @prefixCls-font-family; - src: url("../fonts/iranSans/woff2/IRANSansWeb(FaNum)_Light.woff2") format("woff2"); + font-family: dana; + font-style: normal; font-weight: 100; - font-style: normal; + src: url('../fonts/Dana/woff2/DanaFaNum-Thin.woff2') format('woff2'), + url('../fonts/Dana/woff/DanaFaNum-Thin.woff') format('woff'); } @font-face { - font-family: @prefixCls-font-family; - src: url("../fonts/iranSans/woff2/IRANSansWeb(FaNum)_UltraLight.woff2") format("woff2"); + font-family: dana; + font-style: normal; + font-weight: 200; + src: url('../fonts/Dana/woff2/DanaFaNum-UltraLight.woff2') format('woff2'), + url('../fonts/Dana/woff/DanaFaNum-UltraLight.woff') format('woff'); +} + +@font-face { + font-family: dana; + font-style: normal; font-weight: 300; - font-style: normal; + src: url('../fonts/Dana/woff2/DanaFaNum-Light.woff2') format('woff2'), + url('../fonts/Dana/woff/DanaFaNum-Light.woff') format('woff'); } @font-face { - font-family: @prefixCls-font-family; - src: url("../fonts/iranSans/woff2/IRANSansWeb(FaNum)_Medium.woff2") format("woff2"); - font-weight: 500; + font-family: dana; font-style: normal; -} - -@font-face { - font-family: @prefixCls-font-family; - src: url("../fonts/iranSans/woff2/IRANSansWeb(FaNum)_Bold.woff2") format("woff2"); - font-weight: 700; - font-style: normal; -} - -@font-face { - font-family: @prefixCls-font-family; - src: url("../fonts/iranSans/woff2/IRANSansWeb(FaNum)_Black.woff2") format("woff2"); - font-weight: 900; - font-style: normal; -} - -@font-face { - font-family: 'dana'; - src: url("../fonts/Dana/Dana-Regular.ttf") format("truetype"); font-weight: 400; - font-style: normal; + src: url('../fonts/Dana/woff2/DanaFaNum-Regular.woff2') format('woff2'), + url('../fonts/Dana/woff/DanaFaNum-Regular.woff') format('woff'); } @font-face { - font-family: 'dana'; - src: url("../fonts/Dana/Dana-Light.ttf") format("truetype"); - font-weight: 300; + font-family: dana; font-style: normal; -} - -@font-face { - font-family: 'dana'; - src: url("../fonts/Dana/Dana-Medium.ttf") format("truetype"); font-weight: 500; - font-style: normal; + src: url('../fonts/Dana/woff2/DanaFaNum-Medium.woff2') format('woff2'), + url('../fonts/Dana/woff/DanaFaNum-Medium.woff') format('woff'); } @font-face { - font-family: 'dana'; - src: url("../fonts/Dana/Dana-DemiBold.ttf") format("truetype"); + font-family: dana; + font-style: normal; font-weight: 600; - font-style: normal; + src: url('../fonts/Dana/woff2/DanaFaNum-DemiBold.woff2') format('woff2'), + url('../fonts/Dana/woff/DanaFaNum-DemiBold.woff') format('woff'); } @font-face { - font-family: 'dana'; - src: url("../fonts/Dana/Dana-Bold.ttf") format("truetype"); + font-family: dana; + font-style: normal; font-weight: 700; - font-style: normal; + src: url('../fonts/Dana/woff2/DanaFaNum-Bold.woff2') format('woff2'), + url('../fonts/Dana/woff/DanaFaNum-Bold.woff') format('woff'); } @font-face { - font-family: 'dana'; - src: url("../fonts/Dana/Dana-Black.ttf") format("truetype"); - font-weight: 900; + font-family: dana; font-style: normal; + font-weight: 800; + src: url('../fonts/Dana/woff2/DanaFaNum-ExtraBold.woff2') format('woff2'), + url('../fonts/Dana/woff/DanaFaNum-ExtraBold.woff') format('woff'); } +@font-face { + font-family: dana; + font-style: normal; + font-weight: 900; + src: url('../fonts/Dana/woff2/DanaFaNum-Black.woff2') format('woff2'), + url('../fonts/Dana/woff/DanaFaNum-Black.woff') format('woff'); +} + +@font-face { + font-family: dana; + font-style: normal; + font-weight: 930; + src: url('../fonts/Dana/woff2/DanaFaNum-ExtraBlack.woff2') format('woff2'), + url('../fonts/Dana/woff/DanaFaNum-ExtraBlack.woff') format('woff'); +} + +@font-face { + font-family: dana; + font-style: normal; + font-weight: 960; + src: url('../fonts/Dana/woff2/DanaFaNum-Heavy.woff2') format('woff2'), + url('../fonts/Dana/woff/DanaFaNum-Heavy.woff') format('woff'); +} + +@font-face { + font-family: dana; + font-style: normal; + font-weight: 990; + src: url('../fonts/Dana/woff2/DanaFaNum-fat.woff2') format('woff2'), + url('../fonts/Dana/woff/DanaFaNum-fat.woff') format('woff'); +} diff --git a/src/assets/css/var.less b/src/assets/css/var.less index 9aca3ca..97aee86 100644 --- a/src/assets/css/var.less +++ b/src/assets/css/var.less @@ -2,7 +2,7 @@ @App-primary-color: var(--App-primary-color); @secondary-color: var(--App-secondary-color); -@prefixCls-font-family: 'iran-sans'; +@prefixCls-font-family: 'dana'; @prefixCls-background-color: var(--App-background-color); @border-radius-base: 8px; @@ -10,5 +10,5 @@ --App-primary-color: #0A1B37; --App-secondary-color: #e0be7f; --App-background-color: #ffffff; - --App-font-family: 'iran-sans', sans-serif; + --App-font-family: 'dana', sans-serif; } \ No newline at end of file diff --git a/src/assets/fonts/Dana/Dana-Black.ttf b/src/assets/fonts/Dana/Dana-Black.ttf deleted file mode 100644 index 09128c5..0000000 Binary files a/src/assets/fonts/Dana/Dana-Black.ttf and /dev/null differ diff --git a/src/assets/fonts/Dana/Dana-Bold.ttf b/src/assets/fonts/Dana/Dana-Bold.ttf deleted file mode 100644 index 57013c7..0000000 Binary files a/src/assets/fonts/Dana/Dana-Bold.ttf and /dev/null differ diff --git a/src/assets/fonts/Dana/Dana-DemiBold.ttf b/src/assets/fonts/Dana/Dana-DemiBold.ttf deleted file mode 100644 index 1c7d1de..0000000 Binary files a/src/assets/fonts/Dana/Dana-DemiBold.ttf and /dev/null differ diff --git a/src/assets/fonts/Dana/Dana-ExtraBold.ttf b/src/assets/fonts/Dana/Dana-ExtraBold.ttf deleted file mode 100644 index 32aa27b..0000000 Binary files a/src/assets/fonts/Dana/Dana-ExtraBold.ttf and /dev/null differ diff --git a/src/assets/fonts/Dana/Dana-ExtraLight.ttf b/src/assets/fonts/Dana/Dana-ExtraLight.ttf deleted file mode 100644 index 435016f..0000000 Binary files a/src/assets/fonts/Dana/Dana-ExtraLight.ttf and /dev/null differ diff --git a/src/assets/fonts/Dana/Dana-Light.ttf b/src/assets/fonts/Dana/Dana-Light.ttf deleted file mode 100644 index 6ab3d11..0000000 Binary files a/src/assets/fonts/Dana/Dana-Light.ttf and /dev/null differ diff --git a/src/assets/fonts/Dana/Dana-Medium.ttf b/src/assets/fonts/Dana/Dana-Medium.ttf deleted file mode 100644 index 75fda24..0000000 Binary files a/src/assets/fonts/Dana/Dana-Medium.ttf and /dev/null differ diff --git a/src/assets/fonts/Dana/Dana-Regular.ttf b/src/assets/fonts/Dana/Dana-Regular.ttf deleted file mode 100644 index 93200a1..0000000 Binary files a/src/assets/fonts/Dana/Dana-Regular.ttf and /dev/null differ diff --git a/src/assets/fonts/Dana/Dana-Thin.ttf b/src/assets/fonts/Dana/Dana-Thin.ttf deleted file mode 100644 index a958703..0000000 Binary files a/src/assets/fonts/Dana/Dana-Thin.ttf and /dev/null differ diff --git a/src/assets/fonts/Dana/Dana-UltraBold.ttf b/src/assets/fonts/Dana/Dana-UltraBold.ttf deleted file mode 100644 index c5bd1b2..0000000 Binary files a/src/assets/fonts/Dana/Dana-UltraBold.ttf and /dev/null differ diff --git a/src/assets/fonts/Dana/woff/DanaFaNum-Black.woff b/src/assets/fonts/Dana/woff/DanaFaNum-Black.woff new file mode 100644 index 0000000..7ea38f6 Binary files /dev/null and b/src/assets/fonts/Dana/woff/DanaFaNum-Black.woff differ diff --git a/src/assets/fonts/Dana/woff/DanaFaNum-Bold.woff b/src/assets/fonts/Dana/woff/DanaFaNum-Bold.woff new file mode 100644 index 0000000..9edec21 Binary files /dev/null and b/src/assets/fonts/Dana/woff/DanaFaNum-Bold.woff differ diff --git a/src/assets/fonts/Dana/woff/DanaFaNum-DemiBold.woff b/src/assets/fonts/Dana/woff/DanaFaNum-DemiBold.woff new file mode 100644 index 0000000..f32d826 Binary files /dev/null and b/src/assets/fonts/Dana/woff/DanaFaNum-DemiBold.woff differ diff --git a/src/assets/fonts/Dana/woff/DanaFaNum-ExtraBlack.woff b/src/assets/fonts/Dana/woff/DanaFaNum-ExtraBlack.woff new file mode 100644 index 0000000..4dc78a9 Binary files /dev/null and b/src/assets/fonts/Dana/woff/DanaFaNum-ExtraBlack.woff differ diff --git a/src/assets/fonts/Dana/woff/DanaFaNum-ExtraBold.woff b/src/assets/fonts/Dana/woff/DanaFaNum-ExtraBold.woff new file mode 100644 index 0000000..63077e4 Binary files /dev/null and b/src/assets/fonts/Dana/woff/DanaFaNum-ExtraBold.woff differ diff --git a/src/assets/fonts/Dana/woff/DanaFaNum-Hairline.woff b/src/assets/fonts/Dana/woff/DanaFaNum-Hairline.woff new file mode 100644 index 0000000..e94d3dc Binary files /dev/null and b/src/assets/fonts/Dana/woff/DanaFaNum-Hairline.woff differ diff --git a/src/assets/fonts/Dana/woff/DanaFaNum-Heavy.woff b/src/assets/fonts/Dana/woff/DanaFaNum-Heavy.woff new file mode 100644 index 0000000..3981e3e Binary files /dev/null and b/src/assets/fonts/Dana/woff/DanaFaNum-Heavy.woff differ diff --git a/src/assets/fonts/Dana/woff/DanaFaNum-Light.woff b/src/assets/fonts/Dana/woff/DanaFaNum-Light.woff new file mode 100644 index 0000000..f757105 Binary files /dev/null and b/src/assets/fonts/Dana/woff/DanaFaNum-Light.woff differ diff --git a/src/assets/fonts/Dana/woff/DanaFaNum-Medium.woff b/src/assets/fonts/Dana/woff/DanaFaNum-Medium.woff new file mode 100644 index 0000000..8a4bcc3 Binary files /dev/null and b/src/assets/fonts/Dana/woff/DanaFaNum-Medium.woff differ diff --git a/src/assets/fonts/Dana/woff/DanaFaNum-Regular.woff b/src/assets/fonts/Dana/woff/DanaFaNum-Regular.woff new file mode 100644 index 0000000..ba215ae Binary files /dev/null and b/src/assets/fonts/Dana/woff/DanaFaNum-Regular.woff differ diff --git a/src/assets/fonts/Dana/woff/DanaFaNum-Thin.woff b/src/assets/fonts/Dana/woff/DanaFaNum-Thin.woff new file mode 100644 index 0000000..f74a9bf Binary files /dev/null and b/src/assets/fonts/Dana/woff/DanaFaNum-Thin.woff differ diff --git a/src/assets/fonts/Dana/woff/DanaFaNum-UltraLight.woff b/src/assets/fonts/Dana/woff/DanaFaNum-UltraLight.woff new file mode 100644 index 0000000..6927bd2 Binary files /dev/null and b/src/assets/fonts/Dana/woff/DanaFaNum-UltraLight.woff differ diff --git a/src/assets/fonts/Dana/woff/DanaFaNum-fat.woff b/src/assets/fonts/Dana/woff/DanaFaNum-fat.woff new file mode 100644 index 0000000..9434b40 Binary files /dev/null and b/src/assets/fonts/Dana/woff/DanaFaNum-fat.woff differ diff --git a/src/assets/fonts/Dana/woff2/DanaFaNum-Black.woff2 b/src/assets/fonts/Dana/woff2/DanaFaNum-Black.woff2 new file mode 100644 index 0000000..7389c50 Binary files /dev/null and b/src/assets/fonts/Dana/woff2/DanaFaNum-Black.woff2 differ diff --git a/src/assets/fonts/Dana/woff2/DanaFaNum-Bold.woff2 b/src/assets/fonts/Dana/woff2/DanaFaNum-Bold.woff2 new file mode 100644 index 0000000..d31799e Binary files /dev/null and b/src/assets/fonts/Dana/woff2/DanaFaNum-Bold.woff2 differ diff --git a/src/assets/fonts/Dana/woff2/DanaFaNum-DemiBold.woff2 b/src/assets/fonts/Dana/woff2/DanaFaNum-DemiBold.woff2 new file mode 100644 index 0000000..9ba6e10 Binary files /dev/null and b/src/assets/fonts/Dana/woff2/DanaFaNum-DemiBold.woff2 differ diff --git a/src/assets/fonts/Dana/woff2/DanaFaNum-ExtraBlack.woff2 b/src/assets/fonts/Dana/woff2/DanaFaNum-ExtraBlack.woff2 new file mode 100644 index 0000000..e824fd0 Binary files /dev/null and b/src/assets/fonts/Dana/woff2/DanaFaNum-ExtraBlack.woff2 differ diff --git a/src/assets/fonts/Dana/woff2/DanaFaNum-ExtraBold.woff2 b/src/assets/fonts/Dana/woff2/DanaFaNum-ExtraBold.woff2 new file mode 100644 index 0000000..456601d Binary files /dev/null and b/src/assets/fonts/Dana/woff2/DanaFaNum-ExtraBold.woff2 differ diff --git a/src/assets/fonts/Dana/woff2/DanaFaNum-Hairline.woff2 b/src/assets/fonts/Dana/woff2/DanaFaNum-Hairline.woff2 new file mode 100644 index 0000000..ad5aba7 Binary files /dev/null and b/src/assets/fonts/Dana/woff2/DanaFaNum-Hairline.woff2 differ diff --git a/src/assets/fonts/Dana/woff2/DanaFaNum-Heavy.woff2 b/src/assets/fonts/Dana/woff2/DanaFaNum-Heavy.woff2 new file mode 100644 index 0000000..2e7fab4 Binary files /dev/null and b/src/assets/fonts/Dana/woff2/DanaFaNum-Heavy.woff2 differ diff --git a/src/assets/fonts/Dana/woff2/DanaFaNum-Light.woff2 b/src/assets/fonts/Dana/woff2/DanaFaNum-Light.woff2 new file mode 100644 index 0000000..ebc3d85 Binary files /dev/null and b/src/assets/fonts/Dana/woff2/DanaFaNum-Light.woff2 differ diff --git a/src/assets/fonts/Dana/woff2/DanaFaNum-Medium.woff2 b/src/assets/fonts/Dana/woff2/DanaFaNum-Medium.woff2 new file mode 100644 index 0000000..15fe1e5 Binary files /dev/null and b/src/assets/fonts/Dana/woff2/DanaFaNum-Medium.woff2 differ diff --git a/src/assets/fonts/Dana/woff2/DanaFaNum-Regular.woff2 b/src/assets/fonts/Dana/woff2/DanaFaNum-Regular.woff2 new file mode 100644 index 0000000..36ae4a3 Binary files /dev/null and b/src/assets/fonts/Dana/woff2/DanaFaNum-Regular.woff2 differ diff --git a/src/assets/fonts/Dana/woff2/DanaFaNum-Thin.woff2 b/src/assets/fonts/Dana/woff2/DanaFaNum-Thin.woff2 new file mode 100644 index 0000000..6edb509 Binary files /dev/null and b/src/assets/fonts/Dana/woff2/DanaFaNum-Thin.woff2 differ diff --git a/src/assets/fonts/Dana/woff2/DanaFaNum-UltraLight.woff2 b/src/assets/fonts/Dana/woff2/DanaFaNum-UltraLight.woff2 new file mode 100644 index 0000000..677305b Binary files /dev/null and b/src/assets/fonts/Dana/woff2/DanaFaNum-UltraLight.woff2 differ diff --git a/src/assets/fonts/Dana/woff2/DanaFaNum-fat.woff2 b/src/assets/fonts/Dana/woff2/DanaFaNum-fat.woff2 new file mode 100644 index 0000000..47f167f Binary files /dev/null and b/src/assets/fonts/Dana/woff2/DanaFaNum-fat.woff2 differ