Skip to content

Commit b704066

Browse files
authored
fix(button): solve the problem of uneven button graphics when mixing (#2347)
1 parent be9eff9 commit b704066

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

packages/theme/src/button/index.less

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -343,12 +343,15 @@
343343

344344
// 混排有边框: 图标大小随文字即可,只添加中间的margin
345345
&.is-icon {
346+
display: inline-flex;
347+
align-items: center;
348+
346349
.tiny-svg {
347350
margin-right: var(--tv-Button-margin-right-isicon-svg);
348351
}
349352
}
350353

351-
// 混排无边框: 设计稿的margin2.5不合适, 统一4px吧。
354+
// 混排无边框: 注意,这里会默认混入了 【混排有边框】的样式
352355
&.@{button-prefix-cls}--text.is-icon {
353356
border: none;
354357
border-radius: 0;
@@ -363,10 +366,6 @@
363366
text-decoration: underline;
364367
}
365368

366-
.tiny-svg {
367-
margin-right: var(--tv-Button-margin-right-isicon-svg);
368-
}
369-
370369
&.is-disabled.is-disabled.is-disabled.is-disabled,
371370
&.is-loading.is-loading.is-loading.is-loading,
372371
&[disabled][disabled][disabled][disabled][disabled][disabled] {

packages/theme/src/modal/index.less

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,14 @@
110110
white-space: normal;
111111
word-break: break-word;
112112

113-
.@{modal-prefix-cls}__text {
114-
font-size: var(--tv-Modal-box-body-text-font-size);
115-
color: var(--tv-Modal-box-body-text-text-color);
113+
.@{modal-prefix-cls}__content {
114+
width: 100%;
115+
flex-grow: 1;
116+
117+
.@{modal-prefix-cls}__text {
118+
font-size: var(--tv-Modal-box-body-text-font-size);
119+
color: var(--tv-Modal-box-body-text-text-color);
120+
}
116121
}
117122
}
118123

0 commit comments

Comments
 (0)