diff --git a/public/react/src/modules/tpm/NewFooter.js b/public/react/src/modules/tpm/NewFooter.js index 12cede329..7f8cd502c 100644 --- a/public/react/src/modules/tpm/NewFooter.js +++ b/public/react/src/modules/tpm/NewFooter.js @@ -19,13 +19,13 @@ class NewFooter extends Component {
-
+ {/*
高校智能化教学与实训平台 EduCoder.net -
+
*/}
  • 网站首页
  • 关于我们
  • diff --git a/public/react/src/modules/tpm/TPMIndex.css b/public/react/src/modules/tpm/TPMIndex.css index 94d7cb0d7..4e6ba198b 100644 --- a/public/react/src/modules/tpm/TPMIndex.css +++ b/public/react/src/modules/tpm/TPMIndex.css @@ -54,10 +54,7 @@ body>.-task-title { margin-top:0px; } /*Main START*/ -.newMain { - /* 330̫���ˣ�*/ - padding-bottom: 240px !important; -} + .newContainer{ background: #fafafa!important; diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index 7a568c99f..2beb9fa1b 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -35,11 +35,11 @@ if (!window['indexHOCLoaded']) { .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?1525440977`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1525440977`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1525440978`)); // index.html有加载 $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1525440977`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1525440978`)); // $('head').append($('') diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index a73738c86..50c5af396 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -55,6 +55,8 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} .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;} +/* 去掉了logo */ +.newFooter{ 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} diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 4c9bc616a..3777201b4 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -170,6 +170,7 @@ input::-ms-clear{display:none;} .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;} .educontent{width: 1200px;margin:0px auto;box-sizing: border-box}/*中间部分宽度固定为1200*/ .newMain{ margin: 0 auto; padding-bottom: 235px; min-width:1200px;padding-top: 60px}/*padding-bottom根据底部的高度而定*/ +.newMain{ padding-bottom: 120px !important; } /*高度*/ .height-100{height: 100%;}