This commit is contained in:
caishi 2023-04-07 14:36:14 +08:00
parent b3639e4052
commit ebe3d1df2c
2 changed files with 22 additions and 9 deletions

View File

@ -3993,7 +3993,9 @@ html>body #ajax-indicator {
.downMenus li:hover aside{ .downMenus li:hover aside{
color: #165dff!important; color: #165dff!important;
} }
.namediv{
display: flex;
}
.head-nav ul#header-nav li a { .head-nav ul#header-nav li a {
display: flex; display: flex;
align-items: center; align-items: center;
@ -4001,19 +4003,27 @@ html>body #ajax-indicator {
width: 100%; width: 100%;
color: #fff; color: #fff;
font-size: 16px; font-size: 16px;
position: relative;
} }
.head-nav ul#header-nav li a:hover{ .head-nav ul#header-nav li a:hover{
color: #c5c5c5!important; color: #c5c5c5!important;
} }
#header-nav li a i{ #header-nav li .namediv i{
font-size: 14px!important; font-size: 14px!important;
display: inline-block; display: inline-block;
color: #979797; color: #979797;
margin:0px 3.58px 0px 3px; margin:0px 3.58px 0px 3px;
transform: translateY(0.5px);
} }
#header-nav li.active a::before{
.head-nav ul#header-nav li a:hover,.head-nav ul#header-nav li.active a { content: '';
color: #5091FF; width: 100%;
height: 2px;
background: #c5c5c5;
position: absolute;
bottom: 12px;
left: 0;
border-radius: 1px;
} }
.head-nav ul#header-nav li:last-child { .head-nav ul#header-nav li:last-child {

View File

@ -384,7 +384,7 @@ class NewHeader extends Component {
{ {
item.map((i,k)=>{ item.map((i,k)=>{
return( return(
!i.hidden && <li onClick={()=>{window.location.href=`https://data.educoder.net${i.link}`}}> !i.hidden && <li onClick={()=>{window.location.href=`https://www.educoder.net${i.link}`}}>
{k!==0 &&<Divider />} {k!==0 &&<Divider />}
<aside className="font-16 color-ooo">{i.name}</aside> <aside className="font-16 color-ooo">{i.name}</aside>
<div className="font-14" style={{color:"rgb(159, 167, 179)",whiteSpace:'nowrap'}}>{i.content}</div> <div className="font-14" style={{color:"rgb(159, 167, 179)",whiteSpace:'nowrap'}}>{i.content}</div>
@ -450,11 +450,14 @@ class NewHeader extends Component {
var new_link = item.link; var new_link = item.link;
var is_hidden = item.hidden; var is_hidden = item.hidden;
return ( return (
<li key={key} onClick={() => this.headtypesonClick(item.link, true)} className={`${((isPath && item.name === "大学开源") || this.matchpaths(item.link) === true) ? 'pr active' : 'pr'}`} style={!is_hidden ? { display: 'flex' } : { display: 'none' }}> <li key={key} onClick={() => this.headtypesonClick(item.link, true)} className={`${((isPath && item.name === "大学开源") || this.matchpaths(item.link) === true) ? 'pr active' : 'pr'}`} style={!is_hidden ? { display: 'block' } : { display: 'none' }}>
{ {
item.subitem && item.subitem.length>0 ? item.subitem && item.subitem.length>0 ?
<Dropdown overlay={this.menus(item.subitem)}> <Dropdown overlay={this.menus(item.subitem)}>
<a href={new_link} ><div dangerouslySetInnerHTML={{ __html: item.name }}></div><i className="iconfont icon-xiala1"></i></a> <div className="namediv">
<a href={new_link} ><div dangerouslySetInnerHTML={{ __html: item.name }}></div> </a>
<i className="iconfont icon-xiala1"></i>
</div>
</Dropdown> </Dropdown>
: :
<a href={new_link} ><div dangerouslySetInnerHTML={{ __html: item.name }}></div></a> <a href={new_link} ><div dangerouslySetInnerHTML={{ __html: item.name }}></div></a>
@ -502,7 +505,7 @@ class NewHeader extends Component {
</span> </span>
: :
<Dropdown placement={`bottomRight`} overlay={this.renderMenu(settings && settings.personal)}> <Dropdown placement={`bottomRight`} overlay={this.renderMenu(settings && settings.personal)}>
<div className="ml15"> <div className="ml15" style={{display:"flex"}}>
<a href={`/${this.props.current_user && this.props.current_user.login}`}> <a href={`/${this.props.current_user && this.props.current_user.login}`}>
<img alt="头像" src={getImageUrl(`/${user.image_url}`)} className="currentImg"></img> <img alt="头像" src={getImageUrl(`/${user.image_url}`)} className="currentImg"></img>
</a> </a>