From 9a93041e38013d32d390adc2223a6e92bd1bb123 Mon Sep 17 00:00:00 2001 From: MeloHG <2580757+qifeng0748@users.noreply.github.com> Date: Thu, 7 Mar 2024 16:57:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E4=BC=98=E5=85=88=E4=BD=BF=E7=94=A8=20`DIDIFD-Medium`=20?= =?UTF-8?q?=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.en-US.md | 8 ++++++++ CHANGELOG.md | 8 ++++++++ package.json | 2 +- quick-start.en-US.md | 2 +- quick-start.md | 2 +- src/assets/stylus/app.styl | 2 ++ src/packages/amount/README.en-US.md | 2 +- src/packages/amount/README.md | 2 +- src/packages/progress/demo/demo0.vue | 2 +- src/packages/progress/demo/demo1.vue | 2 +- src/packages/scroll-view/demo/demo0.vue | 2 +- src/packages/water-mark/use-water-mark.ts | 2 +- src/pages/index.vue | 10 +++++----- src/styles/fonts.styl | 3 +++ src/styles/index.styl | 1 + src/styles/variable.styl | 2 +- src/styles/vars.styl | 2 +- 17 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 src/styles/fonts.styl diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 23070d749..bddbd6095 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -1,5 +1,13 @@ # Changelog +### 0.0.1-alpha.15 + +`2024-03-07` + +- Design + - 🍭 Financial design specification update + - Update numbers using `DIDIFD-Medium` font first + ### 0.0.1-alpha.13 `2021-08-28` diff --git a/CHANGELOG.md b/CHANGELOG.md index de1bd4f41..eed473c8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # 更新日志 +### 0.0.1-alpha.15 + +`2024-03-07` + +- Design + - 🍭金融设计规范更新 + - 更新数字优先使用 `DIDIFD-Medium` 字体 + ### 0.0.1-alpha.13 `2021-08-28` diff --git a/package.json b/package.json index bb17b214f..8d4486f1c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mand-mobile-next", - "version": "0.0.1-alpha.14", + "version": "0.0.1-alpha.15", "engines": { "node": ">=14.16.1" }, diff --git a/quick-start.en-US.md b/quick-start.en-US.md index 4fa49e8a8..4c719e7d5 100644 --- a/quick-start.en-US.md +++ b/quick-start.en-US.md @@ -217,7 +217,7 @@ useCssVar(themeVars) /// Font family --md-font-family-normal : "Helvetica Neue",Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Microsoft Ya Black",Arial, sans-serif ---md-font-family-number : DINPro-Medium, DIN Alternate, "Helvetica Neue",Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", " Microsoft YaHei", Arial,sans-serif +--md-font-family-number : DIDIFD-Medium, "Helvetica Neue",Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", " Microsoft YaHei", Arial,sans-serif ``` #### component variables diff --git a/quick-start.md b/quick-start.md index 61a6fcfdd..cd4cb5ba4 100644 --- a/quick-start.md +++ b/quick-start.md @@ -217,7 +217,7 @@ useCssVar(themeVars) /// Font Family --md-font-family-normal : "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif ---md-font-family-number : DINPro-Medium, DIN Alternate, "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif +--md-font-family-number : DIDIFD-Medium, "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif ``` #### 组件变量 diff --git a/src/assets/stylus/app.styl b/src/assets/stylus/app.styl index dc4393928..fba0d6ce0 100644 --- a/src/assets/stylus/app.styl +++ b/src/assets/stylus/app.styl @@ -1,3 +1,5 @@ +@import '../../styles/fonts.styl' + * margin 0 padding 0 diff --git a/src/packages/amount/README.en-US.md b/src/packages/amount/README.en-US.md index d0527c7c5..0d6f5c739 100644 --- a/src/packages/amount/README.en-US.md +++ b/src/packages/amount/README.en-US.md @@ -19,7 +19,7 @@ Vue.createApp().component(Amount.name, Amount) ### Tips -The font `DINPro-Medium` is used in the component for the case show only, if necessary, reset `font-family` of `.md-amount`. +The font `DIDIFD-Medium` is used in the component for the case show only, if necessary, reset `font-family` of `.md-amount`. ### Code Examples diff --git a/src/packages/amount/README.md b/src/packages/amount/README.md index 4c05271d2..c4db7496f 100644 --- a/src/packages/amount/README.md +++ b/src/packages/amount/README.md @@ -18,7 +18,7 @@ Vue.createApp().component(Amount.name, Amount) ``` :::tip -组件中使用字体`DINPro-Medium`仅用于案例展示，如有必要可重置`.md-amount`的`font-family` +组件中使用字体`DIDIFD-Medium`仅用于案例展示，如有必要可重置`.md-amount`的`font-family` ::: ## 代码演示 diff --git a/src/packages/progress/demo/demo0.vue b/src/packages/progress/demo/demo0.vue index dd6e9d914..3b82e172a 100644 --- a/src/packages/progress/demo/demo0.vue +++ b/src/packages/progress/demo/demo0.vue @@ -31,5 +31,5 @@ import MdProgress from 'mand-mobile-next/progress' margin 0 10px .progress-value font-size 24px - font-family DINPro-Medium + font-family DIDIFD-Medium diff --git a/src/packages/progress/demo/demo1.vue b/src/packages/progress/demo/demo1.vue index 969b8c5c7..d215947fa 100644 --- a/src/packages/progress/demo/demo1.vue +++ b/src/packages/progress/demo/demo1.vue @@ -64,5 +64,5 @@ import MdProgress from 'mand-mobile-next/progress' margin 0 10px .progress-value font-size 24px - font-family DINPro-Medium + font-family DIDIFD-Medium diff --git a/src/packages/scroll-view/demo/demo0.vue b/src/packages/scroll-view/demo/demo0.vue index de49a7e6b..7bc8d3bcc 100644 --- a/src/packages/scroll-view/demo/demo0.vue +++ b/src/packages/scroll-view/demo/demo0.vue @@ -90,6 +90,6 @@ const pullingUpHandler = async () => { padding 30px 0 text-align center font-size 28px - font-family DINAlternate-Bold + font-family DIDIFD-Medium border-bottom .5px solid #efefef diff --git a/src/packages/water-mark/use-water-mark.ts b/src/packages/water-mark/use-water-mark.ts index adcb6db38..afec7feba 100644 --- a/src/packages/water-mark/use-water-mark.ts +++ b/src/packages/water-mark/use-water-mark.ts @@ -98,7 +98,7 @@ export const useWaterMark = ( ) if (canvasCtx.value) { - canvasCtx.value.font = `${fontSize}px DIN Alternate, "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif` + canvasCtx.value.font = `${fontSize}px DIDIFD-Medium, "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif` canvasCtx.value.fillStyle = FILL_COLOR let ctxX = 0 diff --git a/src/pages/index.vue b/src/pages/index.vue index 438113e5b..65b227a93 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -119,7 +119,7 @@ export default defineComponent({ align-items center font-size font-heading-large font-weight font-weight-normal - font-family DINAlternate-Bold + font-family DIDIFD-Medium color color-text-base span color color-text-base @@ -131,7 +131,7 @@ export default defineComponent({ font-size 0.12rem .md-cg-subtitle margin-bottom 30px - font-family DINAlternate-Bold + font-family DIDIFD-Medium font-size font-body-normal font-weight 300 color color-text-minor @@ -162,7 +162,7 @@ export default defineComponent({ padding 0 h-gap-lg line-height 120px font-size font-heading-normal - font-family DINAlternate-Bold + font-family DIDIFD-Medium // font-weight font-weight-medium color color-text-base box-sizing border-box @@ -220,7 +220,7 @@ export default defineComponent({ height 100px line-height 100px font-size font-body-normal - font-family DINAlternate-Bold + font-family DIDIFD-Medium color color-text-minor hairline(bottom, color-border-base) .md-icon @@ -244,7 +244,7 @@ export default defineComponent({ text-align center font-size font-minor-normal font-weight 300 - font-family DINAlternate-Bold + font-family DIDIFD-Medium color color-text-caption .slide-fade-enter-active diff --git a/src/styles/fonts.styl b/src/styles/fonts.styl new file mode 100644 index 000000000..7d691f379 --- /dev/null +++ b/src/styles/fonts.styl @@ -0,0 +1,3 @@ +@font-face + font-family 'DIDIFD-Medium' + src url('data:font/ttf;charset=utf-8;base64,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') format('truetype') diff --git a/src/styles/index.styl b/src/styles/index.styl index af075d0e3..4e9d8cd8d 100644 --- a/src/styles/index.styl +++ b/src/styles/index.styl @@ -1,3 +1,4 @@ +@import './fonts.styl' @import './variable.styl' @import './util.styl' @import './theme.component.styl' diff --git a/src/styles/variable.styl b/src/styles/variable.styl index 474902632..eca1ab20c 100644 --- a/src/styles/variable.styl +++ b/src/styles/variable.styl @@ -67,7 +67,7 @@ opacity-disabled = .3 // opacity of disabled button, switch, agree /// Font Family font-family-normal = "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif -font-family-number = DINPro-Medium, DIN Alternate, "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif +font-family-number = DIDIFD-Medium, "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif /// Configration support-for-ie = false diff --git a/src/styles/vars.styl b/src/styles/vars.styl index efe81afc9..b49010666 100644 --- a/src/styles/vars.styl +++ b/src/styles/vars.styl @@ -71,4 +71,4 @@ /// Font Family --md-font-family-normal : "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif - --md-font-family-number : DINPro-Medium, DIN Alternate, "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif + --md-font-family-number : DIDIFD-Medium, "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif