Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/shixun_lists_controller.rb

@@ -4,7 +4,8 @@ class ShixunListsController < ApplicationController
   end
 
   private
+
   def search_params
-    params.permit(:keyword, :type, :page, :limit, :order, :status, :diff, :sort)
+    params.permit(:keyword, :type, :page, :limit, :order, :status, :diff, :sort, :no_jupyter)
   end
 end

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

@@ -721,6 +721,14 @@ class CoursesBanner extends Component {
 														.ant-breadcrumb-separator{
 														      color: rgba(255,255,255,0.3) !important;
 														}
+														.ant-tooltip-inner{
+														background: #FFFFFF !important;
+														opacity: 0.2 !important;
+														}
+														.ant-tooltip-arrow::before{
+														background: #FFFFFF !important;
+														opacity: 0.2 !important;
+														}
 													`}
 												</style>
 												<Breadcrumb separator="|" className={"mt5"}>

public/react/src/modules/courses/css/Courses.css

@@ -1750,3 +1750,7 @@ input.ant-input-number-input:focus {
     color: #F79946 !important;
     text-decoration: underline !important;
 }
+.pointertooltip{
+  background: #DDDDDD;
+
+}

public/react/src/search/SearchPage.js

@@ -137,8 +137,10 @@ class SearchPage extends Component{
 						margin-right: 4px;
 						font-size: 16px !important;
 					}
+					.shixundetailtopcss{
+					}
 				`}</style>
-				<div className="shixunDetail_top " >
+				<div className="shixunDetail_top shixundetailtopcss" >
 					{/*<div style={{height:"53px"}}></div>*/}
 					<div className="intermediatecenter" style={{ width: "100%"}}>
 						<Search

public/react/src/search/searchc.css

@@ -178,9 +178,10 @@
 .ml9{
     margin-left: 9px;
 }
-.shixunDetail_top{width: 100%;background-image: url("/images/educoder/searchforbackres.jpg"); height: 240px;
+.shixunDetail_top{width: 100%;background-image: url("/images/educoder/searchforbackres.jpg"); height: 160px;
     justify-content: center;align-items: center;display: -webkit-flex;
     background-size: cover;
     background-position: center;
     background-repeat: no-repeat;
+    padding-top: 0px !important;
 }