Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

public/react/src/modules/courses/coursesDetail/CoursesBanner.js

@@ -722,12 +722,13 @@ class CoursesBanner extends Component {
 														      color: rgba(255,255,255,0.3) !important;
 														}
 														.ant-tooltip-inner{
-														background: #FFFFFF !important;
-														opacity: 0.2 !important;
+														background:#99CCFF !important;
 														}
 														.ant-tooltip-arrow::before{
-														background: #FFFFFF !important;
-														opacity: 0.2 !important;
+														background:#99CCFF !important;
+														}
+														.antsoancss{
+														color: #fff;
 														}
 													`}
 												</style>
@@ -736,7 +737,10 @@ class CoursesBanner extends Component {
 													<Breadcrumb.Item className={"pointer"}>
 														<Tooltip  visible={coursedata.teacher_applies_count===undefined?false:coursedata.teacher_applies_count>0?true:false}
 														placement="topLeft"
-																		 title={<pre>{coursedata.teacher_applies_count===undefined?"":coursedata.teacher_applies_count>0?<span>您有{coursedata.teacher_applies_count}条新的加入申请<a className={"daishenp"} onClick={()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers?tab=2")}>
+																		 title={<pre className="antsoancss">
+																			 {coursedata.teacher_applies_count===undefined?"":coursedata.teacher_applies_count>0?
+																				 <span >您有{coursedata.teacher_applies_count}条新的加入申请
+																					 <a className={"daishenp"} onClick={()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers?tab=2")}>
 																			 <span style={{
 																			 	color:"#FFA804"
 																			 }}>

public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js

@@ -688,10 +688,10 @@ class Challengesjupyter extends Component {
 											this.state.jupyter_url===null || this.state.jupyter_url===undefined?
 												(
 													booljupyterurls===false?
-														<div className={enlarge?"fangdatwo edu-back-white":""}>
+														<div className={enlarge?"fangdatwo edu-back-white fangdatwoswidth":""}>
 															<LoadingSpin ></LoadingSpin>
 														</div>
-														:<div className={enlarge?"fangdatwo edu-back-white":""}>
+														:<div className={enlarge?"fangdatwo edu-back-white fangdatwoswidth":""}>
 														</div>
 												)
 												:

public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css

@@ -214,6 +214,10 @@
     right: 0px;
 }
 
+.fangdatwoswidth{
+    border-top: 1px solid #eeee;
+}
+
 .jupyterswidth{
    width:  1140px;
 }