diff --git a/packages/loading/index.less b/packages/loading/index.less index d764c61c8..fc871392c 100644 --- a/packages/loading/index.less +++ b/packages/loading/index.less @@ -10,9 +10,7 @@ position: relative; z-index: -1; display: inline-block; - box-sizing: border-box; width: 30px; - // compatible for 1.x, users may set width or height in root element max-width: 100%; height: 30px; diff --git a/packages/pull-refresh/index.js b/packages/pull-refresh/index.js index 1204a3223..5b305b23c 100644 --- a/packages/pull-refresh/index.js +++ b/packages/pull-refresh/index.js @@ -151,10 +151,9 @@ export default sfc({ const Status = this.slots(status) || [ TEXT_STATUS.indexOf(status) !== -1 &&
{text}
, status === 'loading' && ( -
- - {text} -
+ + {text} + ) ]; diff --git a/packages/pull-refresh/index.less b/packages/pull-refresh/index.less index e08971952..04076cf7c 100644 --- a/packages/pull-refresh/index.less +++ b/packages/pull-refresh/index.less @@ -20,18 +20,4 @@ line-height: 50px; text-align: center; } - - &__loading { - .van-loading { - width: 16px; - height: 16px; - margin-right: 5px; - } - - span, - .van-loading { - display: inline-block; - vertical-align: middle; - } - } } diff --git a/packages/pull-refresh/test/__snapshots__/index.spec.js.snap b/packages/pull-refresh/test/__snapshots__/index.spec.js.snap index c2a9e28c5..c378c91c9 100644 --- a/packages/pull-refresh/test/__snapshots__/index.spec.js.snap +++ b/packages/pull-refresh/test/__snapshots__/index.spec.js.snap @@ -24,9 +24,7 @@ exports[`change head content when pulling down 3`] = `
-
-
加载中... -
+
加载中...
@@ -36,9 +34,7 @@ exports[`change head content when pulling down 4`] = `
-
-
加载中... -
+
加载中...