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

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

Browse Source
dev_cs_new
杨树林 6 years ago
parent 230e6bf654 10fccf5ca1
commit 559cb4a58d
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File

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

@ -96,7 +96,9 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
/*块状列表*/ /*块状列表*/
.square-list{width: 100%;box-sizing: border-box;margin-top:20px} .square-list{width: 100%;box-sizing: border-box;margin-top:20px}
.square-Item{position: relative;width:280px;margin-right: 26px;margin-bottom: 26px;float: left;border-radius: 6px;background-color:#fff;box-shadow: 0px 0px 12px rgba(0,0,0,0.1); } .square-Item{position: relative;width:280px;margin-right: 26px;margin-bottom: 26px;float: left;border-radius: 6px;background-color:#fff;box-shadow: 0px 0px 12px rgba(0,0,0,0.1); }
.square-Item:hover{bottom: 3px; box-shadow: 0px 0px 12px rgba(0,0,0,0.3);} .square-Item:hover{
/*bottom: 3px;*/
box-shadow: 0px 0px 12px rgba(0,0,0,0.3);}
.square-Item:hover .closeSquare{display: block} .square-Item:hover .closeSquare{display: block}
.square-Item:nth-child(4n+0){margin-right: 0px;} .square-Item:nth-child(4n+0){margin-right: 0px;}
.square-Item .square-img{display: block;width: 100%} .square-Item .square-img{display: block;width: 100%}

4
public/react/src/modules/courses/busyWork/CommonWorkList.js
Unescape View File

@ -104,8 +104,8 @@ function buildColumns(that, student_works) {
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a href="javascript:;" <a href="javascript:;"
title={record.student_id} title={text && text.length > 12 ? text : ''}
style={{color:'#9A9A9A', 'text-overflow': 'ellipsis', 'white-space': 'nowrap', 'width': '100px', display: 'block', overflow: 'hidden' style={{color:'#9A9A9A', 'text-overflow': 'ellipsis', 'white-space': 'nowrap', 'width': '98px', display: 'block', overflow: 'hidden'
, margin: '0 auto', cursor: 'default'}} , margin: '0 auto', cursor: 'default'}}
>{record.student_id}</a> >{record.student_id}</a>
</span> </span>

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" />') // $('head').append($('<link rel="stylesheet" type="text/css" />')
// .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`)); // .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
$('head').append($('<link rel="stylesheet" type="text/css" />') $('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/css/edu-common.css?8`)); .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?6`));
$('head').append($('<link rel="stylesheet" type="text/css" />') $('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?8`)); .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?6`));
// index.html有加载 // index.html有加载
$('head').append($('<link rel="stylesheet" type="text/css" />') $('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?8`)); .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?6`));
// $('head').append($('<link rel="stylesheet" type="text/css" />') // $('head').append($('<link rel="stylesheet" type="text/css" />')

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

@ -98,7 +98,9 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
/*块状列表*/ /*块状列表*/
.square-list{width: 100%;box-sizing: border-box;margin-top:20px} .square-list{width: 100%;box-sizing: border-box;margin-top:20px}
.square-Item{position: relative;width:280px;margin-right: 26px;margin-bottom: 26px;float: left;border-radius: 6px;background-color:#fff;box-shadow: 0px 0px 12px rgba(0,0,0,0.1); } .square-Item{position: relative;width:280px;margin-right: 26px;margin-bottom: 26px;float: left;border-radius: 6px;background-color:#fff;box-shadow: 0px 0px 12px rgba(0,0,0,0.1); }
.square-Item:hover{bottom: 3px; box-shadow: 0px 0px 12px rgba(0,0,0,0.3);} .square-Item:hover{
/*bottom: 3px; */
box-shadow: 0px 0px 12px rgba(0,0,0,0.3);}
.square-Item:hover .closeSquare{display: block} .square-Item:hover .closeSquare{display: block}
.square-Item:nth-child(4n+0){margin-right: 0px;} .square-Item:nth-child(4n+0){margin-right: 0px;}
.square-Item .square-img{display: block;width: 100%} .square-Item .square-img{display: block;width: 100%}

Write Preview
Loading…
Cancel
Save