m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
 Conflicts:
	public/react/src/modules/tpm/TPMIndexHOC.js
chromesetting
杨树明 5 years ago
parent eacdfc81fa d203f8e246
commit 067f770dcc
10 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File

4
public/react/public/css/css_min_all.css
Unescape View File

@ -1883,9 +1883,8 @@ a:hover.task_icons_close{background: url(../images/popup/sy_icons_close.png) -40
.newupload_nav li:last-child{ border-right: none;}
.newupload_nav li a{font-size:12px; color:#444;}
.newupload_nav_hover{ background: #3498db; }
.newupload_nav_nomal { }
.newupload_nav_hover a{color: #fff !important; }
.markdown-body { text-align: justify;word-break: break-all;}
.bor-reds{
border:1px solid #FF0000!important;
border-radius: 4px;
@ -1894,6 +1893,7 @@ a:hover.task_icons_close{background: url(../images/popup/sy_icons_close.png) -40
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
}
@charset "UTF-8";
/*!

8
public/react/public/css/edu-all.css
Unescape View File

@ -2934,7 +2934,7 @@ a.singlepublishtwo{
padding: 40px !important;
}
.editormd-html-preview{
width: 94% !important;
width: 100% !important;
color: #323232 !important;
}
#homework_editorMd_description hr{
@ -3478,3 +3478,9 @@ a.singlepublishtwo{
/*width: auto !important;*/
/*max-width: 600px !important;*/
/*}*/
.markdown-body {
text-align: justify;
word-break: break-all;
}

2
public/react/src/modules/courses/shixunHomework/Challenges.css
Unescape View File

@ -1,5 +1,5 @@
.editormd-html-preview, .editormd-preview-container {
width: 95% !important;
width: 100% !important;
}
.Finish_button{
height: 30px;

15
public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
Unescape View File

@ -1667,7 +1667,7 @@ class Listofworksstudentone extends Component {
],
yslpros: false,
datajs: [],
homework_status: [],
homework_status: undefined,
}
}
@ -3597,7 +3597,14 @@ class Listofworksstudentone extends Component {
starttimesend={this.state.starttimesend}
typs={this.state.typs}
/> : ""}
{
{homework_status===undefined?
<div className={"educontent "}>
<div className="edu-back-white">
<div className="edu-tab-con-box clearfix edu-txt-center" style={{ width:"100%",height:"200px" }}>
<Spin style={{ width:"100%","line-height":"200px" }}></Spin>
</div>
</div>
</div>:
homework_status && homework_status.length === 0 ?
<div className="edu-back-white">
<NoneData></NoneData>
@ -3609,11 +3616,7 @@ class Listofworksstudentone extends Component {
</div>
:
<div className={"educontent "}>
<div className="edu-back-white">
<style>
{`
.startbox{

3
public/react/src/modules/paths/PathDetail/PathDetailIndex.js
Unescape View File

@ -555,6 +555,9 @@ class PathDetailIndex extends Component{
.pathDetailIndex .markdown-body > p {
line-height: 28px;
}
// #shixuns_propaedeutics{
// width: 100% !important;
// }
`
}
</style>

6
public/react/src/modules/tpm/TPMIndexHOC.js
Unescape View File

@ -35,14 +35,14 @@ if (!window['indexHOCLoaded']) {
// $('head').append($('<link rel="stylesheet" type="text/css" />')
// .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
$('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/css/edu-common.css?6`));
.attr('href', `${_url_origin}/stylesheets/css/edu-common.css?66`));
$('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?6`));
.attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?66`));
// index.html有加载
$('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?6`));
.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?66`));
// $('head').append($('<link rel="stylesheet" type="text/css" />')

10
public/react/src/modules/tpm/jupyter/index.js
Unescape View File

@ -146,12 +146,12 @@ function JupyterTPI (props) {
title: '更新通知',
content: (<div className="update_notice">
{stopposttpip(1)}
<p className="update_txt">关卡任务的代码文件有更新啦</p>
<p className="update_txt">更新操作将保留已完成的评测记录和成绩</p>
<p className="update_txt">还未完成评测的任务代码，请自行保存</p>
<p className="update_txt">该实训已更新，更新后您编写的实训代码将会丢失</p>
<p className="update_txt">如有需要请先导出代码再进行更新</p>
{/*<p className="update_txt">还未完成评测的任务代码，请自行保存</p>*/}
</div>),
okText: '确定',
cancelText: '取消',
okText: '立即更新',
cancelText: '稍后再说',
onOk () {
syncJupyterCode(myshixun_identifier, '同步成功');
},onCancel() {

2
public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
Unescape View File

@ -1,5 +1,5 @@
.editormd-html-preview, .editormd-preview-container {
width: 95% !important;
width: 100% !important;
}
.Finish_button{
height: 30px;

7
public/stylesheets/educoder/edu-all.css
Unescape View File

@ -2939,7 +2939,7 @@ a.singlepublishtwo{
padding: 40px !important;
}
.editormd-html-preview{
width: 94% !important;
width:100% !important;
color: #323232 !important;
}
#homework_editorMd_description hr{
@ -3798,4 +3798,9 @@ a.singlepublishtwo{
.ant-drawer{
z-index: 10000 !important;
}
.markdown-body {
text-align: justify;
word-break: break-all;
}

4
public/stylesheets/educoder/edu-main.css
Unescape View File

@ -821,3 +821,7 @@ html>body #ajax-indicator { position: fixed; }
.footer_con-p{
color: #898989 !important;
}
.markdown-body {
text-align: justify;
word-break: break-all;
}
Write Preview
Loading…
Cancel
Save