Merge branch 'dev_aliyun' into dev_tj

merge aliyun

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

@@ -360,11 +360,11 @@ class Challengesjupyter extends Component {
 		let id=this.props.match.params.shixunId;
 		let that=this;
 		Modal.confirm({
-			title: '重置实训',
+			title: '重置环境',
 			content: (
 				<p style={{ lineHeight: '24px' }}>
 					你在本文件中修改的内容将丢失,<br />
-					是否确定重新加载初始代码？
+					是否确定重置环境？
 				</p>
 			),
 			okText: '确定',
@@ -430,13 +430,14 @@ class Challengesjupyter extends Component {
 						`
 						.ant-notification{
 						
-						    position: fixed;
-                z-index: 3000;
-						}
-						.ant-modal-content{
-						 position: fixed;
-             z-index: 3000;
+						    position: fixed !important;
+                z-index: 3000 !important;
 						}
+					  .ant-modal-wrap {
+                position: fixed !important;
+                z-index: 3000 !important;
+                margin-top: 100px !important;
+					  }
 						`
 						}
 					</style>

public/react/src/search/SearchPage.js

@@ -138,15 +138,18 @@ class SearchPage extends Component{
 						font-size: 16px !important;
 					}
 				`}</style>
-				<div className="headersear" >
-					<div style={{height:"53px"}}></div>
-					<Search
-									style={{ width: "800px", marginTop:"53px"}}
-									className="packinput"
-									value={this.state.keywords}
-									enterButton={<span><Icon type="search" className="mr5"/> 搜索</span>}
-									onInput={(e)=>this.setdatafunsval(e)}
-									onSearch={ (value)=>this.setdatafuns(value)} />
+				<div className="shixunDetail_top " >
+					{/*<div style={{height:"53px"}}></div>*/}
+					<div className="intermediatecenter" style={{ width: "100%"}}>
+						<Search
+							style={{ width: "800px", marginTop:"53px"}}
+							className="packinput"
+							value={this.state.keywords}
+							enterButton={<span><Icon type="search" className="mr5"/> 搜索</span>}
+							onInput={(e)=>this.setdatafunsval(e)}
+							onSearch={ (value)=>this.setdatafuns(value)} />
+					</div>
+
 				</div>
 
 				<div className="tabtitle">

public/react/src/search/searchc.css

@@ -3,8 +3,6 @@
     margin-top: 53px;
 }
 .headersear{
-    height: 160px;
-    background: #EAF2F9;
     display: flex;
     justify-content: center;
 }
@@ -15,6 +13,12 @@
     /*color: #681616 !important;*/
     border-color: #E1EDF8 !important;
 }
+.intermediatecenter{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
 
 .packinput .ant-input-group-addon .ant-btn{
     width:137px !important;
@@ -174,3 +178,9 @@
 .ml9{
     margin-left: 9px;
 }
+.shixunDetail_top{width: 100%;background-image: url("/images/educoder/searchforbackres.jpg"); height: 240px;
+    justify-content: center;align-items: center;display: -webkit-flex;
+    background-size: cover;
+    background-position: center;
+    background-repeat: no-repeat;
+}