diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index 8fe59797..bf9e791b 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; overflow: hidden; text-overflow: ellipsis; @@ -3959,14 +3959,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; @@ -3992,10 +3992,6 @@ html>body #ajax-indicator { margin-right: 0px } -.head-nav ul#header-nav li.active{ - /* background-color: #3B3B3B; */ -} - .head-nav ul#header-nav li p:hover { color: #cccccc; @@ -6714,13 +6710,10 @@ p{ right: 0px; top:4px; color: #999; -<<<<<<< HEAD -======= } .ant-input, .ant-input .ant-input-suffix{ background-color: #fff!important; } .has-error .ant-input{ background-color: #FEF1F0!important; ->>>>>>> pre_develop } \ No newline at end of file diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 622eef3c..76423e38 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -279,7 +279,7 @@ class NewHeader extends Component { }; render() { - const { match ,resetUserInfo ,showNotification} = this.props; + const { match ,resetUserInfo ,showNotification,publicNav} = this.props; let current_user = this.props.user; let { AccountProfiletype, @@ -368,7 +368,7 @@ class NewHeader extends Component { let search_url = settings && settings.common && settings.common.search; return ( -
+
{isRender === true ?
开源项目 - 更多 + 更多
@@ -85,10 +85,10 @@ function Index() { projectsList.map((i,k)=>{ return(
  • - +
    - {i.author && i.author.name}/{i.name} + {i.author && i.author.name}/{i.name} {i.praises_count > 0 ? {i.praises_count} :"" } {i.forked_count > 0 ? {i.forked_count}:""}
    @@ -113,9 +113,12 @@ function Index() { }
    -
    - 查看更多开源项目 -
    + { + projectsList && projectsList.length > 0 && +
    + 查看更多开源项目 +
    + }
    • diff --git a/src/forge/Main/projecthome/Index.scss b/src/forge/Main/projecthome/Index.scss index 43e8bae6..e83b44c2 100644 --- a/src/forge/Main/projecthome/Index.scss +++ b/src/forge/Main/projecthome/Index.scss @@ -318,7 +318,6 @@ background: url('../img/index/typebg.png'); background-size: 100% 100%; box-shadow: 0px 0px 4px 5px rgba(0, 0, 0, 0.02); - padding:12px 0px; a{ padding:0px 20px; height: 44px; @@ -413,7 +412,7 @@ height: 20px; line-height: 20px; display: flex; - align-items: flex-end; + align-items: center; .category{ position: relative; padding-left: 11px; @@ -439,7 +438,7 @@ height: 10px; border-radius: 50%; border-left: 1px solid #9e9e9e; - bottom: 4px; + bottom: 5px; left: 0px; } } diff --git a/src/forge/Main/projecthome/SubBanner.jsx b/src/forge/Main/projecthome/SubBanner.jsx index 7e8c1a63..cb6ff604 100644 --- a/src/forge/Main/projecthome/SubBanner.jsx +++ b/src/forge/Main/projecthome/SubBanner.jsx @@ -52,7 +52,7 @@ function SubBanner() {

    新一代开源创新服务平台

    -

    Gitlink（确实开源）-CCF官网指定的产学研融合面向软件开源创新的开源社区

    +

    GitLink（确实开源）-CCF官网指定的产学研融合面向软件开源创新的开源社区

    { list && list.length > 0 ? diff --git a/src/forge/Main/projecthome/SubList.jsx b/src/forge/Main/projecthome/SubList.jsx index 56510392..94727e8a 100644 --- a/src/forge/Main/projecthome/SubList.jsx +++ b/src/forge/Main/projecthome/SubList.jsx @@ -56,11 +56,11 @@ function SubList() { return(
  • - +
    - {i.name} + {i.name}

    - {i.project && i.project.name} + {i.project && i.project.name}

    @@ -84,7 +84,7 @@ function SubList() {
  • {k+1} - {i.owner && i.owner.name}/{i.name} + {i.owner && i.owner.name}/{i.name} {i.praises} @@ -113,7 +113,7 @@ function SubList() {
  • {k+1} - {i.owner && i.owner.name}/{i.name} + {i.owner && i.owner.name}/{i.name} {i.praises} diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js index e9aa1f95..edc655a4 100644 --- a/src/forge/New/Index.js +++ b/src/forge/New/Index.js @@ -289,7 +289,8 @@ class Index extends Component { let second = first.split('.')[0]; if(!second)return; this.props.form.setFieldsValue({ - repository_name:second + repository_name:second, + name:second }) }else{ this.props.form.setFieldsValue({ diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx index e4f5cf7a..6e98183f 100644 --- a/src/forge/Team/Setting/TeamSettingCommon.jsx +++ b/src/forge/Team/Setting/TeamSettingCommon.jsx @@ -181,7 +181,7 @@ export default Form.create()( )}

    选择头像:

    - +
    diff --git a/src/home/FifthEdition.jsx b/src/home/FifthEdition.jsx index 6e709b43..a34f9730 100644 --- a/src/home/FifthEdition.jsx +++ b/src/home/FifthEdition.jsx @@ -99,7 +99,7 @@ function FifthEdition() { { list && list.map((i,k)=>{ return( -
  • {i.name}/
    • +
  • {i.name}/
    • ) }) } @@ -109,7 +109,7 @@ function FifthEdition() { { list && list.map((i,k)=>{ return( -
  • {i.name}/
    • +
  • {i.name}/
    • ) }) } diff --git a/src/home/Index.jsx b/src/home/Index.jsx index f61ac90c..0f193df0 100644 --- a/src/home/Index.jsx +++ b/src/home/Index.jsx @@ -50,7 +50,7 @@ function Index(props) { return(
    -

    Gitlink，新一代开源创新服务平台

    +

    GitLink，新一代开源创新服务平台

    { flag && @@ -90,7 +90,7 @@ function Index(props) {
    -

    加入Gitlink，和社区伙伴们一起踏上开源创新的辉煌旅程！

    +

    加入GitLink，和社区伙伴们一起踏上开源创新的辉煌旅程！

    快速注册
    • @@ -118,10 +118,9 @@ function Index(props) {

      开源生态

      -

      Gitlink与各大企业、高校、科研机构开展广泛的技术合作，推动我国开源软件生态的快速构建与发展

      +

      GitLink与各大企业、高校、科研机构开展广泛的技术合作，推动我国开源软件生态的快速构建与发展

      -
    ) } diff --git a/src/home/Index.scss b/src/home/Index.scss index c62c3af9..4582f99a 100644 --- a/src/home/Index.scss +++ b/src/home/Index.scss @@ -1026,13 +1026,13 @@ body{ } } } - .copyrightDesc{ - font-size: 12px; - font-weight: 400; - color: #BDC2D1; - line-height: 28px; - padding:15px 0px; - text-align: center; - background-color: #1B212C; - } +} +.copyrightDesc{ + font-size: 12px; + font-weight: 400; + color: #BDC2D1; + line-height: 28px; + padding:15px 0px; + text-align: center; + background-color: #1B212C; } \ No newline at end of file diff --git a/src/home/ThirdEdition.jsx b/src/home/ThirdEdition.jsx index 395697d1..d83349cb 100644 --- a/src/home/ThirdEdition.jsx +++ b/src/home/ThirdEdition.jsx @@ -16,7 +16,7 @@ import './Index.scss'; const list1 = [ {name:"CCF开源发展委员会首批执行委员名单发布",src:"https://forum.trustie.net/forums/4666/detail",count:32,time:"2021-09-22"}, - {name:"Gitlink项目协同开发模块使用说明及问题反馈",src:"https://forum.trustie.net/forums/4665/detail",count:4,time:"2021-09-22"}, + {name:"GitLink项目协同开发模块使用说明及问题反馈",src:"https://forum.trustie.net/forums/4665/detail",count:4,time:"2021-09-22"}, {name:"MindSpore框架介绍及赛题说明",src:"https://forum.trustie.net/forums/4664/detail",count:3,time:"2021-09-22"}, {name:"OpenHarmony系统介绍及赛题说明",src:"https://forum.trustie.net/forums/4663/detail",count:4,time:"2021-09-22"}, {name:"openGauss系统介绍及赛题说明",src:"https://forum.trustie.net/forums/4662/detail",count:5,time:"2021-09-22"}, @@ -114,10 +114,10 @@ function ThirdEdition() {

    - {active === 1 ? "Gitlink分享最新平台资讯、社区活动通知、开源竞赛信息，把握开源生态发展脉搏" - : active===2 ? "Gitlink汇聚精英企业仓库、前沿技术仓库、人气热门仓库，孵化优质开源创新成果" - :active===3 ? "Gitlink集萃社区精选项目介绍、平台使用技巧等优秀文章，助力开源开放协同创新" - :"Gitlink甄选技术研究、心得体会、经验交流等高质量内容，推动社区健康稳定发展"} + {active === 1 ? "GitLink分享最新平台资讯、社区活动通知、开源竞赛信息，把握开源生态发展脉搏" + : active===2 ? "GitLink汇聚精英企业仓库、前沿技术仓库、人气热门仓库，孵化优质开源创新成果" + :active===3 ? "GitLink集萃社区精选项目介绍、平台使用技巧等优秀文章，助力开源开放协同创新" + :"GitLink甄选技术研究、心得体会、经验交流等高质量内容，推动社区健康稳定发展"}

    { active === 1&& diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index 8d513feb..40f3a35f 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -25,14 +25,17 @@ body>.-task-title { .newHeaders{ max-width: unset; width: 100%; - height:70px; + height:58px; min-width: 1200px; z-index: 1000; - box-shadow: 0px 2px 4px 0px rgb(0 0 0 / 50%); position: fixed; - background-image: linear-gradient(to right, #0F141F, #0C2A5B,#101417); + background: #1B2440; color: #fff; } +.newHeaders.publicNav{ + position: absolute; + background: rgba(27, 36, 64,0.2); +} .headerContent{ margin:0px auto; padding:0px 30px; diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index 2597950f..a3166c35 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/src/modules/tpm/TPMIndexHOC.js @@ -153,11 +153,11 @@ export function TPMIndexHOC(WrappedComponent) { console.log(this.props.match) if (this.props.match.path === "/") { this.setState({ - publicNav:false + publicNav:true }) }else{ this.setState({ - publicNav:true + publicNav:false }) } let url = `/users/get_user_info.json`; @@ -256,12 +256,12 @@ export function TPMIndexHOC(WrappedComponent) { {...this.props} {...this.state} /> : ""} - { publicNav &&
    } +
    - { publicNav &&
    } + {!publicNav &&
    } { current_user && this.initCommonState(user)} @@ -270,7 +270,7 @@ export function TPMIndexHOC(WrappedComponent) { }
    - { publicNav && } +
    ); }