From 776ebfdef594a6f2c8b396f015ba3978d094598d Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 16 Sep 2020 17:09:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/edu-purge.css | 35 ++++++++++++++++------------------- src/modules/tpm/NewHeader.js | 4 ++-- src/modules/tpm/TPMIndex.css | 4 +++- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index 788f821c..30212af1 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -3944,7 +3944,7 @@ html>body #ajax-indicator { .head-nav { text-align: center; - height: 60px; + height: 70px; box-sizing: border-box; min-width: 780px; overflow: hidden; @@ -3957,25 +3957,25 @@ html>body #ajax-indicator { position: absolute; top: 0px; z-index: 3; - height: 60px; + height: 70px; box-sizing: border-box; } .head-nav ul#header-nav li { float: left; - height: 60px; - line-height: 60px; - margin-right: 30px; + height: 70px; + line-height: 70px; cursor: pointer; position: relative; font-size: 16px; + padding:0px 20px; } .head-nav ul#header-nav li a { display: block; height: 100%; width: 100%; - color: #333333; + color: #fff; font-size: 16px; } @@ -3987,13 +3987,10 @@ html>body #ajax-indicator { margin-right: 0px } -.head-nav ul#header-nav li.active a:first-child { - color: #459be5 !important; +.head-nav ul#header-nav li.active{ + background-color: #3B3B3B; } -.head-nav ul#header-nav li.active p { - color: #459be5 !important; -} .head-nav ul#header-nav li p:hover { color: #cccccc; @@ -4006,23 +4003,23 @@ html>body #ajax-indicator { color: #fff } -.head-nav ul#header-nav li.active div ul li a { +/* .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 { +/* .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 { +/* .head-nav ul#header-nav li.active ul li a:hover { color: #FFF !important; -} +} */ -.head-nav ul#header-nav li.active:after { +/* .head-nav ul#header-nav li.active:after { content: ''; position: absolute; left: 0px; @@ -4032,7 +4029,7 @@ html>body #ajax-indicator { height: 2px; width: 32px; background-color: #459be5; -} +} */ .head-right { box-sizing: border-box; diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index cc33d4d1..167a3545 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -766,7 +766,7 @@ class NewHeader extends Component {
{this.props.user && this.props.user.login ?
- +
{/*
    @@ -794,7 +794,7 @@ class NewHeader extends Component {
    {user && user.login && - + diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index 1f40ed79..f47632d3 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -21,10 +21,11 @@ body>.-task-title { height: 100%; min-height: 100%; overflow: hidden; + padding-top:70px; } .newHeaders{ max-width: unset; - background: #fff !important; + background: #2B2A2A !important; width: 100%; height:70px; min-width: 1200px; @@ -32,6 +33,7 @@ body>.-task-title { -moz-box-shadow: 0px 2px 10px 0px rgba(0,0,0,0.1); background:rgba(255,255,255,1); box-shadow:0px 2px 10px 0px rgba(0,0,0,0.1); + position: fixed; } .headerContent{ width:1200px;