From d7e7d86aeb68edb776da93cae1b90921af7191d2 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Fri, 21 Mar 2025 15:23:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(badge):=20=E8=A7=A3=E5=86=B3=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E5=81=8F=E4=B8=8A=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/badge/badge.scss | 11 +++-------- src/styles/variables.scss | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/packages/badge/badge.scss b/src/packages/badge/badge.scss index 5f904fd2f7..37ae9f41ed 100644 --- a/src/packages/badge/badge.scss +++ b/src/packages/badge/badge.scss @@ -1,6 +1,8 @@ .nut-badge { position: relative; display: inline-flex; + vertical-align: middle; + box-sizing: content-box; width: auto; &-icon { @@ -37,8 +39,7 @@ &-sup { display: inline-flex; - justify-content: center; - height: $badge-height; + text-align: center; min-width: $badge-min-width; padding: $badge-padding; box-sizing: border-box; @@ -54,12 +55,6 @@ &-number { font-family: 'JD'; - /* #ifdef harmony */ - line-height: 12px; - /* #endif */ - /* #ifndef harmony */ - line-height: 13px; - /* #endif */ } &-one { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 3276b5699d..c8fe50c1eb 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1616,7 +1616,7 @@ $badge-background-color: var( $color-primary ) !default; $badge-color: var(--nutui-badge-color, $color-primary-text) !default; -$badge-font-size: var(--nutui-badge-font-size, $font-size-xxs) !default; +$badge-font-size: var(--nutui-badge-font-size, 9px) !default; $badge-border: var( --nutui-badge-border, 1px solid $color-primary-text From 532e0e187236ba9507f093e6749e4ef19eaf9393 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Fri, 21 Mar 2025 18:22:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20css=20=E5=8F=98=E9=87=8F=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/theme-dark.scss | 2 ++ src/styles/theme-default.scss | 2 ++ src/styles/variables.scss | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/styles/theme-dark.scss b/src/styles/theme-dark.scss index fc2d1e52dc..ee7ac42279 100644 --- a/src/styles/theme-dark.scss +++ b/src/styles/theme-dark.scss @@ -215,6 +215,8 @@ page { --nutui-font-size-26: 26px; // 字号语义化 + // 徽标文字 + --nutui-font-size-xxxs: var(--nutui-font-size-9); // 标签内文字 --nutui-font-size-xxs: var(--nutui-font-size-10); // 导购或信息密集的次要内容、辅助信息 diff --git a/src/styles/theme-default.scss b/src/styles/theme-default.scss index d1e9ee607d..a80bd66250 100644 --- a/src/styles/theme-default.scss +++ b/src/styles/theme-default.scss @@ -214,6 +214,8 @@ page { --nutui-font-size-26: 26px; // 字号语义化 + // 徽标文字 + --nutui-font-size-xxxs: var(--nutui-font-size-9); // 标签内文字 --nutui-font-size-xxs: var(--nutui-font-size-10); // 导购或信息密集的次要内容、辅助信息 diff --git a/src/styles/variables.scss b/src/styles/variables.scss index c8fe50c1eb..c4e9d80d8d 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -147,6 +147,7 @@ $font-family: sans-serif !default; // Font +$font-size-xxxs: var(--nutui-font-size-xxxs, 9px) !default; $font-size-xxs: var(--nutui-font-size-xxs, 10px) !default; $font-size-xs: var(--nutui-font-size-xs, 11px) !default; $font-size-s: var(--nutui-font-size-s, 12px) !default; @@ -1616,7 +1617,7 @@ $badge-background-color: var( $color-primary ) !default; $badge-color: var(--nutui-badge-color, $color-primary-text) !default; -$badge-font-size: var(--nutui-badge-font-size, 9px) !default; +$badge-font-size: var(--nutui-badge-font-size, $font-size-xxxs) !default; $badge-border: var( --nutui-badge-border, 1px solid $color-primary-text From 65ea605d4dfd5722542446e5111b200791237237 Mon Sep 17 00:00:00 2001 From: oasis Date: Fri, 21 Mar 2025 19:10:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=A2=9E=E8=A1=A5=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/variables-jmapp.scss | 1 + src/styles/variables-jrkf.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/src/styles/variables-jmapp.scss b/src/styles/variables-jmapp.scss index 4a602b1358..1a2c5ac9fb 100644 --- a/src/styles/variables-jmapp.scss +++ b/src/styles/variables-jmapp.scss @@ -174,6 +174,7 @@ $font-family: sans-serif !default; // Font +$font-size-xxxs: var(--nutui-font-size-xxxs, 9px) !default; $font-size-xxs: $font-text-mini !default; $font-size-xs: $font-text-xs !default; $font-size-s: $font-text-small !default; diff --git a/src/styles/variables-jrkf.scss b/src/styles/variables-jrkf.scss index 44b4b0f0bb..41eb24a9b1 100644 --- a/src/styles/variables-jrkf.scss +++ b/src/styles/variables-jrkf.scss @@ -190,6 +190,7 @@ $font-family: sans-serif !default; // Font +$font-size-xxxs: var(--nutui-font-size-xxxs, 9px) !default; $font-size-xxs: $font-text-mini !default; $font-size-xs: $font-text-xs !default; $font-size-s: $font-text-small !default;