From 274d56fef3284775c120a4bd6af5cdbb45578b07 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, 18 Sep 2019 16:14:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=AE=9E=E8=AE=AD=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/coursesPublic/NewShixunModel.js   | 21 +++++++++++++------
 .../courses/coursesPublic/Newshixunmodel.css  |  4 ++--
 public/react/src/modules/home/shixunsHome.js  | 16 +++++++-------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
index 26ebf2099..72b709a8e 100644
--- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
+++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
@@ -78,7 +78,7 @@ class NewShixunModel extends Component{
 						{item.map((list,key)=>{
 							return(
 								<Menu.Item key={key} id={list.id}>
-										<a target="_blank" href={`/paths/${list.id}`} className={"newshixun500"} title={list.name}>{list.name}</a>
+										<a target="_blank" href={`/paths/${list.id}`} className={"newshixun500"}>{list.name}</a>
 								</Menu.Item>
 								)
 						})}
@@ -340,6 +340,12 @@ class NewShixunModel extends Component{
 						`body{  overflow: hidden !important; }
 					   .ant-drawer-content{ overflow:auto !important; background: #f5f5f5; }
 					   .yslbottomsj{position: absolute;bottom: -8px;}
+					   .ant-drawer-close{
+					     font-size:24px !important;
+					   }
+					   .ant-drawer-body {
+								padding: 24px 24px 24px 0px;
+					  	}
 					  `
 					}
 				</style>
@@ -353,7 +359,7 @@ class NewShixunModel extends Component{
 					height={'100%'}
 				>
 					<Spin spinning={this.state.isspinning}>
-					<div className={"clearfix educontent pr mb100"}>
+					<div className={"clearfix educontent pr mb60shixun"}>
 
 						<div className={"square-list clearfix"}>
 
@@ -365,11 +371,14 @@ class NewShixunModel extends Component{
 										.ant-input, .ant-input .ant-input-suffix{
    											background-color: #fff !important;
 										}
+										.packinput .ant-input{
+   											border: 1px solid rgba(217,217,217,1) !important;
+										}
 										`
 									}
 								</style>
 								<Search
-									style={{ width: "800px"}}
+									style={{ width: "780px"}}
 									className="packinput"
 									placeholder="实训信息 / 院校名称 / 创建者"
 									value={this.state.keyword}
@@ -429,7 +438,7 @@ class NewShixunModel extends Component{
 													className="fl task-hide edu-txt-left mt3"
 													name="shixun_homework[]"
 												></Checkbox>
-												<a target="_blank" href={`/shixuns/${item.identifier}/challenges`} title={item.title} className="ml15 fl font-16  color-dark maxwidth1100"
+												<a target="_blank" href={`/shixuns/${item.identifier}/challenges`} className="ml15 fl font-16  color-dark maxwidth1100"
 													 dangerouslySetInnerHTML={{__html: item.title}}
 												>
 												</a>
@@ -449,7 +458,7 @@ class NewShixunModel extends Component{
 														`
 													}
 												</style>
-												{JSON.stringify(item.description) == "{}"?"":<div className="newshixunmodelmidfont newradioStyles" title={item.description}  dangerouslySetInnerHTML={{__html: item.description}}>
+												{JSON.stringify(item.description) == "{}"?"":<div className="newshixunmodelmidfont newradioStyles"  dangerouslySetInnerHTML={{__html: item.description}}>
 												</div>}
 
 												{item.challenge_names.length===0?"":<div className="newshixunmodelbotfont">
@@ -533,7 +542,7 @@ class NewShixunModel extends Component{
 							{
 								shixun_list===undefined?"":shixun_list.length===0?"":<div className={" edu-txt-center padding13-30"}>
 									<Button className={"mr20 newshixunmode"} onClick={()=>this.props.hideNewShixunModelType()}>取消</Button>
-									<Button className={"newshixunmode mr70"} type="primary" onClick={()=>this.savecouseShixunModal()} loading={this.state.hometypepvisible}>确定</Button>
+									<Button className={"newshixunmode mr40"} type="primary" onClick={()=>this.savecouseShixunModal()} loading={this.state.hometypepvisible}>确定</Button>
 								</div>}
 						</div>
 					</Spin>
diff --git a/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css b/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css
index 3bf843326..f0f45a468 100644
--- a/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css
+++ b/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css
@@ -259,8 +259,8 @@
 }
 
 
-.mb100{
-    margin-bottom: 100px !important;
+.mb60shixun{
+    margin-bottom: 60px !important;
 }
 
 .padding13-30 {
diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js
index a60080379..5677193d5 100644
--- a/public/react/src/modules/home/shixunsHome.js
+++ b/public/react/src/modules/home/shixunsHome.js
@@ -408,7 +408,7 @@ class ShixunsHome extends Component {
                                                             <img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />
                                                             <a href={"/users/"+item.login} className="color-dark">
                                                                 <img src={'/images/'+item.image_url} />
-                                                                <span className="task-hide rankName">{item.username}</span>
+                                                                <p className="task-hide rankName mt5">{item.username}</p>
                                                             </a>
                                                         </li>
                                                     )
@@ -422,7 +422,7 @@ class ShixunsHome extends Component {
                                                                 <img src={getImageUrl("images/educoder/huangguan.png")}  className="huangguan" />
                                                                 <a href={"/users/"+item.login} className="color-dark">
                                                                     <img src={'/images/'+item.image_url} />
-                                                                    <span className="task-hide rankName">{item.username}</span>
+                                                                    <p className="task-hide rankName mt5">{item.username}</p>
                                                                 </a>
                                                             </li>
                                                         )
@@ -436,7 +436,7 @@ class ShixunsHome extends Component {
                                                                 <img src={getImageUrl("images/educoder/huangguan-three.png")}  className="huangguan" />
                                                                 <a href={"/users/"+item.login} className="color-dark">
                                                                     <img src={'/images/'+item.image_url} />
-                                                                    <span className="task-hide rankName">{item.username}</span>
+                                                                    <p className="task-hide rankName mt5">{item.username}</p>
                                                                 </a>
                                                             </li>
                                                         )
@@ -452,7 +452,7 @@ class ShixunsHome extends Component {
                                                                 <li key={key}>
                                                                     <a href={"/users/"+item.login} className="color-dark">
                                                                         <img src={'/images/'+item.image_url}/>
-                                                                        <span className="task-hide rankName">{item.username}</span>
+                                                                        <p className="task-hide rankName mt5">{item.username}</p>
                                                                     </a>
                                                                 </li>
                                                             )
@@ -484,7 +484,7 @@ class ShixunsHome extends Component {
                                                             <img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />
                                                             <a href={"/users/"+item.login} className="color-dark">
                                                                 <img src={'/images/'+item.image_url} />
-                                                                <span className="task-hide rankName">{item.username}</span>
+                                                                <p className="task-hide rankName mt5">{item.username}</p>
                                                             </a>
                                                         </li>
                                                     )
@@ -498,7 +498,7 @@ class ShixunsHome extends Component {
                                                             <img src={getImageUrl("images/educoder/huangguan.png")}  className="huangguan" />
                                                             <a href={"/users/"+item.login} className="color-dark">
                                                                 <img src={'/images/'+item.image_url} />
-                                                                <span className="task-hide rankName">{item.username}</span>
+                                                                <p className="task-hide rankName mt5">{item.username}</p>
                                                             </a>
                                                         </li>
                                                     )
@@ -512,7 +512,7 @@ class ShixunsHome extends Component {
                                                             <img src={getImageUrl("images/educoder/huangguan-three.png")}  className="huangguan" />
                                                             <a href={"/users/"+item.login} className="color-dark">
                                                                 <img src={'/images/'+item.image_url} />
-                                                                <span className="task-hide rankName">{item.username}</span>
+                                                                <p className="task-hide rankName mt5">{item.username}</p>
                                                             </a>
                                                         </li>
                                                     )
@@ -528,7 +528,7 @@ class ShixunsHome extends Component {
                                                         <li key={key}>
                                                             <a href={"/users/"+item.login} className="color-dark">
                                                                 <img src={'/images/'+item.image_url}/>
-                                                                <span className="task-hide rankName">{item.username}</span>
+                                                                <p className="task-hide rankName mt5">{item.username}</p>
                                                             </a>
                                                         </li>
                                                     )