Skip to content

Commit 464f0a9

Browse files
fix(badge): 解决中文偏上问题 (#3111)
* fix(badge): 解决中文偏上问题 * fix: css 变量更新 * fix: 增补变量 --------- Co-authored-by: oasis <suanbanren@foxmail.com>
1 parent 8e1468c commit 464f0a9

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed

src/packages/badge/badge.scss

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
.nut-badge {
22
position: relative;
33
display: inline-flex;
4+
vertical-align: middle;
5+
box-sizing: content-box;
46
width: auto;
57

68
&-icon {
@@ -37,8 +39,7 @@
3739

3840
&-sup {
3941
display: inline-flex;
40-
justify-content: center;
41-
height: $badge-height;
42+
text-align: center;
4243
min-width: $badge-min-width;
4344
padding: $badge-padding;
4445
box-sizing: border-box;
@@ -54,12 +55,6 @@
5455

5556
&-number {
5657
font-family: 'JD';
57-
/* #ifdef harmony */
58-
line-height: 12px;
59-
/* #endif */
60-
/* #ifndef harmony */
61-
line-height: 13px;
62-
/* #endif */
6358
}
6459

6560
&-one {

src/styles/theme-dark.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,8 @@ page {
215215
--nutui-font-size-26: 26px;
216216

217217
// 字号语义化
218+
// 徽标文字
219+
--nutui-font-size-xxxs: var(--nutui-font-size-9);
218220
// 标签内文字
219221
--nutui-font-size-xxs: var(--nutui-font-size-10);
220222
// 导购或信息密集的次要内容、辅助信息

src/styles/theme-default.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,8 @@ page {
214214
--nutui-font-size-26: 26px;
215215

216216
// 字号语义化
217+
// 徽标文字
218+
--nutui-font-size-xxxs: var(--nutui-font-size-9);
217219
// 标签内文字
218220
--nutui-font-size-xxs: var(--nutui-font-size-10);
219221
// 导购或信息密集的次要内容、辅助信息

src/styles/variables-jmapp.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ $font-family:
174174
sans-serif !default;
175175

176176
// Font
177+
$font-size-xxxs: var(--nutui-font-size-xxxs, 9px) !default;
177178
$font-size-xxs: $font-text-mini !default;
178179
$font-size-xs: $font-text-xs !default;
179180
$font-size-s: $font-text-small !default;

src/styles/variables-jrkf.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ $font-family:
190190
sans-serif !default;
191191

192192
// Font
193+
$font-size-xxxs: var(--nutui-font-size-xxxs, 9px) !default;
193194
$font-size-xxs: $font-text-mini !default;
194195
$font-size-xs: $font-text-xs !default;
195196
$font-size-s: $font-text-small !default;

src/styles/variables.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ $font-family:
147147
sans-serif !default;
148148

149149
// Font
150+
$font-size-xxxs: var(--nutui-font-size-xxxs, 9px) !default;
150151
$font-size-xxs: var(--nutui-font-size-xxs, 10px) !default;
151152
$font-size-xs: var(--nutui-font-size-xs, 11px) !default;
152153
$font-size-s: var(--nutui-font-size-s, 12px) !default;
@@ -1616,7 +1617,7 @@ $badge-background-color: var(
16161617
$color-primary
16171618
) !default;
16181619
$badge-color: var(--nutui-badge-color, $color-primary-text) !default;
1619-
$badge-font-size: var(--nutui-badge-font-size, $font-size-xxs) !default;
1620+
$badge-font-size: var(--nutui-badge-font-size, $font-size-xxxs) !default;
16201621
$badge-border: var(
16211622
--nutui-badge-border,
16221623
1px solid $color-primary-text

0 commit comments

Comments
 (0)