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

导航栏和底部

This commit is contained in:
caishi 2021-03-22 13:51:02 +08:00
parent 76c88a659a
commit 83086e7d61
8 changed files with 140 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
public/css/edu-all.css
View File

@ -48,55 +48,6 @@
font-size: 16px
}
.head-nav ul#header-nav li a {
display: block;
height: 100%;
width: 100%;
color: #fff
}
.head-nav ul#header-nav li a:hover {
color: #cccccc;
}
.head-nav ul#header-nav li:last-child {
margin-right: 0px
}
.head-nav ul#header-nav li.active a {
color: #459be5 !important;
}
.head-nav ul#header-nav li.active p {
color: #459be5 !important;
}
.head-nav ul#header-nav li p:hover {
color: #cccccc;
}
.head-nav ul#header-nav li p {
display: block;
height: 100%;
width: 100%;
color: #fff
}
.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 {
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 {
color: #FFF !important;
}
.head-nav ul#header-nav li.active:after {
content: '';
@ -341,10 +292,6 @@ em.vertical-line {
overflow: hidden;
}
/*底部*/
.newFooter {
max-height: 110px;
}
.newFooter {
position: absolute;

3
public/css/edu-common.css
View File

@ -25,9 +25,6 @@ html {
min-width: 1200px
}
.newFooter {
max-height: 110px;
}
.newFooter {
position: absolute;

6
public/css/edu-purge.css
View File

@ -3978,7 +3978,7 @@ html>body #ajax-indicator {
display: block;
height: 100%;
width: 100%;
color: #333;
color: #fff;
font-size: 16px;
}
@ -4108,10 +4108,6 @@ em.vertical-line {
/* 右侧内容宽度变化的话，需要调整posi-search right的值*/
/*底部*/
.newFooter {
max-height: 110px;
}
.newFooter {
position: absolute;

1
src/forge/css/index.scss
View File

@ -3,6 +3,7 @@ ul,ol,dl{
}
.newMain{
background-color: #fff;
padding-bottom: 810px;
}
.color-black{
color: #333;

1
src/index.css
View File

@ -76,7 +76,6 @@ li {
min-width: 1200px;
z-index: 8;
left: 0px;
max-height: 110px;
}
.markdown-body {

42
src/modules/tpm/NewFooter.js
View File

@ -1,8 +1,4 @@
import React, { Component } from 'react';
import moment from 'moment';
import { Link } from 'react-router-dom';
class NewFooter extends Component {
constructor(props) {
super(props)
@ -30,47 +26,9 @@ class NewFooter extends Component {
const {forge_footer} = this.state;
return (
<div className="newFooter edu-txt-center ">
<style>
{
`
.newFooter {
max-height: 140px !important;
padding-bottom: 20px !important;
}
p {
margin-top: 0;
margin-bottom:0px !important;
}
`
}
</style>
{
forge_footer && this.showhtml(forge_footer)
}
{/*<div className="inner-footer_con">*/}
{/*<ul className="clearfix inner-footernav">*/}
{/*<li><a href="/" className="fl" target="_blank">网站首页</a></li>*/}
{/*<li><Link to="/help/about_us" className="fl" target="_blank">关于我们</Link></li>*/}
{/*<li><Link to="/help/contact_us" className="fl" target="_blank">联系我们</Link></li>*/}
{/*<li><Link to="/help/cooperatives" className="fl" target="_blank">合作伙伴</Link></li>*/}
{/*<li><Link to="/help/agreement" className="fl" target="_blank">服务协议</Link></li>*/}
{/*<li><Link to="/help/help_center" className="fl" target="_blank">帮助中心</Link></li>*/}
{/*<li><Link to="/help/feedback" className="fl" target="_blank">意见反馈</Link></li>*/}
{/*</ul>*/}
{/*</div>*/}
{/*<div>*/}
{/*<p className="footer_con-p inline lineh-30 font-14">*/}
{/*<span className="font-18 fl">©</span>&nbsp;{moment().year()}&nbsp;EduCoder*/}
{/*<a style={{"color":"#888"}} target="_blank" href="http://beian.miit.gov.cn/" className="ml15 mr15">湘ICP备17009477号</a>*/}
{/*<a style={{"color":"#888"}} target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=43019002000962" className="mr15">*/}
{/*<img className="vertical4" src={require('./beian.png')}/>湘公网安备43019002000962号*/}
{/*</a>*/}
{/*<a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside. <span*/}
{/*className="mr15">版权所有 湖南智擎科技有限公司</span>*/}
{/*</p>*/}
{/*</div>*/}
{/*<div className="cl"></div>*/}
</div>
);
}

12
src/modules/tpm/NewHeader.js
View File

@ -756,7 +756,7 @@ class NewHeader extends Component {
<div className="head-right">
{this.props.user && this.props.user.login &&
<div className="edu-menu-panel">
<i className="iconfont icon-tianjiafangda color-grey-6"></i>
<i className="iconfont icon-tianjiafangda color-white"></i>
<div className="edu-menu-list" style={{ top: '48px' }}>
<div className="overPart"></div>
{
@ -774,7 +774,7 @@ class NewHeader extends Component {
<div className="ml30 edu-menu-panel">
{user && user.login &&
<a href={`${mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.tiding_url}`} style={{ position: 'relative' }} target="_blank">
<i className="iconfont icon-xiaoxilingdang color-grey-6"></i>
<i className="iconfont icon-xiaoxilingdang color-white"></i>
<span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
</span>
</a>
@ -810,18 +810,18 @@ class NewHeader extends Component {
</div>
{user === undefined ?
<span className="font-15">
<a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
<a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</a>
{
mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url &&
<span><em className="vertical-line"></em><a className="ml5 color-grey-6" href={`${mygetHelmetapi2.new_course.register_url}`} target="_blank">注册</a></span>
<span><em className="vertical-line"></em><a className="ml5 color-white" href={`${mygetHelmetapi2.new_course.register_url}`} target="_blank">注册</a></span>
}
</span>
: user.login === "" ?
<span className="font-15">
<a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
<a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</a>
{
mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url &&
<span><em className="vertical-line"></em><a className="color-grey-6 ml5" href={`${mygetHelmetapi2.new_course.register_url}`} target="_blank">注册</a></span>
<span><em className="vertical-line"></em><a className="color-white ml5" href={`${mygetHelmetapi2.new_course.register_url}`} target="_blank">注册</a></span>
}
</span>
:

134
src/modules/tpm/TPMIndex.css
View File

@ -29,11 +29,11 @@ body>.-task-title {
height:70px;
min-width: 1200px;
z-index: 10000;
background:rgba(255,255,255,1);
background:#242424;
position: fixed;
}
.headerContent{
width:1200px;
padding:0px 25px;
margin:0px auto;
display: flex;
align-items: center;
@ -411,4 +411,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;
}