From 32928c0e864dbb36aad6d97c6817eeae1f2bb0f5 Mon Sep 17 00:00:00 2001
From: Mark Feng <markselbyfcy@gmail.com>
Date: Mon, 24 Jul 2017 10:53:32 -0500
Subject: [PATCH] [List] Fix padding issue when setting dense and
 disablePadding at the same time (#7515) (#7529)

Fix issue for: padding issue when setting dense and disablePadding at the same time (#7515)

Link: https://github.com/callemall/material-ui/issues/7515
---
 src/List/List.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/List/List.js b/src/List/List.js
index 3405fbcd1ca69c..c2c9cb7e91ad4d 100644
--- a/src/List/List.js
+++ b/src/List/List.js
@@ -101,7 +101,7 @@ class List extends Component<DefaultProps, Props, void> {
     const className = classNames(
       classes.root,
       {
-        [classes.dense]: dense,
+        [classes.dense]: dense && !disablePadding,
         [classes.padding]: !disablePadding,
         [classes.subheader]: subheader,
       },