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

public/react/src/modules/courses/boards/index.js

@@ -349,7 +349,7 @@ class Boards extends Component{
             <React.Fragment>
               { isAdmin && !parent_id && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加目录</WordsBtn> }
               { isAdmin && !!parent_id && <WordsBtn style="blue" className="mr30" onClick={()=>this.renameDir()}>目录重命名</WordsBtn> }
-              { isAdminOrStudent && <WordsBtn style="blue" className="" onClick={()=>this.onToBoardsNew()}>我要发布</WordsBtn> }
+              { isAdminOrStudent && <WordsBtn style="blue" className="" onClick={()=>this.onToBoardsNew()}>我要发贴</WordsBtn> }
             </React.Fragment>
           }
           secondRowLeft={

public/react/src/modules/page/component/UpdateDrawer.js

@@ -198,7 +198,7 @@ class UpdateDrawer extends Component {
 		            	}
 		            </div>
 	          	</DialogContent>
-	          	<DialogActions id="dialog-actions" style={{ 'margin-bottom': '16px'}}>
+	          	<DialogActions id="dialog-actions" >
 	          		{ needUpdateScript ? 
 	          		<React.Fragment>
 			            <Button