Merge branches 'dev_new_shixunsrepository' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_new_shixunsrepository

public/react/src/modules/page/main/ChooseEvaluateView.js

@@ -1,10 +1,10 @@
 import React, { Component } from 'react';
 
-import IconButton from 'material-ui/IconButton';
 import Tooltip from 'material-ui/Tooltip';
 
 import { CircularProgress } from 'material-ui/Progress';
 
+import './ChooseEvaluateViewnew.css';
 
 class ChooseEvaluateView extends Component {
 
@@ -128,7 +128,7 @@ class ChooseEvaluateView extends Component {
 					</div>
 					<div id="blacktab_con_2" className=" ">
 						<div className="fit -scroll">
-							<div className="-layout-v -fit">
+							<div className="-layout-v -fit paddingbottom60tpm">
 								<div className="-flex -scroll task-padding16 loading-center undis" id="evaluating_ajax_loading"></div>
 								<div className="-flex -scroll task-padding16" id="evaluating_contents">
 									{/*

public/react/src/modules/page/main/ChooseEvaluateViewnew.css

@@ -0,0 +1,3 @@
+.paddingbottom60tpm{
+    padding-bottom: 60px;
+}

public/react/src/modules/page/main/CodeEvaluateView.css

@@ -135,3 +135,7 @@
 .-task-ces-info .inputTitle .input{
     white-space: pre-wrap;
 }
+
+.paddingbottom60tpm{
+    padding-bottom: 60px;
+}

public/react/src/modules/page/main/CodeEvaluateView.js

@@ -1,11 +1,10 @@
 import '../VNC.css';
 import React, { Component } from 'react';
 
-import IconButton from 'material-ui/IconButton';
 import Tooltip from 'material-ui/Tooltip';
-import Button from 'material-ui/Button';
+ 
 import { connect } from 'react-redux';
-import './CodeEvaluateView.css'
+import './CodeEvaluateView.css';
 import { CircularProgress } from 'material-ui/Progress';
 import { on, off } from 'educoder'
 import actions from '../../../redux/actions';
@@ -386,7 +385,7 @@ class CodeEvaluateView extends Component {
 						</div>
 						<div id="blacktab_con_2" className=" " style={ tabIndex === 1 ? {display: 'block'} : {display: 'none'}  }>
 							<div className="fit -scroll">
-								<div className="-layout-v -fit">
+								<div className="-layout-v -fit paddingbottom60tpm">
 									<div className="-flex -scroll task-padding16 loading-center undis" id="evaluating_ajax_loading"></div>
 									<div className="-flex -scroll task-padding16" id="evaluating_contents">
 										{/*