From f0102c6d1ba533c9781693ed70c54153be397b6e Mon Sep 17 00:00:00 2001
From: ddcat1115 <ddcat1115@gmail.com>
Date: Thu, 26 Oct 2017 23:31:40 +0800
Subject: [PATCH] update style

---
 src/components/StandardTable/index.js   |  2 +-
 src/components/StandardTable/index.less |  2 +-
 src/routes/List/BasicList.js            |  2 +-
 src/routes/List/BasicList.less          |  2 +-
 src/routes/List/FilterCardList.less     |  2 +-
 src/routes/List/TableList.less          |  1 -
 src/routes/Result/Success.js            | 14 +++++++-------
 7 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/components/StandardTable/index.js b/src/components/StandardTable/index.js
index f117da23..05179521 100644
--- a/src/components/StandardTable/index.js
+++ b/src/components/StandardTable/index.js
@@ -128,7 +128,7 @@ class StandardTable extends PureComponent {
           <Alert
             message={(
               <p>
-                已选择 <a>{selectedRowKeys.length}</a> 项&nbsp;&nbsp;
+                已选择 <a style={{ fontWeight: 600 }}>{selectedRowKeys.length}</a> 项&nbsp;&nbsp;
                 服务调用总计 <span style={{ fontWeight: 600 }}>{totalCallNo}</span> 万
                 <a onClick={this.cleanSelectedKeys} style={{ marginLeft: 24 }}>清空</a>
               </p>
diff --git a/src/components/StandardTable/index.less b/src/components/StandardTable/index.less
index 34ec184c..31de3180 100644
--- a/src/components/StandardTable/index.less
+++ b/src/components/StandardTable/index.less
@@ -4,7 +4,7 @@
 .standardTable {
   :global {
     .ant-table-pagination {
-      margin-bottom: 0;
+      margin-top: 24px;
     }
   }
 
diff --git a/src/routes/List/BasicList.js b/src/routes/List/BasicList.js
index 93fcc4e6..481123ba 100644
--- a/src/routes/List/BasicList.js
+++ b/src/routes/List/BasicList.js
@@ -117,7 +117,7 @@ export default class BasicList extends PureComponent {
             bodyStyle={{ padding: '0 32px 40px 32px' }}
             extra={extraContent}
           >
-            <Button type="dashed" style={{ width: '100%', marginBottom: 12 }} icon="plus">
+            <Button type="dashed" style={{ width: '100%', margin: 8 }} icon="plus">
               添加
             </Button>
             <List
diff --git a/src/routes/List/BasicList.less b/src/routes/List/BasicList.less
index a0383f9e..51748681 100644
--- a/src/routes/List/BasicList.less
+++ b/src/routes/List/BasicList.less
@@ -22,7 +22,7 @@
       line-height: 48px;
     }
     .ant-list-pagination {
-      margin-top: 16px;
+      margin-top: 24px;
     }
   }
   .headerInfo {
diff --git a/src/routes/List/FilterCardList.less b/src/routes/List/FilterCardList.less
index 2be27dff..cd255840 100644
--- a/src/routes/List/FilterCardList.less
+++ b/src/routes/List/FilterCardList.less
@@ -22,11 +22,11 @@
       float: left;
       width: 50%;
       p {
-        color: @text-color-secondary;
         line-height: 32px;
         font-size: 24px;
       }
       p:first-child {
+        color: @text-color-secondary;
         font-size: 12px;
         line-height: 20px;
         margin-bottom: 4px;
diff --git a/src/routes/List/TableList.less b/src/routes/List/TableList.less
index 904668d1..cbdd43db 100644
--- a/src/routes/List/TableList.less
+++ b/src/routes/List/TableList.less
@@ -2,7 +2,6 @@
 @import "../../utils/utils.less";
 
 .tableList {
-  padding-bottom: 8px;
   .tableListOperator {
     margin-bottom: 16px;
     button {
diff --git a/src/routes/Result/Success.js b/src/routes/Result/Success.js
index 75a2e2f6..13dbbe85 100644
--- a/src/routes/Result/Success.js
+++ b/src/routes/Result/Success.js
@@ -6,7 +6,7 @@ import PageHeaderLayout from '../../layouts/PageHeaderLayout';
 const { Step } = Steps;
 
 const desc1 = (
-  <div style={{ fontSize: 12, color: 'rgba(0, 0, 0, 0.45)' }}>
+  <div style={{ fontSize: 12, color: 'rgba(0, 0, 0, 0.45)', position: 'relative', left: 42 }}>
     <div style={{ margin: '8px 0 4px' }}>
       曲丽丽<Icon style={{ marginLeft: 8 }} type="dingding-o" />
     </div>
@@ -15,7 +15,7 @@ const desc1 = (
 );
 
 const desc2 = (
-  <div style={{ fontSize: 12 }}>
+  <div style={{ fontSize: 12, position: 'relative', left: 42 }}>
     <div style={{ margin: '8px 0 4px' }}>
       周毛毛<Icon type="dingding-o" style={{ color: '#00A0E9', marginLeft: 8 }} />
     </div>
@@ -42,11 +42,11 @@ const extra = (
         2016-12-12 ~ 2017-12-12
       </Col>
     </Row>
-    <Steps progressDot current={1}>
-      <Step title="创建项目" description={desc1} />
-      <Step title="部门初审" description={desc2} />
-      <Step title="财务复核" />
-      <Step title="完成" />
+    <Steps style={{ marginLeft: -42, width: 'calc(100% + 84px)' }} progressDot current={1}>
+      <Step title={<span style={{ fontSize: 14 }}>创建项目</span>} description={desc1} />
+      <Step title={<span style={{ fontSize: 14 }}>部门初审</span>} description={desc2} />
+      <Step title={<span style={{ fontSize: 14 }}>财务复核</span>} />
+      <Step title={<span style={{ fontSize: 14 }}>完成</span>} />
     </Steps>
   </div>
 );
-- 
GitLab