Merge branches 'dev_Ysl' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

# Conflicts:
#	public/react/src/modules/courses/Index.js

public/react/src/modules/courses/poll/PollNew.js

@@ -2455,7 +2455,7 @@ class PollNew extends Component {
 		// console.log(this.state.projects===undefined?"":this.state.projects.poll_questions)
 		var displaymysave = (mysave === true) ? "" : "display:none;";
 		return (
-			<div className="newMain">
+			<div>
 				{/*提示*/}
 				{Modalstype && Modalstype === true ? <Modals
 					modalsType={this.state.Modalstype}
@@ -2465,7 +2465,14 @@ class PollNew extends Component {
 					modalsBottomval={this.state.ModalsBottomval}
 					loadtype={this.state.Loadtype}
 				/> : ""}
-				<div className="educontent mb50">
+				<style>
+					{
+						`
+				.newMains{ margin: 0 auto; padding-bottom: 235px !important; min-width:1200px; min-height: 800px !important;}
+				`
+					}
+				</style>
+				<div className="educontent newMains">
 					<p className="clearfix mb20 mt10">
 						<a className=" btn colorgrey fl hovercolorblue" onClick={()=>this.gotohome()}>{this.props.coursedata.name}</a>
 						<span className="color-grey-9 fl ml3 mr3">&gt;</span>