diff --git a/components/cascader/__tests__/__snapshots__/index.test.js.snap b/components/cascader/__tests__/__snapshots__/index.test.js.snap index 83343e04eb..c5ed2ecd86 100644 --- a/components/cascader/__tests__/__snapshots__/index.test.js.snap +++ b/components/cascader/__tests__/__snapshots__/index.test.js.snap @@ -1189,7 +1189,7 @@ exports[`Cascader should render not found content 1`] = ` componentName="Empty" >
( switch (componentName) { case 'Table': case 'List': - return ; + return ; case 'Select': case 'TreeSelect': diff --git a/components/empty/__tests__/__snapshots__/demo.test.js.snap b/components/empty/__tests__/__snapshots__/demo.test.js.snap index 215d77e779..47daf868b7 100644 --- a/components/empty/__tests__/__snapshots__/demo.test.js.snap +++ b/components/empty/__tests__/__snapshots__/demo.test.js.snap @@ -214,7 +214,7 @@ exports[`renders ./components/empty/demo/config-provider.md correctly 1`] = ` class="ant-transfer-list-body-not-found" >
empty
No Data diff --git a/components/empty/demo/simple.md b/components/empty/demo/simple.md index 58b180c569..0ae4286b58 100644 --- a/components/empty/demo/simple.md +++ b/components/empty/demo/simple.md @@ -17,7 +17,7 @@ You can choose another style of `image` by setting image to `Empty.PRESENTED_IMA import { Empty } from 'antd'; ReactDOM.render( - , + , mountNode ); ``` diff --git a/components/empty/index.tsx b/components/empty/index.tsx index 9bf751c737..ef1fffc2c5 100644 --- a/components/empty/index.tsx +++ b/components/empty/index.tsx @@ -51,13 +51,20 @@ const OriginEmpty: React.SFC = (props: EmptyProps) => ( } return ( -
+
{imageNode}
-

{des}

- {children &&
{children}
}
); diff --git a/components/empty/style/index.less b/components/empty/style/index.less index fe92413999..535109d93e 100644 --- a/components/empty/style/index.less +++ b/components/empty/style/index.less @@ -27,19 +27,21 @@ } // antd internal empty style - &-small { - margin: 8px 0; - - .@{empty-prefix-cls}-image { - height: 35px; - } - } - &-normal { margin: 32px 0; + color: @disabled-color; .@{empty-prefix-cls}-image { height: 40px; } } + + &-small { + margin: 8px 0; + color: @disabled-color; + + .@{empty-prefix-cls}-image { + height: 35px; + } + } } diff --git a/components/list/style/index.less b/components/list/style/index.less index e48eac4f64..6b612202a8 100644 --- a/components/list/style/index.less +++ b/components/list/style/index.less @@ -32,7 +32,7 @@ &-empty-text { padding: @list-empty-text-padding; - color: @text-color-secondary; + color: @disabled-color; font-size: @font-size-base; text-align: center; } diff --git a/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap b/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap index 28b3f50426..953ff6b1b1 100644 --- a/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap +++ b/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap @@ -513,7 +513,7 @@ exports[`renders ./components/locale-provider/demo/all.md correctly 1`] = ` class="ant-transfer-list-body-not-found" >