From 0352b32e7046f14bb0e3a3daba517df8e7ed11a3 Mon Sep 17 00:00:00 2001
From: "wenbo.dong" <wenbo.dong@qunar.com>
Date: Thu, 24 Aug 2017 18:31:16 +0800
Subject: [PATCH] =?UTF-8?q?opti:=20=E7=BC=96=E8=BE=91=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=A1=B5=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/containers/AddProject/AddProject.js             |  2 +-
 .../Project/Setting/ProjectMessage/ProjectMessage.js   | 10 +++++-----
 client/styles/common.scss                              |  3 +++
 client/styles/theme.less                               |  4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/client/containers/AddProject/AddProject.js b/client/containers/AddProject/AddProject.js
index cc9f2135..5a8145a9 100644
--- a/client/containers/AddProject/AddProject.js
+++ b/client/containers/AddProject/AddProject.js
@@ -147,7 +147,7 @@ class ProjectList extends Component {
           >
             {getFieldDecorator('desc', {
               rules: [{
-                required: false, message: '请输入描述!'
+                required: false, message: '描述不超过50字!', max: 50
               }]
             })(
               <TextArea rows={4} />
diff --git a/client/containers/Project/Setting/ProjectMessage/ProjectMessage.js b/client/containers/Project/Setting/ProjectMessage/ProjectMessage.js
index a7c4d3ae..de503ce6 100644
--- a/client/containers/Project/Setting/ProjectMessage/ProjectMessage.js
+++ b/client/containers/Project/Setting/ProjectMessage/ProjectMessage.js
@@ -16,12 +16,12 @@ import '../Setting.scss';
 // layout
 const formItemLayout = {
   labelCol: {
-    lg: { span: 3 },
+    lg: { offset: 1, span: 3 },
     xs: { span: 24 },
     sm: { span: 6 }
   },
   wrapperCol: {
-    lg: { span: 21 },
+    lg: { span: 19 },
     xs: { span: 24 },
     sm: { span: 14 }
   },
@@ -323,12 +323,12 @@ class ProjectMessage extends Component {
     return (
       <div className="m-panel">
         <Row className="project-setting">
-          <Col sm={6} lg={3} className="setting-logo">
+          <Col xs={6} lg={{offset: 1, span: 3}} className="setting-logo">
             <Popover placement="bottom" title={colorSelector} content={iconSelector} trigger="click" overlayClassName="change-project-container">
               <Icon type={projectMsg.icon || 'star-o'} className="ui-logo" style={{ backgroundColor: constants.PROJECT_COLOR[projectMsg.color] || constants.PROJECT_COLOR.blue }} />
             </Popover>
           </Col>
-          <Col sm={18} lg={21} className="setting-intro">
+          <Col xs={18} sm={15} lg={19} className="setting-intro">
             <h2 className="ui-title">{projectMsg.group_name + ' / ' + projectMsg.name}</h2>
             <p className="ui-desc">{projectMsg.desc}</p>
           </Col>
@@ -407,7 +407,7 @@ class ProjectMessage extends Component {
             {getFieldDecorator('desc', {
               initialValue: initFormValues.desc,
               rules: [{
-                required: false, message: '请输入描述!'
+                required: false, message: '描述不超过50字!', max: 50
               }]
             })(
               <TextArea rows={4} />
diff --git a/client/styles/common.scss b/client/styles/common.scss
index 21335b4a..f4a48a17 100644
--- a/client/styles/common.scss
+++ b/client/styles/common.scss
@@ -13,6 +13,9 @@ html, body {
   height: 100%;
   background: #ececec;
 }
+::selection {
+  background-color: #2395f1;
+}
 
 div, article, p, table, tr, td, th, ul, ol, li, h1, h2, h3, form, dl, dt, dd {
   margin: 0;
diff --git a/client/styles/theme.less b/client/styles/theme.less
index 3899c112..676a4fd3 100644
--- a/client/styles/theme.less
+++ b/client/styles/theme.less
@@ -98,9 +98,9 @@
 @background-color-active: #eee;
 
 // Disabled states
-@disabled-color         : fade(#0d1b3e, 25%);
+@disabled-color         : fade(#0d1b3e, 45%);
 @disabled-bg            : @background-color-base;
-@disabled-color-dark    : fade(#fff, 35%);
+@disabled-color-dark    : fade(#fff, 55%);
 
 // Shadow
 @shadow-color           : rgba(0, 0, 0, .2);