mirror of
https://gitee.com/vant-contrib/vant.git
synced 2025-04-06 03:57:59 +08:00
[improvement] optimize single line ellipsis (#334)
* fix: Tabbar icon line-height * [new feature] progress add showPivot prop * [new feature] TabItem support vue-router * [new feature] update document header style * [Doc] add toast english ducoment * [bugfix] Search box-sizing wrong * [Doc] update vant-demo respo * [Doc] translate theme & demo pages * [Doc] add Internationalization document * [bugfix] remove unnecessary props * [fix] optimize clickoutside * [new feature] optimize find-parent * [new feature]: change document title accordinng to language * [new feature] Pagination code review * [improvement] adjust icon-font unicode * [improvement] Icon spinner color inherit * [improvement] icon default width * [bugfix] DateTimePicker validate date props * [bugfix] Tab item text ellipsis * [improvement] optimize single line ellipsis
This commit is contained in:
parent
2beee9d02e
commit
f2c61bdb4e
@ -7,11 +7,9 @@
|
|||||||
</slot>
|
</slot>
|
||||||
</div>
|
</div>
|
||||||
<div class="van-steps__message">
|
<div class="van-steps__message">
|
||||||
<div class="van-steps__message-wrapper">
|
|
||||||
<div class="van-steps__title" v-text="title" />
|
<div class="van-steps__title" v-text="title" />
|
||||||
<div class="van-steps__desc" v-text="description" />
|
<div class="van-steps__desc" v-text="description" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<slot name="message-extra" />
|
<slot name="message-extra" />
|
||||||
</div>
|
</div>
|
||||||
<div class="van-steps__items" :class="{ 'van-steps__items--alone': !title && !description }">
|
<div class="van-steps__items" :class="{ 'van-steps__items--alone': !title && !description }">
|
||||||
|
@ -64,7 +64,7 @@
|
|||||||
color: $gray-darker;
|
color: $gray-darker;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
max-height: 20px;
|
max-height: 20px;
|
||||||
@mixin multi-ellipsis 1;
|
@mixin ellipsis;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__price,
|
&__price,
|
||||||
|
@ -157,7 +157,8 @@
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
font-weight: 300;
|
font-weight: 300;
|
||||||
@mixin multi-ellipsis 1;
|
max-width: 90px;
|
||||||
|
@mixin ellipsis;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -191,7 +192,7 @@
|
|||||||
h2,
|
h2,
|
||||||
span {
|
span {
|
||||||
line-height: 1.4;
|
line-height: 1.4;
|
||||||
@mixin multi-ellipsis 1;
|
@mixin ellipsis;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,3 +5,9 @@
|
|||||||
-webkit-line-clamp: $lines;
|
-webkit-line-clamp: $lines;
|
||||||
-webkit-box-orient: vertical;
|
-webkit-box-orient: vertical;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@define-mixin ellipsis {
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
@ -1,11 +1,13 @@
|
|||||||
@import "./common/var.css";
|
@import "./common/var.css";
|
||||||
|
|
||||||
|
$van-radio-size: 20px;
|
||||||
|
|
||||||
.van-radio {
|
.van-radio {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
&__input {
|
&__input {
|
||||||
position: relative;
|
position: relative;
|
||||||
height: 22px;
|
height: $van-radio-size;
|
||||||
float: left;
|
float: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -13,21 +15,20 @@
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
width: 22px;
|
width: $van-radio-size;
|
||||||
height: 22px;
|
height: $van-radio-size;
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__label {
|
&__label {
|
||||||
line-height: 22px;
|
line-height: $van-radio-size;
|
||||||
display: block;
|
display: block;
|
||||||
margin-left: 37px;
|
margin-left: 37px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.van-icon {
|
.van-icon {
|
||||||
font-size: 22px;
|
font-size: $van-radio-size;
|
||||||
line-height: 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.van-icon-checked {
|
.van-icon-checked {
|
||||||
|
@ -32,31 +32,24 @@
|
|||||||
|
|
||||||
.van-icon {
|
.van-icon {
|
||||||
font-size: 40px;
|
font-size: 40px;
|
||||||
line-height: 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&__message {
|
&__message {
|
||||||
display: table;
|
|
||||||
height: 40px;
|
height: 40px;
|
||||||
margin: 15px 0;
|
margin: 15px 0;
|
||||||
|
|
||||||
.van-steps__message-wrapper {
|
|
||||||
display: table-cell;
|
|
||||||
vertical-align: middle;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&__title {
|
&__title {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
color: $text-color;
|
color: $text-color;
|
||||||
|
padding-top: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__desc {
|
&__desc {
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
color: $gray-dark;
|
color: $gray-dark;
|
||||||
max-height: 18px;
|
@mixin ellipsis;
|
||||||
@mixin multi-ellipsis 1;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -140,7 +133,6 @@
|
|||||||
.van-icon {
|
.van-icon {
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
color: $green;
|
color: $green;
|
||||||
line-height: 1;
|
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -84,7 +84,13 @@
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
@mixin multi-ellipsis 1;
|
padding: 0 5px;
|
||||||
|
min-width: 0; /* hack for flex ellipsis */
|
||||||
|
|
||||||
|
span {
|
||||||
|
display: block;
|
||||||
|
@mixin ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
&--active {
|
&--active {
|
||||||
color: $red;
|
color: $red;
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
line-height: 44px;
|
line-height: 44px;
|
||||||
padding: 0 15px;
|
padding: 0 15px;
|
||||||
background-color: $white;
|
background-color: $white;
|
||||||
@mixin multi-ellipsis 1;
|
@mixin ellipsis;
|
||||||
|
|
||||||
&--active {
|
&--active {
|
||||||
background-color: $background-color;
|
background-color: $background-color;
|
||||||
@ -41,7 +41,7 @@
|
|||||||
line-height: 44px;
|
line-height: 44px;
|
||||||
padding-left: 5px;
|
padding-left: 5px;
|
||||||
padding-right: 18px;
|
padding-right: 18px;
|
||||||
@mixin multi-ellipsis 1;
|
@mixin ellipsis;
|
||||||
|
|
||||||
&--active {
|
&--active {
|
||||||
color: $button-danger-background-color;
|
color: $button-danger-background-color;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user