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

app/templates/shared/main.css

@@ -557,7 +557,6 @@ a.user_orangebg_btn{background-color:#FF6800;color: #fff;}
 a.user_greybg_btn{background-color:#747A7F;color: #fff;}
 /*.user_white_btn{border: 1px solid #ffffff;color: #ffffff!important;}*/
 
-
 .pointer{cursor: pointer}
 .cdefault{cursor: default}
 

public/react/config/webpack.config.prod.js

@@ -326,7 +326,7 @@ module.exports = {
 					comments: false
 				},
 				compress: {
-					drop_debugger: true,
+					drop_debugger: false,
 					drop_console: false
 				}
 			}

public/react/src/modules/tpm/TPMBanner.js

@@ -840,7 +840,7 @@ class TPMBanner extends Component {
                   </li>
                 </ul>
 								{
-									this.props.is_jupyter===false?
+									this.props.is_jupyter===true?"":
 										<div className="pr fl" id="commentsStar" onMouseOver={() => this.showonMouseOver()}
 												 onMouseOut={() => this.hideonMouseOut()}>
 											<div className={"color-grey-c  ml15"} style={{color: "#Fff", textAlign: "center"}}>学员评分</div>
@@ -916,7 +916,6 @@ class TPMBanner extends Component {
 											</div>
 
 										</div>
-										:""
 								}
 
 
@@ -986,7 +985,7 @@ class TPMBanner extends Component {
 
                 {
                   startbtn === true ?
-                    <a className="fr user_default_btn edu-greyback-btn mr15 font-18">开启中</a> : ""
+                    <a className="fr kaike kkbths mr15 font-18">开启中</a> : ""
                 }
 
                 {/*{*/}
@@ -1010,7 +1009,7 @@ class TPMBanner extends Component {
                     placement="bottom"
                     visible={this.state.openknow}
                   >
-                    <a onClick={this.applyrelease} className="fr user_default_btn user_blue_btn mr20 font-18 height39"
+                    <a onClick={this.applyrelease} className="fr kaike kkbths mr20 font-18 height39"
                        id="challenge_begin">发布</a>
                   </Popover>: ""
                 }
@@ -1088,26 +1087,26 @@ class TPMBanner extends Component {
                   placement="bottom"
                   visible={this.state.openshowpublictype}
                   >
-                    <Button type="primary" ghost id="challenge_begin" onClick={this.openpublic} className="fr user_default_btn user_blue_btn mr20 font-18 height39">
+                    <Button type="primary" ghost id="challenge_begin" onClick={this.openpublic} className="fr kaike kkbths mr20 font-18 height39">
                       申请公开
                     </Button>
                   </Popover>: ""
                 }
 
                 {shixunsDetails.shixun_status === 2 && shixunsDetails.public===1 && this.props.identity < 5 ?
-                  <Button type="primary" ghost id="challenge_begin" onClick={this.hidenpublic} className="fr user_default_btn user_blue_btn mr20 font-18 height39" style={{'width': '140px'}}>
+                  <Button type="primary" ghost id="challenge_begin" onClick={this.hidenpublic} className="fr kaike kkbths mr20 font-18 height39" style={{'width': '140px'}}>
                     撤销申请公开
                   </Button>: ""
                 }
 
                 {shixunsDetails.shixun_status === 2 && shixunsDetails.public===0 && this.props.identity < 5 ?
-                  <a onClick={this.cancel_publish} className="fr user_default_btn user_blue_btn mr20 font-18 height39"
+                  <a onClick={this.cancel_publish} className="fr kaike kkbths mr20 font-18 height39"
                      id="challenge_begin">撤销发布</a> : ""
                 }
 
                 {
                   <a onClick={this.Senttothe}
-                     className="fr user_default_btn user_blue_btn mr20 font-18"
+                     className="fr kaike kkbths mr20 font-18"
                      data-tip-down=""
                      style={{display: shixunsDetails.shixun_status === 0 || shixunsDetails.shixun_status === 3 || shixunsDetails.shixun_status === 1 || shixunsDetails.shixun_status === -1 ? "none" : "block"}}
                      data-remote="true">
@@ -1191,11 +1190,11 @@ class TPMBanner extends Component {
                 </Modal>
 
                 {shixunsDetails.shixun_status === 3 &&
-                <a className="fr user_default_btn edu-greyback-btn mr15 font-18">已关闭</a>
+                <a className="fr kaike kkbths mr15 font-18">已关闭</a>
                 }
 
                 {shixunsDetails.shixun_status === -1 &&
-                <a className="fr user_default_btn edu-greyback-btn mr15 font-18">已删除</a>
+                <a className="fr kaike kkbths mr15 font-18">已删除</a>
                 }
 
 

public/react/src/modules/tpm/shixuns/css/TPMBanner.css

@@ -119,4 +119,38 @@ a:active{text-decoration:none;}
 
 .FF6802{
     color:#FF6802;
-}
+}
+
+.xxtjbtn{
+
+    width: 103px;
+    height: 38px;
+    background: rgba(255,255,255,1);
+    border-radius: 4px;
+    border: 1px solid rgba(255,255,255,1);
+    color: #fff !important;
+    font-size: 15px !important;
+    line-height: 36px !important;
+}
+.kkbths{
+    width:103px;
+    height:38px;
+    border-radius:4px;
+    line-height: 36px !important;
+    border:1px solid rgba(255,255,255,1);
+}
+
+.kaike{
+    border-radius: 4px;
+    border: 1px solid rgba(255,255,255);
+    padding: 0px 10px;
+    cursor: pointer;
+    font-size: 14px;
+    display: block;
+    width: 120px;
+    text-align: center;
+    height: 40px;
+    line-height: 40px!important;
+    border-radius: 4px;
+    box-sizing: border-box;
+}

public/stylesheets/educoder/edu-main.css

@@ -820,4 +820,4 @@ html>body #ajax-indicator { position: fixed; }
 
 .footer_con-p{
     color: #898989 !important;
-}
+}