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

Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/educoder into develop

Browse Source
dev_home
cxt 5 years ago
parent c605a11778 2b7246d910
commit a376901e3d
12 changed files with 53 additions and 26 deletions
Show Stats Download Patch File Download Diff File

9
app/assets/stylesheets/admins/sidebar.scss
Unescape View File

@ -6,6 +6,15 @@
transition: all 0.5s;
overflow-y: scroll;
.sidebar-header {
.sidebar-header-logo {
img {
max-width: 130px !important;
max-height: 40px !important;
overflow: hidden;
}
}
}
&::-webkit-scrollbar {
display:none
}

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

@ -3,7 +3,10 @@ body{font-size:14px; line-height:2.0;background:#ffffff!important;font-family: "
html{height:100%;}
.newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
.newMain{ margin: 0 auto; padding-bottom: 155px; min-width:1200px }
.newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;}
.newFooter{
max-height: 110px;
}
.newFooter{ position: absolute; bottom: 0; width: 100%;background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;}
.newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:99998}
/* 重置样式 */
body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;}

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

@ -71,7 +71,10 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
.search-title{height: 40px;line-height: 40px;padding-left: 20px;font-size: 12px;color: #bbb;text-align: left}
.search-content a{display: inline-block;width:100%;height: 30px;line-height: 30px;padding:0px 20px;box-sizing: border-box;text-align: left;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
/*底部*/
.newFooter{ position: absolute; bottom: 0; width: 100%; height: 235px;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;}
.newFooter{
max-height: 110px;
}
.newFooter{ position: absolute; bottom: 0; width: 100%;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;}
.footercon{border-bottom:1px solid #47494d;}
.inner-footernav{width: 560px;margin: 0px auto}
.inner-footernav li{float: left;height: 50px;width: 80px;text-align: center}
@ -94,7 +97,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
/*更多*/
.moreitem{position: absolute;right: 5px;top:35px;height: 15px;color:#656565}
/*块状列表*/
.square-list{width: 100%;box-sizing: border-box;margin-top:20px}
.square-list{width: 100%;box-sizing: border-box;margin-top:20px;flex-wrap:wrap;display:flex;}
.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;*/

5
public/react/public/css/edu-common.css
Unescape View File

@ -3,7 +3,10 @@ body{font-size:14px; line-height:2.0;background:#ffffff!important;font-family: "
html{height:100%;}
.newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
.newMain{ margin: 0 auto; padding-bottom: 155px; min-width:1200px }
.newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;}
.newFooter{
max-height: 110px;
}
.newFooter{ position: absolute; bottom: 0; width: 100%; background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;}
.newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:99998}
/* 重置样式 */
body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;}

9
public/react/src/modules/tpm/NewFooter.js
Unescape View File

@ -19,15 +19,6 @@ class NewFooter extends Component {
return (
<div className="newFooter edu-txt-center ">
{/*newContainers*/}
{this.props.user&&this.props.user.main_site===false?<style>
{
`
.newFooter {
height: 50px;
}
`
}
</style>:""}
<div className="inner-footer_con">
{this.props.user&&this.props.user.main_site===true?<div className="footercon">
{/* <div className="inline mt40 mb5">

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

@ -1187,7 +1187,7 @@ submittojoinclass=(value)=>{
onBlur={(e)=>this.hideshowSearchOpen(e)} onMouseLeave={()=>this.setevaluatinghides()}>
<Search
id={"HeaderSearchs"}
placeholder="实践课程/翻转课堂/实训项目/交流问答"
placeholder="实践课程/课堂/实训项目/交流问答"
onInput={()=>this.onKeywordSearchKeyDowns()}
onSearch={(value) => this.onKeywordSearchKeyDown(value)}
// onPressEnter={this.onKeywordSearchKeyDown}
@ -1232,8 +1232,8 @@ submittojoinclass=(value)=>{
</img>
</a>
<ul className="edu-menu-list" style={{top:'60px'}}>
<span className="bor-bottom-greyE currentName task-hide">{user.username}</span>
{coursestypes===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/courses`}>我的翻转课堂</Link></li>}
{/*<span className="bor-bottom-greyE currentName task-hide">{user.username}</span>*/}
{coursestypes===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/courses`}>我的课堂</Link></li>}
{/* p 老师 l 学生 */}
{shixuntype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训项目</Link></li>}
{pathstype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>我的实践课程</Link></li>}
@ -1284,7 +1284,7 @@ submittojoinclass=(value)=>{
<div className="edu-menu-list" style={{top: '60px',width:"240px"}}>
<div className="overPart"></div>
<ul className={coursestypes===true&&this.props.user&&this.props.user.main_site===false?"fl headwith100b edu-txt-center pr ul-leftline":"fl with50 edu-txt-center pr ul-leftline"}>
{this.props.current_user&&this.props.current_user.user_identity==="学生"?"":coursestypes===true?"":<li><a onClick={(url)=>this.getUser("/courses/new")}>新建翻转课堂</a></li>}
{this.props.current_user&&this.props.current_user.user_identity==="学生"?"":coursestypes===true?"":<li><a onClick={(url)=>this.getUser("/courses/new")}>新建课堂</a></li>}
{shixuntype===true?"":<li><a onClick={(url)=>this.getUser("/shixuns/new")}>新建实训项目</a></li>}
{this.props.Headertop===undefined?"":
pathstype===true?"":<li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li>
@ -1294,7 +1294,7 @@ submittojoinclass=(value)=>{
{coursestypes===true&&this.props.user&&this.props.user.main_site===false?"":<ul className="fl with50 edu-txt-center">
{coursestypes===true?"":<li>
<a onClick={this.tojoinclass}>加入翻转课堂</a>
<a onClick={this.tojoinclass}>加入课堂</a>
</li>}
{Addcoursestypes===true?<Addcourses

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?8`));
$('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?8`));
// 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?8`));
// $('head').append($('<link rel="stylesheet" type="text/css" />')

2
public/react/src/modules/user/Notcompletedysl.js
Unescape View File

@ -67,7 +67,7 @@ class Notcompletedysl extends Component {
<div className="educouddiv">
<div className={"tabeltext-alignleft"}><p style={{fontSize: "16px"}}>完善您的资料，将获得更多的使用权限</p></div>
<div className="clearfix mt30 edu-txt-center">
<a className="task-btn mr30" onClick={()=>this.modalCancel()}>取消</a>
<a className="task-btn mr30" onClick={()=>this.modalCancel()}>稍后完善</a>
<a className="task-btn task-btn-orange" onClick={()=>this.setDownload()}>立即完善</a>
</div>
</div>

2
public/react/src/modules/user/usersInfo/usersInfo.css
Unescape View File

@ -434,6 +434,8 @@
/* 防抖 */
.educontent .square-list {
min-height: 400px;
flex-wrap:wrap;
display:flex;
}
.h10 {

5
public/stylesheets/css/edu-common.css
Unescape View File

@ -3,7 +3,10 @@ body{font-size:14px; line-height:2.0;background:#ffffff!important;font-family: "
html{height:100%;}
.newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
.newMain{ margin: 0 auto; padding-bottom: 155px; min-width:1200px }
.newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;}
.newFooter{
max-height: 110px;
}
.newFooter{ position: absolute; bottom: 0; width: 100%; background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;}
/* 重置样式 */
body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;}
table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9; background:#f5f5f5; color:#333;}

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

@ -71,9 +71,14 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
.search-title{height: 40px;line-height: 40px;padding-left: 20px;font-size: 12px;color: #bbb;text-align: left}
.search-content a{display: inline-block;width:100%;height: 30px;line-height: 30px;padding:0px 20px;box-sizing: border-box;text-align: left;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
/*底部*/
.newFooter{ position: absolute; bottom: 0; width: 100%; height: 235px;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;}
.newFooter{
max-height: 110px;
}
.newFooter{ position: absolute; bottom: 0; width: 100%;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;}
/* 去掉了logo */
.newFooter{ height: 110px; }
.newFooter{
max-height: 110px;
}
.footercon{border-bottom:1px solid #47494d;}
.inner-footernav{width: 560px;margin: 0px auto}
.inner-footernav li{float: left;height: 50px;width: 80px;text-align: center}
@ -96,7 +101,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
/*更多*/
.moreitem{position: absolute;right: 5px;top:35px;height: 15px;color:#656565}
/*块状列表*/
.square-list{width: 100%;box-sizing: border-box;margin-top:20px}
.square-list{width: 100%;box-sizing: border-box;margin-top:20px;flex-wrap:wrap;display:flex;}
.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; */
@ -3765,3 +3770,7 @@ a.singlepublishtwo{
.fontweight400{
font-weight: 400 !important;
}
.fontweightbold{
font-weight: bold !important;
}

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

@ -817,3 +817,7 @@ html>body #ajax-indicator { position: fixed; }
padding: 0px;
}
.educontentysl{width: 1250px;margin:0px auto;box-sizing: border-box}/*中间部分宽度固定为1200*/
.footer_con-p{
color: #898989 !important;
}
Write Preview
Loading…
Cancel
Save