From 0d1f6ee0403ea67051228e25bc78e1cd374cb547 Mon Sep 17 00:00:00 2001
From: "yhui.yang" <qitmac000068@qitmac000068deMacBook-Pro.local>
Date: Thu, 27 Jul 2017 10:59:24 +0800
Subject: [PATCH 1/2] fix: modify background of header

---
 client/components/Header/Header.js   | 13 +++++++------
 client/components/Header/Header.scss |  9 ---------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/client/components/Header/Header.js b/client/components/Header/Header.js
index 5f58aa3b..baf46932 100644
--- a/client/components/Header/Header.js
+++ b/client/components/Header/Header.js
@@ -146,15 +146,16 @@ export default class HeaderCom extends Component {
   }
   render () {
     const { login, user, msg, uid, curKey } = this.props;
-    const headerStyle = {
+    const headerImgStyle = login?{}:{
       'background': 'url(./image/header-bg-img.jpg) no-repeat',
       'backgroundSize':'100% 100%'
-    }
+    };
+    const headerShadeStyle = login?{}:{
+      'background': 'linear-gradient(to bottom,rgba(0,0,0,0.6),rgba(0,0,0,0.5))'
+    };
     return (
-      <acticle className={`header-box`} style={headerStyle}>
-        <Header style={{
-          background: "linear-gradient(to bottom,rgba(0,0,0,0.6),rgba(0,0,0,0.5))"
-        }}>
+      <acticle className={`header-box`} style={headerImgStyle}>
+        <Header style={headerShadeStyle}>
           <div className="content">
             <div className="logo">
               <Link to="/" onClick={this.relieveLink}>YAPI</Link>
diff --git a/client/components/Header/Header.scss b/client/components/Header/Header.scss
index 0c478555..510d199d 100644
--- a/client/components/Header/Header.scss
+++ b/client/components/Header/Header.scss
@@ -7,15 +7,6 @@ $color-blue-deeper: #34495E;
 $color-grey-deep : #929aac;
 $color-black-light : #404040;
 /* .header-box.css */
-
-//.light{
-//  background-color: #f7fafc;
-//  color: $color-blue;
-//}
-//.dark {
-//  background-color: $color-black-light;
-//  color: $color-white;
-//}
 .header-box {
   display: block;
   font-size: 0.14rem;

From 9caa4e435981801a3493dbc5bd1da4be6f1e247e Mon Sep 17 00:00:00 2001
From: qitmac000249 <xilli.yu@Qunar.com>
Date: Thu, 27 Jul 2017 11:23:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E5=92=8Csearch=E4=B8=BA=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=E5=BC=8F=E5=8F=8Afooter=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Footer/Footer.js            |  4 +--
 client/components/Footer/Footer.scss          |  2 +-
 .../ProjectGroups/GroupList/GroupList.scss    | 29 +++++++++++++++----
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/client/components/Footer/Footer.js b/client/components/Footer/Footer.js
index 5fabea62..a50fe4e1 100644
--- a/client/components/Footer/Footer.js
+++ b/client/components/Footer/Footer.js
@@ -43,9 +43,9 @@ class FootItem extends Component {
   render () {
     return (
       <div className = 'footItem'>
-        <h4><Icon type= { this.props.iconType } style={{ fontSize: 16 }} /> { this.props.title } </h4>
+        <h4><Icon type= { this.props.iconType } style={{ fontSize: 16 }} />&nbsp;&nbsp; { this.props.title } </h4>
         { this.props.linkList.map(function(item,i){
-          return (<div key = {i}><a href = { item.itemLink }><span>{ item.itemTitle }</span></a></div>);
+          return (<div key = {i}>&nbsp;&nbsp;<a href = { item.itemLink }><span>{ item.itemTitle }</span></a></div>);
         }) }
       </div>
     );
diff --git a/client/components/Footer/Footer.scss b/client/components/Footer/Footer.scss
index ab4ed7fc..4b9806d4 100644
--- a/client/components/Footer/Footer.scss
+++ b/client/components/Footer/Footer.scss
@@ -47,7 +47,7 @@
     }
     a{
         font-weight: 200;
-        color: #108ee9;
+        color: #b3bdc1;
         &:hover{
             color: white;
         }
diff --git a/client/containers/ProjectGroups/GroupList/GroupList.scss b/client/containers/ProjectGroups/GroupList/GroupList.scss
index 68902b46..06f39284 100644
--- a/client/containers/ProjectGroups/GroupList/GroupList.scss
+++ b/client/containers/ProjectGroups/GroupList/GroupList.scss
@@ -36,15 +36,32 @@
     }
   }
   .group-operate {
-    height: 48px;
-    min-width: 263px;
     padding: 10px 6px;
     background: #eee;
-    .search {
-      display: inline-block;
-      margin-right: 6px;
-      width: 162px;
+
+    @media screen and (min-width:1100px){
+      .search {
+        display: inline-block;
+        margin-right: 6px;
+        width: 162px;
+      }
     }
+    @media screen and (max-width:1100px){
+      .search {
+        display: inline-block;
+        margin-right: 6px;
+        width: 80%;
+        margin: 0px auto;
+        display: block;
+      }
+      button{
+        width: 80%;
+        margin: 0px auto;
+        display: block;
+        margin-top: 10px;
+      }
+    }
+    
   }
   .group-list {
     max-height: 650px;