diff --git a/public/css/edu-all.css b/public/css/edu-all.css index 6485f231..22dd9995 100644 --- a/public/css/edu-all.css +++ b/public/css/edu-all.css @@ -38,6 +38,29 @@ box-sizing: border-box; } +.head-nav ul#header-nav li { + float: left; + height: 60px; + line-height: 60px; + margin-right: 30px; + cursor: pointer; + position: relative; + font-size: 16px +} + + +.head-nav ul#header-nav li.active:after { + content: ''; + position: absolute; + left: 0px; + top: auto; + bottom: 10px; + right: auto; + height: 2px; + width: 14px; + background-color: #459be5; +} + .nav-img { position: absolute; top: 2px; @@ -269,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 f721824b..ff65f940 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -3957,7 +3957,7 @@ html>body #ajax-indicator { display: block; height: 100%; width: 100%; - color: #333; + color: #fff; font-size: 16px; } @@ -4088,6 +4088,17 @@ em.vertical-line { /* 右侧内容宽度变化的话，需要调整posi-search right的值*/ +.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; } diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index 00e46b6f..f204b7b8 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/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index 0561d629..5ec9e6fb 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -752,7 +752,7 @@ class NewHeader extends Component {
{this.props.user && this.props.user.login &&
- +
{ @@ -774,7 +774,7 @@ class NewHeader extends Component {
{user && user.login && - + @@ -810,7 +810,7 @@ class NewHeader extends Component {
{user === undefined ? - this.educoderlogin()} className="mr5 color-grey-6">登录 + this.educoderlogin()} className="mr5 color-white">登录 { settings && settings.common && settings.common.register && 注册 @@ -818,7 +818,7 @@ class NewHeader extends Component { : user.login === "" ? - this.educoderlogin()} className="mr5 color-grey-6">登录 + this.educoderlogin()} className="mr5 color-white">登录 { settings && settings.common && settings.common.register && 注册 diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index 859ddcf9..75ea6890 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -27,13 +27,13 @@ body>.-task-title { width: 100%; height:70px; min-width: 1200px; - z-index: 1000; - background:rgba(255,255,255,1); + z-index: 10000; + background:#242424; position: fixed; box-shadow: 0px 0px 14px rgb(0 0 0 / 10%); } .headerContent{ - width:1200px; + padding:0px 25px; margin:0px auto; display: flex; align-items: center; @@ -329,4 +329,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