From f423c756ba6ef9f3b9ecaa39b390a6da0b0caafc Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sun, 29 Oct 2017 15:54:36 +0800
Subject: [PATCH] update Trend

---
 src/components/Trend/index.less    |  3 ---
 src/routes/Dashboard/Analysis.js   | 30 ++++++++++++------------------
 src/routes/Dashboard/Analysis.less |  2 +-
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/components/Trend/index.less b/src/components/Trend/index.less
index 92985b26..47f39a30 100644
--- a/src/components/Trend/index.less
+++ b/src/components/Trend/index.less
@@ -6,9 +6,6 @@
   font-size: @font-size-base;
   line-height: 22px;
 
-  & + & {
-    margin-left: 16px;
-  }
   .up,
   .down {
     margin-left: 4px;
diff --git a/src/routes/Dashboard/Analysis.js b/src/routes/Dashboard/Analysis.js
index 6f3c1423..f2c3ae47 100644
--- a/src/routes/Dashboard/Analysis.js
+++ b/src/routes/Dashboard/Analysis.js
@@ -228,16 +228,12 @@ export default class Analysis extends Component {
               footer={<Field label="日均销售额" value={`￥${numeral(12423).format('0,0')}`} />}
               contentHeight={46}
             >
-              <div style={{ whiteSpace: 'nowrap', overflow: 'hidden' }}>
-                <span>
-                  周同比
-                  <Trend flag="up" className={styles.trend}>12%</Trend>
-                </span>
-                <span style={{ marginLeft: 16 }}>
-                  日环比
-                  <Trend flag="down" className={styles.trend}>11%</Trend>
-                </span>
-              </div>
+              <Trend flag="up" style={{ marginRight: 16 }}>
+                周同比<span className={styles.trendText}>12%</span>
+              </Trend>
+              <Trend flag="down">
+                日环比<span className={styles.trendText}>11%</span>
+              </Trend>
             </ChartCard>
           </Col>
           <Col {...topColResponsiveProps}>
@@ -279,14 +275,12 @@ export default class Analysis extends Component {
               total="78%"
               footer={
                 <div style={{ whiteSpace: 'nowrap', overflow: 'hidden' }}>
-                  <span>
-                    周同比
-                    <Trend flag="up" className={styles.trend}>12%</Trend>
-                  </span>
-                  <span style={{ marginLeft: 16 }}>
-                    日环比
-                    <Trend flag="down" className={styles.trend}>11%</Trend>
-                  </span>
+                  <Trend flag="up" style={{ marginRight: 16 }}>
+                    周同比<span className={styles.trendText}>12%</span>
+                  </Trend>
+                  <Trend flag="down">
+                    日环比<span className={styles.trendText}>11%</span>
+                  </Trend>
                 </div>
               }
               contentHeight={46}
diff --git a/src/routes/Dashboard/Analysis.less b/src/routes/Dashboard/Analysis.less
index 19897eaf..6ad7c2a0 100644
--- a/src/routes/Dashboard/Analysis.less
+++ b/src/routes/Dashboard/Analysis.less
@@ -134,7 +134,7 @@ th.alignRight {
   text-align: right!important;
 }
 
-.trend {
+.trendText {
   margin-left: 8px;
   color: @heading-color;
 }
-- 
GitLab