From 62792cc15fef8260607e3763a18ccfbb3c0fb91b Mon Sep 17 00:00:00 2001
From: nikogu <644506165@qq.com>
Date: Mon, 16 Oct 2017 10:52:58 +0800
Subject: [PATCH] remove useless margin

---
 src/routes/Dashboard/Workplace.js   | 2 +-
 src/routes/Dashboard/Workplace.less | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/routes/Dashboard/Workplace.js b/src/routes/Dashboard/Workplace.js
index e45529d9..64bd8ea3 100644
--- a/src/routes/Dashboard/Workplace.js
+++ b/src/routes/Dashboard/Workplace.js
@@ -171,9 +171,9 @@ export default class Workplace extends PureComponent {
               }
             </Card>
             <Card
-              style={{ marginBottom: 24 }}
               bodyStyle={{ padding: 0 }}
               bordered={false}
+              className={styles.activeCard}
               title="动态"
               loading={activitiesLoading}
             >
diff --git a/src/routes/Dashboard/Workplace.less b/src/routes/Dashboard/Workplace.less
index 6e3a47d2..586a7ffb 100644
--- a/src/routes/Dashboard/Workplace.less
+++ b/src/routes/Dashboard/Workplace.less
@@ -141,6 +141,9 @@
 }
 
 @media screen and (max-width: @screen-xl)  and (min-width: @screen-lg) {
+  .activeCard {
+    margin-bottom: 24px;
+  }
   .members {
     margin-bottom: 0;
   }
@@ -153,6 +156,9 @@
 }
 
 @media screen and (max-width: @screen-lg) {
+  .activeCard {
+    margin-bottom: 24px;
+  }
   .members {
     margin-bottom: 0;
   }
-- 
GitLab