diff --git a/packages/steps/index.vue b/packages/steps/index.vue
index 5f8668190..de627c919 100644
--- a/packages/steps/index.vue
+++ b/packages/steps/index.vue
@@ -7,10 +7,8 @@
diff --git a/packages/vant-css/src/card.css b/packages/vant-css/src/card.css
index f363b3e7f..b2be4ef29 100644
--- a/packages/vant-css/src/card.css
+++ b/packages/vant-css/src/card.css
@@ -64,7 +64,7 @@
color: $gray-darker;
font-size: 12px;
max-height: 20px;
- @mixin multi-ellipsis 1;
+ @mixin ellipsis;
}
&__price,
diff --git a/packages/vant-css/src/coupon-list.css b/packages/vant-css/src/coupon-list.css
index 140915811..32f1f1d03 100644
--- a/packages/vant-css/src/coupon-list.css
+++ b/packages/vant-css/src/coupon-list.css
@@ -157,7 +157,8 @@
margin: 0;
font-size: 14px;
font-weight: 300;
- @mixin multi-ellipsis 1;
+ max-width: 90px;
+ @mixin ellipsis;
}
}
@@ -191,7 +192,7 @@
h2,
span {
line-height: 1.4;
- @mixin multi-ellipsis 1;
+ @mixin ellipsis;
}
}
diff --git a/packages/vant-css/src/mixins/ellipsis.css b/packages/vant-css/src/mixins/ellipsis.css
index cfe063a5b..e57f1060c 100644
--- a/packages/vant-css/src/mixins/ellipsis.css
+++ b/packages/vant-css/src/mixins/ellipsis.css
@@ -5,3 +5,9 @@
-webkit-line-clamp: $lines;
-webkit-box-orient: vertical;
}
+
+@define-mixin ellipsis {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
\ No newline at end of file
diff --git a/packages/vant-css/src/radio.css b/packages/vant-css/src/radio.css
index f03a6dba7..ec51ea503 100644
--- a/packages/vant-css/src/radio.css
+++ b/packages/vant-css/src/radio.css
@@ -1,11 +1,13 @@
@import "./common/var.css";
+$van-radio-size: 20px;
+
.van-radio {
overflow: hidden;
&__input {
position: relative;
- height: 22px;
+ height: $van-radio-size;
float: left;
}
@@ -13,21 +15,20 @@
position: absolute;
top: 0;
left: 0;
- width: 22px;
- height: 22px;
+ width: $van-radio-size;
+ height: $van-radio-size;
opacity: 0;
margin: 0;
}
&__label {
- line-height: 22px;
+ line-height: $van-radio-size;
display: block;
margin-left: 37px;
}
.van-icon {
- font-size: 22px;
- line-height: 1;
+ font-size: $van-radio-size;
}
.van-icon-checked {
diff --git a/packages/vant-css/src/steps.css b/packages/vant-css/src/steps.css
index d4caff87f..15250a472 100644
--- a/packages/vant-css/src/steps.css
+++ b/packages/vant-css/src/steps.css
@@ -32,31 +32,24 @@
.van-icon {
font-size: 40px;
- line-height: 1;
}
&__message {
- display: table;
height: 40px;
margin: 15px 0;
-
- .van-steps__message-wrapper {
- display: table-cell;
- vertical-align: middle;
- }
}
&__title {
font-size: 14px;
color: $text-color;
+ padding-top: 4px;
}
&__desc {
font-size: 12px;
line-height: 1.5;
color: $gray-dark;
- max-height: 18px;
- @mixin multi-ellipsis 1;
+ @mixin ellipsis;
}
}
@@ -140,7 +133,6 @@
.van-icon {
font-size: 12px;
color: $green;
- line-height: 1;
display: block;
}
}
diff --git a/packages/vant-css/src/tab.css b/packages/vant-css/src/tab.css
index 235cdb5c5..34e58dce8 100644
--- a/packages/vant-css/src/tab.css
+++ b/packages/vant-css/src/tab.css
@@ -84,7 +84,13 @@
cursor: pointer;
text-align: center;
flex: 1;
- @mixin multi-ellipsis 1;
+ padding: 0 5px;
+ min-width: 0; /* hack for flex ellipsis */
+
+ span {
+ display: block;
+ @mixin ellipsis;
+ }
&--active {
color: $red;
diff --git a/packages/vant-css/src/tree-select.css b/packages/vant-css/src/tree-select.css
index 1e5bf24cd..e47b6db13 100644
--- a/packages/vant-css/src/tree-select.css
+++ b/packages/vant-css/src/tree-select.css
@@ -22,7 +22,7 @@
line-height: 44px;
padding: 0 15px;
background-color: $white;
- @mixin multi-ellipsis 1;
+ @mixin ellipsis;
&--active {
background-color: $background-color;
@@ -41,7 +41,7 @@
line-height: 44px;
padding-left: 5px;
padding-right: 18px;
- @mixin multi-ellipsis 1;
+ @mixin ellipsis;
&--active {
color: $button-danger-background-color;