From 08cea188ffbb8b5c771cda0e7b326a6533037f32 Mon Sep 17 00:00:00 2001
From: feixie-liam <xiefei0887@163.com>
Date: Fri, 14 Sep 2018 15:53:27 +0800
Subject: [PATCH 1/3] [Fei XIE/Yunzhi LIU][42]: Save bootcamp feature.

---
 .../my-design/bootcamp/bootcamp-footer.js          | 14 +++++++++++---
 .../my-design/bootcamp/index.js                    |  2 +-
 src/style/common.css                               |  6 +++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/component/bootcamp-background/my-design/bootcamp/bootcamp-footer.js b/src/component/bootcamp-background/my-design/bootcamp/bootcamp-footer.js
index 82ddea0..f005207 100644
--- a/src/component/bootcamp-background/my-design/bootcamp/bootcamp-footer.js
+++ b/src/component/bootcamp-background/my-design/bootcamp/bootcamp-footer.js
@@ -1,10 +1,18 @@
 import React from 'react'
-import { Button, Col } from 'antd'
+import { message, Button, Col } from 'antd'
+import { Link } from 'react-router-dom'
+import '../../../../style/common.css'
+
+const success = () => {
+  message.success('已保存')
+}
 
 const BootcampFooter = () => {
   return (
-    <Col span={6} offset={18} className='tws-btn-group'>
-      <Button>保存训练营</Button>
+    <Col span={6} offset={18} >
+      <Link to='/'>
+        <Button onClick={success} className='margin--right'>保存训练营</Button>
+      </Link>
       <Button type='danger'>删除训练营</Button>
     </Col>
   )
diff --git a/src/component/bootcamp-background/my-design/bootcamp/index.js b/src/component/bootcamp-background/my-design/bootcamp/index.js
index cbd0dcd..c8d3c8a 100644
--- a/src/component/bootcamp-background/my-design/bootcamp/index.js
+++ b/src/component/bootcamp-background/my-design/bootcamp/index.js
@@ -12,7 +12,7 @@ const { Header, Content, Footer } = Layout
 export default class Index extends Component {
   render () {
     return (
-      <Layout className='full-height'>
+      <Layout className='full--height'>
         <Header className='bootcamp__header'>
           <BootcampHeader />
         </Header>
diff --git a/src/style/common.css b/src/style/common.css
index 216221a..1c941f9 100644
--- a/src/style/common.css
+++ b/src/style/common.css
@@ -1,7 +1,11 @@
+.margin--right {
+    margin-right: 6px;
+}
+
 .margin--bottom {
     margin-bottom: 20px;
 }
 
-.full-height {
+.full--height {
     height: 100%;
 }
\ No newline at end of file
-- 
Gitee


From 11121d64e70c6bc697bee593390404a77d53bf8d Mon Sep 17 00:00:00 2001
From: feixie-liam <xiefei0887@163.com>
Date: Mon, 17 Sep 2018 10:18:43 +0800
Subject: [PATCH 2/3] [Fei XIE/Yunzhi LIU][42]: Fix layout error of app header.

---
 src/component/tws-layout/tws-user-info.js | 2 +-
 src/less/tws-layout.less                  | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/component/tws-layout/tws-user-info.js b/src/component/tws-layout/tws-user-info.js
index 386bc63..78817bf 100644
--- a/src/component/tws-layout/tws-user-info.js
+++ b/src/component/tws-layout/tws-user-info.js
@@ -19,7 +19,7 @@ export default class TwsUserInfo extends Component {
     )
     return (
       <Dropdown overlay={menu} placement='bottomRight'>
-        <Button className='margin-t-3 header-dropdown'>张三<Icon type='down' /></Button>
+        <Button className='margin-t-3 header-dropdown'>admin<Icon type='down' /></Button>
       </Dropdown>
     )
   }
diff --git a/src/less/tws-layout.less b/src/less/tws-layout.less
index c43aeaa..f58396b 100644
--- a/src/less/tws-layout.less
+++ b/src/less/tws-layout.less
@@ -13,10 +13,9 @@ body {
 }
 
 .main-wrapper {
-  margin: 0 48px;
   border-radius: 4px;
   padding: 24px 0 0;
-  margin-bottom: 24px;
+  margin: 0 48px 24px;
   background: @content-background;
 }
 
@@ -27,15 +26,15 @@ body {
 
 .App-header {
   background: @head-background;
-  padding: 24px 48px 0 48px;
+  padding: 24px 48px 24px 48px;
   color: white;
   height: auto;
-  line-height: 36px;
 }
 
 .header-bell{
   margin-top: 17px;
   text-align: right;
+  line-height: 36px;
 }
 
 .main-content{
-- 
Gitee


From 5a3d956102b23920d23c38014abcf187b060e6e0 Mon Sep 17 00:00:00 2001
From: Yunzhi Liu <liu_yun_zhi@163.com>
Date: Mon, 17 Sep 2018 10:22:56 +0800
Subject: [PATCH 3/3] [Fei XIE/Yunzhi LIU][N/A]: Fix css class name.

---
 src/less/tws-layout.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/less/tws-layout.less b/src/less/tws-layout.less
index f58396b..0811ff5 100644
--- a/src/less/tws-layout.less
+++ b/src/less/tws-layout.less
@@ -52,7 +52,7 @@ body {
 
 .content-children-content{
   padding: 0 24px;
-  minHeight: 280;
+  min-height: 280;
 }
 
 .footer{
-- 
Gitee