diff --git a/public/css/edu-all.css b/public/css/edu-all.css index b8a55807..22dd9995 100644 --- a/public/css/edu-all.css +++ b/public/css/edu-all.css @@ -48,55 +48,6 @@ font-size: 16px } -.head-nav ul#header-nav li a { - display: block; - height: 100%; - width: 100%; - color: #fff -} - -.head-nav ul#header-nav li a:hover { - color: #cccccc; -} - -.head-nav ul#header-nav li:last-child { - margin-right: 0px -} - -.head-nav ul#header-nav li.active a { - color: #459be5 !important; -} - -.head-nav ul#header-nav li.active p { - color: #459be5 !important; -} - -.head-nav ul#header-nav li p:hover { - color: #cccccc; -} - -.head-nav ul#header-nav li p { - display: block; - height: 100%; - width: 100%; - color: #fff -} - -.head-nav ul#header-nav li.active div ul li a { - color: #000 !important; -} - -.head-nav ul#header-nav li.active div ul li a:hover { - color: #FFF !important; -} - -.head-nav ul#header-nav li.active ul li a { - color: #000 !important; -} - -.head-nav ul#header-nav li.active ul li a:hover { - color: #FFF !important; -} .head-nav ul#header-nav li.active:after { content: ''; @@ -341,10 +292,6 @@ em.vertical-line { overflow: hidden; } -/*底部*/ -.newFooter { - max-height: 110px; -} .newFooter { position: absolute; diff --git a/public/css/edu-common.css b/public/css/edu-common.css index 96a8277d..f2ac9e67 100755 --- a/public/css/edu-common.css +++ b/public/css/edu-common.css @@ -25,9 +25,6 @@ html { min-width: 1200px } -.newFooter { - max-height: 110px; -} .newFooter { position: absolute; diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index 80fb12a6..fd137b91 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -3978,7 +3978,7 @@ html>body #ajax-indicator { display: block; height: 100%; width: 100%; - color: #333; + color: #fff; font-size: 16px; } @@ -4108,10 +4108,6 @@ em.vertical-line { /* 右侧内容宽度变化的话,需要调整posi-search right的值*/ -/*底部*/ -.newFooter { - max-height: 110px; -} .newFooter { position: absolute; diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index cd82840e..be31684d 100644 --- a/src/forge/css/index.scss +++ b/src/forge/css/index.scss @@ -3,6 +3,7 @@ ul,ol,dl{ } .newMain{ background-color: #fff; + padding-bottom: 810px; } .color-black{ color: #333; diff --git a/src/index.css b/src/index.css index cd6f30b9..8f035dfb 100644 --- a/src/index.css +++ b/src/index.css @@ -76,7 +76,6 @@ li { min-width: 1200px; z-index: 8; left: 0px; - max-height: 110px; } .markdown-body { diff --git a/src/modules/tpm/NewFooter.js b/src/modules/tpm/NewFooter.js index 65f89eeb..5909a39a 100644 --- a/src/modules/tpm/NewFooter.js +++ b/src/modules/tpm/NewFooter.js @@ -1,8 +1,4 @@ import React, { Component } from 'react'; -import moment from 'moment'; -import { Link } from 'react-router-dom'; - - class NewFooter extends Component { constructor(props) { super(props) @@ -30,47 +26,9 @@ class NewFooter extends Component { const {forge_footer} = this.state; return (
- { forge_footer && this.showhtml(forge_footer) } - - {/*
*/} - {/**/} - {/*
*/} - {/*
*/} - {/*

*/} - {/*© {moment().year()} EduCoder*/} - {/*湘ICP备17009477号*/} - {/**/} - {/*湘公网安备43019002000962号*/} - {/**/} - {/*Trustie   &   IntelliDE inside. 版权所有 湖南智擎科技有限公司*/} - {/*

*/} - {/*
*/} - {/*
*/}
); } diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index daaefca9..d60ad321 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -756,7 +756,7 @@ class NewHeader extends Component {
{this.props.user && this.props.user.login &&
- +
{ @@ -774,7 +774,7 @@ class NewHeader extends Component {
{user && user.login && - + @@ -810,18 +810,18 @@ class NewHeader extends Component {
{user === undefined ? - this.educoderlogin()} className="mr5 color-grey-6">登录 + this.educoderlogin()} className="mr5 color-white">登录 { mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url && - 注册 + 注册 } : user.login === "" ? - this.educoderlogin()} className="mr5 color-grey-6">登录 + this.educoderlogin()} className="mr5 color-white">登录 { mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url && - 注册 + 注册 } : diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index 094e41f0..00afd562 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -29,11 +29,11 @@ body>.-task-title { height:70px; min-width: 1200px; z-index: 10000; - background:rgba(255,255,255,1); + background:#242424; position: fixed; } .headerContent{ - width:1200px; + padding:0px 25px; margin:0px auto; display: flex; align-items: center; @@ -411,4 +411,134 @@ body>.-task-title { .progress-container { flex: 1 0 0; margin-left: 20px; +} +.newFooter > div{ + padding: 90px 20px; + display: -ms-flexbox; + display: flex; + -ms-flex-pack: center; + justify-content: center; + -ms-flex-align: start; + align-items: flex-start; + background: #242424; + min-width: 1200px; +} + +.newFooter .module-list{ + width: 200px; + text-align: left; +} +.newFooter .module-list>.title{ + font-size: 16px; + color: #ddd; + margin-bottom: 20px; + font-weight: 400; + background-color: transparent; + border: none; + padding: 0px; +} +.newFooter .module-list>a { + display: block; + color: #bbb; + line-height: 34px; + font-weight: 300; + font-size: 12px; +} +.newFooter .module-introduce{ + display: flex; + -ms-flex-direction: column; + flex-direction: column; + -ms-flex-align: center; + align-items: center; + width: 290px; + margin-top: -12px; +} +.newFooter .module-introduce p { + font-size: 12px; + color: #bbb; + line-height: 32px; + margin-top: 12px; + font-weight: 300; + text-align: justify; +} +.module-introduce ul { + display: -ms-flexbox; + display: flex; + -ms-flex-pack: distribute; + justify-content: space-around; + padding: 0; + margin-top: 20px; +} +.module-introduce ul { + display: -ms-flexbox; + display: flex; + -ms-flex-pack: distribute; + justify-content: space-around; + padding: 0; + margin-top: 20px; +} +.module-introduce ul li:first-child { + margin-right: 50px; +} +.module-introduce ul li { + display: -ms-flexbox; + display: flex; + -ms-flex-direction: column; + flex-direction: column; + -ms-flex-pack: center; + justify-content: center; + -ms-flex-align: center; + align-items: center; +} +.module-introduce ul li>span { + font-size: 12px; + color: #bbb; + padding-top: 10px; +} +.module-introduce ol { + margin-top: 16px; + display: -ms-flexbox; + display: flex; + -ms-flex-pack: distribute; + justify-content: space-around; + padding: 0; + height: 108px; + width: 100%; +} +.module-introduce ol li { + height: 100%; + display: -ms-flexbox; + display: flex; + -ms-flex-direction: column; + flex-direction: column; + -ms-flex-pack: justify; + justify-content: space-between; + -ms-flex-align: center; + align-items: center; +} +.module-introduce ol li a { + font-size: 14px; + color: #bbb; + margin-top: 20px; +} +.module-introduce section { + width: 100%; + height: 115px; + display: -ms-flexbox; + display: flex; + -ms-flex-direction: column; + flex-direction: column; + -ms-flex-pack: justify; + justify-content: space-between; + -ms-flex-align: start; + align-items: flex-start; + font-size: 14px; + color: #bbb; + font-weight: 300; +} +.module-introduce .footer-line { + width: 310px; + height: 1px; + background-color: #3e4042; + margin: 32px 0; } \ No newline at end of file