feat(button): [button]Adapting to the SMB theme

opentiny · Sep 19, 2024 · ae13d16 · ae13d16
1 parent bfc401f
commit ae13d16
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git a/packages/theme/src/button/index.less b/packages/theme/src/button/index.less
@@ -29,7 +29,6 @@
   color: var(--ti-button-normal-text-color);
   fill: var(--ti-button-normal-text-color);
   font-size: var(--ti-button-font-size);
-  min-width: var(--ti-button-size-normal-min-width);
   white-space: nowrap;
   text-overflow: ellipsis;
   cursor: pointer;
@@ -61,10 +60,8 @@
 
   &.is-only-icon {
     width: var(--ti-button-only-icon-width);
-    min-width: var(--ti-button-only-icon-min-width);
-    padding: 0 var(--ti-button-only-icon-padding-horizontal);
+    padding: 0;
     border-radius: var(--ti-button-only-icon-border-radius);
-    border-color: var(--ti-button-only-icon-border-color);
 
     &:hover {
       border-color: var(--ti-button-only-icon-hover-border-color);
@@ -78,6 +75,9 @@
       }
     }
   }
+  &.is-only-icon.is-circle {
+    width: unset;
+  }
 
   &::-moz-focus-inner {
     border: 0;
@@ -157,9 +157,6 @@
     );
   }
 
-  & + & {
-    margin-left: 8px;
-  }
 
   &.is-loading {
     position: relative;

diff --git a/packages/theme/src/button/vars.less b/packages/theme/src/button/vars.less
@@ -25,8 +25,6 @@
   --ti-button-loading-bg-color: rgba(255, 255, 255, 0.5);
   --ti-button-loading-font-size: var(--ti-common-font-size-1);
 
-  // 默认按钮最小宽度
-  --ti-button-size-normal-min-width: var(--ti-common-size-24x);
   // 默认按钮最大宽度
   --ti-button-size-normal-max-width: var(--ti-common-size-width-medium, 120px);
   // 默认按钮的高度
@@ -436,15 +434,11 @@
   // 纯图标按钮最小宽度
   --ti-button-icon-font-size: var(--ti-common-font-size-2);
   // 纯图标/文字按钮宽度
-  --ti-button-only-icon-width: var(--ti-common-size-8x);
-  --ti-button-only-icon-min-width: unset;
+  --ti-button-only-icon-width: 32px;
   --ti-button-only-icon-text-width: var(--ti-common-size-6x);
-  // 纯图标按钮水平内边距
-  --ti-button-only-icon-padding-horizontal: 7px;
+
   // 纯图标按钮边框圆角
   --ti-button-only-icon-border-radius: var(--ti-common-border-radius-3);
-  // 纯图标按钮边框颜色
-  --ti-button-only-icon-border-color: #c2c2c2;
   // 纯图标按钮悬浮时边框颜色
   --ti-button-only-icon-hover-border-color: #191919;
   // 纯图标按钮禁用时边框颜色

diff --git a/packages/theme/src/mixins/button.less b/packages/theme/src/mixins/button.less
@@ -203,8 +203,4 @@
     width: @svg-width;
     height: @svg-height;
   }
-
-  &.is-only-icon {
-    min-width: unset;
-  }
 }