diff --git a/packages/list/index.js b/packages/list/index.js index 6a1f37acd..f152e9fe7 100644 --- a/packages/list/index.js +++ b/packages/list/index.js @@ -134,10 +134,9 @@ export default sfc({ {this.direction === 'down' && this.slots()} {this.loading && (
- {this.slots('loading') || [ - , - {this.loadingText || t('loading')} - ]} + {this.slots('loading') || ( + {this.loadingText || t('loading')} + )}
)} {this.finished && this.finishedText && ( diff --git a/packages/list/index.less b/packages/list/index.less index 91e3ff4c3..a300f20fd 100644 --- a/packages/list/index.less +++ b/packages/list/index.less @@ -1,7 +1,7 @@ @import '../style/var'; .van-list { - &__loading-text, + &__loading, &__finished-text, &__error-text { color: @list-text-color; @@ -9,20 +9,4 @@ line-height: @list-text-line-height; text-align: center; } - - &__loading { - text-align: center; - - &-icon, - &-text { - display: inline-block; - vertical-align: middle; - } - - &-icon { - width: @list-icon-size; - height: @list-icon-size; - margin-right: @list-icon-margin-right; - } - } } diff --git a/packages/loading/index.less b/packages/loading/index.less index fc871392c..19946443b 100644 --- a/packages/loading/index.less +++ b/packages/loading/index.less @@ -63,7 +63,6 @@ margin-left: 10px; color: @loading-text-color; font-size: @loading-text-font-size; - line-height: @loading-text-line-height; vertical-align: middle; } diff --git a/packages/style/var.less b/packages/style/var.less index d20fd50a6..6b019db04 100644 --- a/packages/style/var.less +++ b/packages/style/var.less @@ -179,7 +179,6 @@ @info-font-family: PingFang SC, Helvetica Neue, Arial, sans-serif; // List -@list-icon-size: 16px; @list-icon-margin-right: 5px; @list-text-color: @gray-dark; @list-text-font-size: 13px; @@ -188,7 +187,6 @@ // Loading @loading-text-color: @gray-dark; @loading-text-font-size: 14px; -@loading-text-line-height: 1.2; // NavBar @nav-bar-height: 46px;