From d96611893f2ad9e4afa8864efe69fb0befbf6537 Mon Sep 17 00:00:00 2001 From: caishi Date: Fri, 29 Oct 2021 18:38:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=EF=BC=9A=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E3=80=81=E5=BA=95=E9=83=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 6 +-- public/css/edu-purge.css | 14 +++--- src/Nav/Footer.jsx | 5 +-- src/Nav/Index.scss | 82 ++++++++++++++++++++++++++++++++++++ src/forge/css/index.scss | 1 + src/modules/tpm/NewHeader.js | 12 +++--- src/modules/tpm/TPMIndex.css | 6 +-- 7 files changed, 103 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 89bf59ba4..d57477386 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1959,7 +1959,7 @@ }, "babel-plugin-transform-runtime": { "version": "6.23.0", - "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-runtime/download/babel-plugin-transform-runtime-6.23.0.tgz", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz", "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", "requires": { "babel-runtime": "^6.22.0" @@ -2029,7 +2029,7 @@ }, "babel-preset-react": { "version": "6.24.1", - "resolved": "https://registry.npm.taobao.org/babel-preset-react/download/babel-preset-react-6.24.1.tgz", + "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz", "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=", "requires": { "babel-plugin-syntax-jsx": "^6.3.13", @@ -3326,7 +3326,7 @@ }, "code-prettify": { "version": "0.1.0", - "resolved": "https://registry.npm.taobao.org/code-prettify/download/code-prettify-0.1.0.tgz", + "resolved": "https://registry.npmjs.org/code-prettify/-/code-prettify-0.1.0.tgz", "integrity": "sha1-RocMyMGlDQm61TmzOpg9vUqjSx4=" }, "codemirror": { diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index eda246bdf..e7008aeda 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -3947,7 +3947,7 @@ html>body #ajax-indicator { .head-nav { text-align: center; - height: 70px; + height: 58px; box-sizing: border-box; min-width: 780px; overflow: hidden; @@ -3960,14 +3960,14 @@ html>body #ajax-indicator { position: absolute; top: 0px; z-index: 3; - height: 70px; + height: 58px; box-sizing: border-box; } .head-nav ul#header-nav li { float: left; - height: 70px; - line-height: 70px; + height: 58px; + line-height: 58px; cursor: pointer; position: relative; font-size: 16px; @@ -3978,13 +3978,13 @@ html>body #ajax-indicator { display: block; height: 100%; width: 100%; - color: #333; + color: #fff; font-size: 16px; } -.head-nav ul#header-nav li a:hover,.head-nav ul#header-nav li.active a { +/* .head-nav ul#header-nav li a:hover,.head-nav ul#header-nav li.active a { color: #5091FF; -} +} */ .head-nav ul#header-nav li:last-child { margin-right: 0px diff --git a/src/Nav/Footer.jsx b/src/Nav/Footer.jsx index eb3019e28..adb6a05e5 100644 --- a/src/Nav/Footer.jsx +++ b/src/Nav/Footer.jsx @@ -19,9 +19,7 @@ function Footer(){ return(
-
-
- {value && showhtml(value)} + {value && showhtml(value)} {/*
  • 社区
    • @@ -59,7 +57,6 @@ function Footer(){

© Copyright 2007~2021 国防科技大学Trustie团队 & IntelliDE 湘ICP备 17009477号

*/} -
) } diff --git a/src/Nav/Index.scss b/src/Nav/Index.scss index 0ae8f48e2..444edaba3 100644 --- a/src/Nav/Index.scss +++ b/src/Nav/Index.scss @@ -65,4 +65,86 @@ } } } +} + + +.footEdition{ + background-color: #171B23; + .footContent{ + display: flex; + align-items: flex-start; + padding:86px 0px; + justify-content: space-around; + width: 1200px; + margin:0px auto; + ul{ + min-width: 120px; + text-align: left; + margin-right: 80px; + &.center{ + text-align: center; + } + &>p{ + height: 22px; + font-size: 16px; + font-weight: 400; + color: #FFFFFF; + line-height: 22px; + } + &>img{ + width: 100px; + height: 100%; + margin-bottom: 30px; + margin-top: 25px; + border-radius: 10px; + } + li{ + height: 20px; + font-size: 14px; + font-weight: 400; + line-height: 20px; + color: #BDC2D1; + margin-bottom: 15px!important; + a{ + color: #BDC2D1!important; + &:hover{ + text-decoration: underline; + } + } + &.thehead{ + height: 25px; + font-size: 18px; + font-weight: 600; + color: #FFFFFF; + line-height: 25px; + margin-bottom: 20px!important; + } + } + .theline{ + .imgCon{ + width: 90px; + height: 90px; + padding:5px; + border-radius: 4px; + background-color: #fff; + img{ + width: 100%; + border-radius: 3px; + } + } + } + } + } +} +.copyrightDesc{ + font-size: 12px; + font-weight: 400; + color: #BDC2D1; + line-height: 28px; + padding:15px 0px; + text-align: center; + background-color: #1B212C; + a{ + color: #BDC2D1!important; + } } \ No newline at end of file diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index d3599fc06..73d6305d1 100644 --- a/src/forge/css/index.scss +++ b/src/forge/css/index.scss @@ -200,3 +200,4 @@ form{ padding:0px; } } + diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index 6992e5e27..d0cff43d4 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -754,7 +754,7 @@ class NewHeader extends Component {
{this.props.user && this.props.user.login &&
- +
{ @@ -772,7 +772,7 @@ class NewHeader extends Component {
{user && user.login && - + @@ -808,18 +808,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 00a66e2ba..7d867bf4d 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -27,14 +27,14 @@ body>.-task-title { .newHeaders{ max-width: unset; width: 100%; - height:70px; + height:58px; min-width: 1200px; z-index: 10000; - background:rgba(255,255,255,1); + background:#1b2440; position: fixed; } .headerContent{ - width:1200px; + padding:0 30px ; margin:0px auto; display: flex; align-items: center;