Skip to content

Commit 2a73992

Browse files
xuqingkaiMoonofweisheng
authored andcommitted
fix: 🐛 修复Button不同尺寸显示固定尺寸icon样式不协调的问题
Closes: #235
1 parent 78bed6a commit 2a73992

4 files changed

Lines changed: 6 additions & 3 deletions

File tree

src/pages/button/Index.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@
6060
<demo-block title="带图标的基本按钮">
6161
<wd-button icon="download">下载</wd-button>
6262
<wd-button icon="setting">设置</wd-button>
63+
<wd-button icon="download" size="small">下载</wd-button>
64+
<wd-button icon="setting" size="small">设置</wd-button>
65+
<wd-button icon="download" size="large">下载</wd-button>
66+
<wd-button icon="setting" size="large">设置</wd-button>
6367
</demo-block>
6468
<demo-block title="块状按钮,宽度100%">
6569
<wd-button block size="large">主要按钮</wd-button>

src/uni_modules/wot-design-uni/components/common/abstracts/variable.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ $-button-large-radius: var(--wot-button-large-radius, 8px) !default; // 大型
152152
$-button-large-loading: var(--wot-button-large-loading, 24px) !default; // 大小按钮loading图标大小
153153
$-button-large-box-shadow-size: var(--wot-button-large-box-shadow-size, 0px 4px 8px 0px) !default; // 大尺寸阴影尺寸
154154

155-
$-button-icon-fs: var(--wot-button-icon-fs, 18px) !default; // 带图标的按钮的图标大小
155+
$-button-icon-fs: var(--wot-button-icon-fs, 1.18em) !default; // 带图标的按钮的图标大小
156156
$-button-icon-size: var(--wot-button-icon-size, 40px) !default; // icon 类型按钮尺寸
157157
$-button-icon-color: var(--wot-button-icon-color, rgba(0, 0, 0, 0.65)) !default; // icon 类型按钮颜色
158158
$-button-icon-disabled-color: var(--wot-button-icon-disabled-color, $-color-icon-disabled) !default; // icon 类型按钮禁用颜色

src/uni_modules/wot-design-uni/components/wd-button/index.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,6 @@
310310
height: $-button-icon-size;
311311
padding: 0;
312312
border-radius: 50%;
313-
font-size: 0;
314313
color: $-button-icon-color;
315314

316315
&::after {

src/uni_modules/wot-design-uni/components/wd-button/wd-button.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<view v-if="loading" class="wd-button__loading">
4040
<view class="wd-button__loading-svg" :style="loadingStyle"></view>
4141
</view>
42-
<wd-icon v-if="icon" custom-class="wd-button__icon" :name="icon"></wd-icon>
42+
<wd-icon v-else-if="icon" custom-class="wd-button__icon" :name="icon"></wd-icon>
4343
<view class="wd-button__text"><slot /></view>
4444
</button>
4545
</template>

0 commit comments

Comments
 (0)