junru0303
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge后稍微修改样式

This commit is contained in:
caishi 2022-04-12 17:06:28 +08:00
parent 3a717d818a
commit 3e98988f83
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.js
View File

@ -417,7 +417,7 @@ class App extends Component {
<Route exact path="/"
render={
(props) => (
<Home {...props} {...this.props} {...this.state}/>
<Projects {...props} {...this.props} {...this.state}/>
)
}
/>

21
src/forge/Head/Header.js
View File

@ -375,7 +375,7 @@ class NewHeader extends Component {
} = this.state;
let search_url = settings && settings.common && settings.common.search;
return (
<div className={publicNav ? `newHeaders publicNav`:`newHeaders`} id="nHeader">
<div className={`newHeaders`} id="nHeader">
<Engineer QQVisible={QQVisible} setQQVisible={this.setQQVisible}/>
<div className="headerContent">
{isRender === true ?
@ -391,14 +391,14 @@ class NewHeader extends Component {
{...this.props}
{...this.state}
/> : ""}
<div style={{width:"78px"}}>
{/* <div style={{width:"78px"}}>
{
publicNav &&
<a href={'https://www.ccf.org.cn/'} className={"fl"}>
<img src={MainLogo} alt="ccf" width="63px"/>
</a>
}
</div>
</div> */}
{
settings && settings.nav_logo_url ?
<a href={settings && settings.new_course.default_url} className={"fl mr50"}>
@ -414,22 +414,7 @@ class NewHeader extends Component {
{
settings.navbar && settings.navbar.map((item, key) => {
var new_link = item.link;
// var user_login = current_user && current_user.login;
var is_hidden = item.hidden;
// if (new_link && (new_link.indexOf("courses") > -1 || new_link.indexOf("contests") > -1)) {
// if (user_login) {
// if (new_link.indexOf("courses") > -1) {
// new_link = new_link.replace(/courses/g, user_login + "/courses")
// } else if (new_link.indexOf("contests") > -1) {
// new_link = new_link.replace(/contests/g, user_login + "/contests")
// }
// } else {
// is_hidden = true
// }
// }
// if (user_login && (new_link && new_link.indexOf("homes") > -1)) {
// new_link = new_link.replace(/homes/g, user_login + "/user_activities")
// }
var waiLian = (new_link && str.filter(item=>new_link.indexOf(item)>-1) );
var wl = waiLian && waiLian.length>0;
return (

2
src/modules/tpm/TPMIndexHOC.js
View File

@ -267,7 +267,7 @@ export function TPMIndexHOC(WrappedComponent) {
size="large" tip={this._gLoadingTip || "加载中..."}
>
<div className="newContainer newContainers">
{!publicNav && <div style={{height:"58px"}}></div> }
<div style={{height:"58px"}}></div>
<div style={{minHeight:"60vh"}}>
{
current_user &&