From 9b899fef19f366b4d3c05f3e1680775aa3c2e7b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 9 Oct 2019 10:43:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BC=96=E8=BE=91=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/busyWork/CommonWorkSetting.js       |  5 +++--
 .../modules/courses/exercise/Exercisesetting.js |  9 +++++----
 .../graduation/tasks/GraduationTaskssetting.js  |  7 +++++--
 .../modules/courses/poll/PollDetailTabForth.js  |  5 ++++-
 .../shixunHomework/Trainingjobsetting.js        |  7 +++++--
 public/stylesheets/educoder/edu-main.css        | 17 +++++++++--------
 6 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
index 9f36996ef..3217b7318 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
@@ -1029,8 +1029,9 @@ class CommonWorkSetting extends Component{
               <span className="font-16 fl color-dark">发布设置</span>
               {
                 !startEditFlag && isAdmin ? 
-                <a className="fr mr6" onClick={() => { this.setState({startEditFlag: true}) }}>
-                  <Tooltip title="编辑"><i className="iconfont icon-bianjidaibeijing font-20 color-green"></i></Tooltip>
+                <a className="fr white-btn edu-blueline-btn mr10 mr6 lineh-24" onClick={() => { this.setState({startEditFlag: true}) }}>
+									编辑设置
+                  {/*<Tooltip title="编辑"><i className="iconfont icon-bianjidaibeijing font-20 color-green"></i></Tooltip>*/}
                 </a>
                 :""
               }
diff --git a/public/react/src/modules/courses/exercise/Exercisesetting.js b/public/react/src/modules/courses/exercise/Exercisesetting.js
index 54a4306d8..ca1e6eddf 100644
--- a/public/react/src/modules/courses/exercise/Exercisesetting.js
+++ b/public/react/src/modules/courses/exercise/Exercisesetting.js
@@ -618,10 +618,11 @@ class Exercisesetting extends Component{
                                 <span className="font-16 fl">发布设置<span className="color-grey-c font-14"></span></span>
                                 {
                                     !flagPageEdit&&this.props.isAdmin()===true ?
-                                        <a className="fr mr6" onClick={this.editSetting}>
-                                            <Tooltip title="编辑">
-                                                <i className="iconfont icon-bianjidaibeijing font-20 color-green"></i>
-                                            </Tooltip>
+                                        <a className="fr mr6 white-btn edu-blueline-btn lineh-24" onClick={this.editSetting}>
+																					编辑设置
+                                            {/*<Tooltip title="编辑">*/}
+                                                {/*<i className="iconfont icon-bianjidaibeijing font-20 color-green"></i>*/}
+                                            {/*</Tooltip>*/}
                                         </a>
                                         :""
                                 }
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index ff7564b8f..19980cca5 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -1001,8 +1001,11 @@ debugger
               <Form  id={"starttime"}>
                 {
                   !flagPageEdit && this.props.isAdmin() === true ?
-                    <a className="fr mt20 mr40" onClick={this.editSetting}><Tooltip title="编辑"><i
-                      className="iconfont icon-bianjidaibeijing font-20 color-green "></i></Tooltip></a>
+                    <a className="mt20 mr40 fr white-btn edu-blueline-btn lineh-24" onClick={this.editSetting}>
+											编辑设置
+											{/*<Tooltip title="编辑"><i*/}
+                      {/*className="iconfont icon-bianjidaibeijing font-20 color-green "></i></Tooltip>*/}
+                    </a>
                     : ""
                 }
                 {/*内容*/}
diff --git a/public/react/src/modules/courses/poll/PollDetailTabForth.js b/public/react/src/modules/courses/poll/PollDetailTabForth.js
index 57fd91cfd..a64f92b5b 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabForth.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabForth.js
@@ -518,7 +518,10 @@ class PollDetailTabForth extends Component{
 								</span>
 								{
 									!flagPageEdit && isAdmin ?
-										<a className="fr" onClick={this.editSetting}><Tooltip title="编辑"><i className="iconfont icon-bianjidaibeijing font-20 color-green"></i></Tooltip></a>
+										<a className="fr white-btn edu-blueline-btn lineh-24" onClick={this.editSetting}>
+											编辑设置
+											{/*<Tooltip title="编辑"><i className="iconfont icon-bianjidaibeijing font-20 color-green"></i></Tooltip>*/}
+										</a>
 										:""
 								}
 							</p>
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 23776ab1f..c9f0b7b53 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -2150,8 +2150,11 @@ class Trainingjobsetting extends Component {
                                     <span className="font-16 fl  "style={{"color":"#05101A"}}>发布设置 <span className="ml15 color-grey-9" style={{"font-size":"14px","text-align":"left"}}></span></span>
                                     {
                                         !flagPageEdit && this.props.isAdmin() === true ?
-                                          <a className="fr" onClick={this.editSetting}><Tooltip title="编辑"><i
-                                            className="iconfont icon-bianjidaibeijing font-20 color-green pr20 "></i></Tooltip></a>
+                                          <a className="fr white-btn edu-blueline-btn mr10 mr20 lineh-24" onClick={this.editSetting}>
+																						编辑设置
+																						{/*<Tooltip title="编辑"><i*/}
+                                            {/*className="iconfont icon-bianjidaibeijing font-20 color-green pr20 "></i></Tooltip>*/}
+                                          </a>
                                             : ""
                                     }
                                 </p>
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index f283c1e95..64663634c 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -146,14 +146,15 @@ a.decoration{text-decoration: underline}
 .margin20{margin:20px;}
 
 /*行高*/
-.lineh-12{line-height: 12px}
-.lineh-15{line-height: 15px}
-.lineh-17{line-height: 17px}
-.lineh-20{line-height: 20px}
-.lineh-25{line-height: 25px}
-.lineh-30{line-height: 30px}
-.lineh-35{line-height: 35px}
-.lineh-40{line-height: 40px}
+.lineh-12{line-height: 12px !important;}
+.lineh-15{line-height: 15px !important;}
+.lineh-17{line-height: 17px !important;}
+.lineh-20{line-height: 20px !important;}
+.lineh-24{line-height: 24px !important;}
+.lineh-25{line-height: 25px !important;}
+.lineh-30{line-height: 30px !important;}
+.lineh-35{line-height: 35px !important;}
+.lineh-40{line-height: 40px !important;}
 
 /*pre标签换行*/
 .break_word{word-break: break-all;word-wrap: break-word;}