From b416c09b96c4ffa178850e9e9697950d9eb855fc Mon Sep 17 00:00:00 2001
From: shenjunjian <40288193@qq.com>
Date: Mon, 21 Oct 2024 19:47:34 -0700
Subject: [PATCH] fix(button): solve the problem of uneven button graphics when
 mixing

---
 packages/theme/src/button/index.less |  9 ++++-----
 packages/theme/src/modal/index.less  | 11 ++++++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/theme/src/button/index.less b/packages/theme/src/button/index.less
index 778afc0297..e7c186bb4f 100644
--- a/packages/theme/src/button/index.less
+++ b/packages/theme/src/button/index.less
@@ -343,12 +343,15 @@
 
   // 混排有边框： 图标大小随文字即可，只添加中间的margin
   &.is-icon {
+    display: inline-flex;
+    align-items: center;
+
     .tiny-svg {
       margin-right: var(--tv-Button-margin-right-isicon-svg);
     }
   }
 
-  // 混排无边框： 设计稿的margin2.5不合适， 统一4px吧。
+  // 混排无边框： 注意，这里会默认混入了 【混排有边框】的样式
   &.@{button-prefix-cls}--text.is-icon {
     border: none;
     border-radius: 0;
@@ -363,10 +366,6 @@
       text-decoration: underline;
     }
 
-    .tiny-svg {
-      margin-right: var(--tv-Button-margin-right-isicon-svg);
-    }
-
     &.is-disabled.is-disabled.is-disabled.is-disabled,
     &.is-loading.is-loading.is-loading.is-loading,
     &[disabled][disabled][disabled][disabled][disabled][disabled] {
diff --git a/packages/theme/src/modal/index.less b/packages/theme/src/modal/index.less
index 709150e8ee..b94acc16f3 100644
--- a/packages/theme/src/modal/index.less
+++ b/packages/theme/src/modal/index.less
@@ -110,9 +110,14 @@
           white-space: normal;
           word-break: break-word;
 
-          .@{modal-prefix-cls}__text {
-            font-size: var(--tv-Modal-box-body-text-font-size);
-            color: var(--tv-Modal-box-body-text-text-color);
+          .@{modal-prefix-cls}__content {
+            width: 100%;
+            flex-grow: 1;
+
+            .@{modal-prefix-cls}__text {
+              font-size: var(--tv-Modal-box-body-text-font-size);
+              color: var(--tv-Modal-box-body-text-text-color);
+            }
           }
         }