fixed: #4905 (comment) (#7875)

ant-design · Oct 12, 2017 · 57d5038 · 57d5038
1 parent 48847e1
commit 57d5038
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/components/list/Item.tsx b/components/list/Item.tsx
@@ -92,11 +92,10 @@ export default class Item extends React.Component<ListItemProps, any> {
     const contentClassString = classNames(`${prefixCls}-item-content`, {
       [`${prefixCls}-item-content-single`]: (metaContent.length < 1),
     });
-    const content = (
+    const content = otherContent.length > 0 ? (
       <div className={contentClassString}>
         {otherContent}
-      </div>
-    );
+      </div>) : null;
 
     let actionsContent;
     if (actions && actions.length > 0) {

diff --git a/components/list/__tests__/__snapshots__/demo.test.js.snap b/components/list/__tests__/__snapshots__/demo.test.js.snap
@@ -41,9 +41,6 @@ exports[`renders ./components/list/demo/basic.md correctly 1`] = `
           </div>
         </div>
       </div>
-      <div
-        class="ant-list-item-content"
-      />
     </div>
     <div
       class="ant-list-item"
@@ -81,9 +78,6 @@ exports[`renders ./components/list/demo/basic.md correctly 1`] = `
           </div>
         </div>
       </div>
-      <div
-        class="ant-list-item-content"
-      />
     </div>
     <div
       class="ant-list-item"
@@ -121,9 +115,6 @@ exports[`renders ./components/list/demo/basic.md correctly 1`] = `
           </div>
         </div>
       </div>
-      <div
-        class="ant-list-item-content"
-      />
     </div>
     <div
       class="ant-list-item"
@@ -161,9 +152,6 @@ exports[`renders ./components/list/demo/basic.md correctly 1`] = `
           </div>
         </div>
       </div>
-      <div
-        class="ant-list-item-content"
-      />
     </div>
   </div>
 </div>

diff --git a/components/list/style/index.less b/components/list/style/index.less
@@ -31,7 +31,7 @@
     padding-top: 12px;
     padding-bottom: 12px;
     &-meta {
-      align-items: center;
+      align-items: flex-start;
       display: flex;
       font-size: 0;
       &-avatar {