diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index 0d146204c..9877c4eaf 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -3971,9 +3971,12 @@ html>body #ajax-indicator { display: block; height: 100%; width: 100%; - color: #333; + color: #fff; font-size: 16px; } +.head-right i{ + color: #fff!important; +} .head-nav ul#header-nav li a:hover,.head-nav ul#header-nav li.active a { color: #5091FF; diff --git a/src/forge/Component/HeadSearch.jsx b/src/forge/Component/HeadSearch.jsx index fb7c9f25a..10b829a23 100644 --- a/src/forge/Component/HeadSearch.jsx +++ b/src/forge/Component/HeadSearch.jsx @@ -32,7 +32,7 @@ export default ({history}) => { /> : - { + { setOpenSearch(true) }} /> } diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index ac139351e..622eef3c6 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -433,7 +433,7 @@ class NewHeader extends Component { { current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)? - + :"" } @@ -448,7 +448,7 @@ class NewHeader extends Component { > {current_user && - + } @@ -457,10 +457,10 @@ class NewHeader extends Component { {!user || (user && !user.login) ? - this.educoderlogin()} className="mr5 color-grey-6">登录 + this.educoderlogin()} className="mr5 color-white">登录 { settings && settings.common && settings.common.register && - 注册 + 注册 } : diff --git a/src/forge/Main/img/index/banner.png b/src/forge/Main/img/index/banner.png new file mode 100644 index 000000000..101be0a58 Binary files /dev/null and b/src/forge/Main/img/index/banner.png differ diff --git a/src/forge/Main/img/index/box.png b/src/forge/Main/img/index/box.png new file mode 100644 index 000000000..3dbddbefb Binary files /dev/null and b/src/forge/Main/img/index/box.png differ diff --git a/src/forge/Main/img/index/data.png b/src/forge/Main/img/index/data.png new file mode 100644 index 000000000..6b5b33478 Binary files /dev/null and b/src/forge/Main/img/index/data.png differ diff --git a/src/forge/Main/img/index/earth.png b/src/forge/Main/img/index/earth.png new file mode 100644 index 000000000..eca8dafba Binary files /dev/null and b/src/forge/Main/img/index/earth.png differ diff --git a/src/forge/Main/img/index/eye.png b/src/forge/Main/img/index/eye.png new file mode 100644 index 000000000..e7563addf Binary files /dev/null and b/src/forge/Main/img/index/eye.png differ diff --git a/src/forge/Main/projecthome/Index.jsx b/src/forge/Main/projecthome/Index.jsx index c2e8a21e3..de846525e 100644 --- a/src/forge/Main/projecthome/Index.jsx +++ b/src/forge/Main/projecthome/Index.jsx @@ -1,10 +1,12 @@ import React from 'react'; import './Index.scss'; - +import SubBanner from './SubBanner'; function Index(props) { return( -
首页index
+
+ +
) } export default Index; \ No newline at end of file diff --git a/src/forge/Main/projecthome/Index.scss b/src/forge/Main/projecthome/Index.scss index e69de29bb..3643d0030 100644 --- a/src/forge/Main/projecthome/Index.scss +++ b/src/forge/Main/projecthome/Index.scss @@ -0,0 +1,152 @@ +.banners{ + background: url('../img/index/banner.png') no-repeat top; + min-height: 516px; + background-size: cover; + background-color: #0C2A5B; + .bannersCenter{ + padding-top: 30px; + max-width: 1290px; + margin: 0px auto; + position: relative; + height: 516px; + } + .bTitle{ + height: 30px; + line-height: 30px; + font-size: 30px; + font-weight: 500; + color: #FFFFFF; + margin-bottom: 20px!important; + text-align: center; + span{ + background: linear-gradient(to right,#289AF6 0%, #9E84FF 40%, #FFB03B 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + } + } + .bSubTitle{ + text-align: center; + height: 30px; + line-height: 30px; + font-size: 16px; + font-weight: 400; + color: #FFFFFF; + } + .bannerBox{ + background: url('../img/index/box.png') no-repeat; + background-size: 100% 100%; + height: 240px; + width: 380px; + margin:0px auto; + padding:25px 30px 34px; + .bannersProject{ + position: relative; + .slick-list{ + width: 100%; + overflow: hidden; + } + .slick-track{ + display: flex; + li{ + padding:15px 20px; + .projectinfos{ + display: flex; + align-items: center; + width: 100%; + margin-bottom: 13px; + img{ + width: 32px; + height: 32px; + margin-right: 7px; + border-radius: 50%; + } + .name{ + height: 28px; + line-height: 28px; + font-size: 20px; + font-weight: 500; + color: #25EBFF; + } + .company{ + height: 20px; + line-height: 20px; + font-size: 14px; + font-weight: 400; + color: #FFFFFF; + } + } + .desc{ + height: 40px; + font-size: 13px; + font-weight: 400; + color: #FFFFFF; + line-height: 20px; + text-align: center; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + } + .infoData{ + display: flex; + margin-top: 16px; + justify-content: space-around; + &>span{ + display: flex; + align-items: center; + &>span{ + color: #FFB729; + font-size: 15px; + font-weight: 400; + } + } + img{ + width: 16px; + margin-right: 4px; + } + } + } + } + } + } + .airBubble{ + &>div{ + position: absolute; + border-radius: 50%; + background: linear-gradient(124deg, rgba(255, 255, 255, 0.1) 0%, rgba(5, 200, 220, 0.04) 50%, rgba(5, 200, 220, 0.03) 100%); + box-shadow: 0px 0px 7px 3px rgba(0, 154, 255, 0.19); + border: 1px solid rgba(0, 154, 255, 0.19); + font-size: 14px; + font-weight: 400; + line-height: 20px; + display: flex; + align-items: center; + word-break: break-all; + text-align: center; + padding:5px; + &.right{ + right: 0px; + } + &.left{ + left: 0px; + } + &:nth-child(1){ + span{ + color: #25EBFF; + } + width: 110px; + height: 110px; + bottom: 310px; + } + &:nth-child(2){ + span{ + color: #CD8AFF; + } + width: 120px; + height: 120px; + bottom: 293px; + } + } + } +} \ No newline at end of file diff --git a/src/forge/Main/projecthome/SubBanner.jsx b/src/forge/Main/projecthome/SubBanner.jsx new file mode 100644 index 000000000..726f0c196 --- /dev/null +++ b/src/forge/Main/projecthome/SubBanner.jsx @@ -0,0 +1,77 @@ +import React from 'react'; +import Slider from 'react-slick'; +import { getImageUrl } from 'educoder'; +import Eye from '../img/index/eye.png'; +import Data from '../img/index/data.png'; +import Earth from '../img/index/earth.png'; +import Imgs from '../img/tree.png'; + +const list =[ + {img:Imgs,name:"openGauss-operator1",company:"华为技术有限公司",desc:"此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情",look:432,cloud:"云原声",type:"C++"}, + {img:Imgs,name:"openGauss-operator2",company:"华为技术有限公司",desc:"此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情",look:432,cloud:"云原声",type:"C++"}, + {img:Imgs,name:"openGauss-operator3",company:"华为技术有限公司",desc:"此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情",look:432,cloud:"云原声",type:"C++"}, + {img:Imgs,name:"openGauss-operator4",company:"华为技术有限公司",desc:"此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情",look:432,cloud:"云原声",type:"C++"}, + {img:Imgs,name:"openGauss-operator5",company:"华为技术有限公司",desc:"此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情",look:432,cloud:"云原声",type:"C++"}, + {img:Imgs,name:"openGauss-operator6",company:"华为技术有限公司",desc:"此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情",look:432,cloud:"云原声",type:"C++"}, + {img:Imgs,name:"openGauss-operator7",company:"华为技术有限公司",desc:"此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情",look:432,cloud:"云原声",type:"C++"}, + {img:Imgs,name:"openGauss-operator8",company:"华为技术有限公司",desc:"此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情",look:432,cloud:"云原声",type:"C++"}, + {img:Imgs,name:"openGauss-operator9",company:"华为技术有限公司",desc:"此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情",look:432,cloud:"云原声",type:"C++"}, + {img:Imgs,name:"openGauss-operator10",company:"华为技术有限公司",desc:"此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情",look:432,cloud:"云原声",type:"C++"}, + {img:Imgs,name:"openGauss-operator11",company:"华为技术有限公司",desc:"此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情此处为项目介绍详情",look:432,cloud:"云原声",type:"C++"}, +] +const settings={ + dots: false, + infinite: true, + speed: 1000, + slidesToShow: 1, + slidesToScroll: 1, + autoplay:true, + arrows:false, + adaptiveHeight:true +} + +function SubBanner() { + return( +
+
+

新一代开源创新服务平台

+

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

+
+ + { + list.map((i,k)=>{ + return( +
  • +
    + +
    +

    {i.name}

    +

    {i.company}

    +
    +
    +

    {i.desc}

    +
    + {i.look} + {i.cloud} + {i.type} +
    +
    • + ) + }) + } +     +
    +
    + { + list.map((i,k)=>{ + return( +
    0 ? "right":"left"} style={{width:`${(120-k*10)}px`,height:`${(120-k*10)}px`}}>{i.company}/{i.name}
    + ) + }) + } +
    +
    +
    + ) +} +export default SubBanner diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index 09bd0a72b..8d513feb0 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -28,9 +28,10 @@ body>.-task-title { height:70px; min-width: 1200px; z-index: 1000; - background: rgba(0, 0, 0, 0.4); - box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5); + box-shadow: 0px 2px 4px 0px rgb(0 0 0 / 50%); position: fixed; + background-image: linear-gradient(to right, #0F141F, #0C2A5B,#101417); + color: #fff; } .headerContent{ margin:0px auto;