diff --git a/src/home/FifthSection/index.jsx b/src/home/FifthSection/index.jsx index eca3bce3a..70150aeb5 100644 --- a/src/home/FifthSection/index.jsx +++ b/src/home/FifthSection/index.jsx @@ -56,14 +56,17 @@ function FifthSection({ fifth }) { -

创客空间

开源项目版块集项目托管、版本管理等功能于一体,为开源协作和群智汇聚提供创作环境

- +

研发配置要求为包含网络化协同控制仿真验证与多样化目标识别仿真验证模块的1套软件和1份测试报告。

@@ -133,7 +136,10 @@ function FifthSection({ fifth }) {
+
+
+
.ant-collapse-header{ + .ant-collapse-item:last-child, + .ant-collapse-item:last-child > .ant-collapse-header { border-radius: 6px 6px 0 0; } @@ -260,6 +397,19 @@ letter-spacing: 0; font-weight: 500; padding: 27px 36px; + + .ant-collapse-arrow { + display: inline-flex; + justify-content: center; + align-items: center; + width: 28px; + height: 28px; + border-radius: 50%; + box-shadow: 0px 0px 5px 1px rgba(38, 118, 255, 0.1); + svg { + transform: rotate(90deg); + } + } } .ant-collapse-item-active { @@ -275,6 +425,10 @@ border-bottom-left-radius: 0px; border-bottom-right-radius: 0px; } + + .ant-collapse-arrow { + display: none; + } } .ant-collapse-content > .ant-collapse-content-box { @@ -289,7 +443,7 @@ letter-spacing: 0; line-height: 28px; font-weight: 400; - margin-bottom: .5em !important; + margin-bottom: 0.5em !important; } .collapse-content { padding: 12px; @@ -297,24 +451,24 @@ background: #f5f7fa; border-radius: 4px; - .collapse-content-item{ + .collapse-content-item { height: 30px; line-height: 30px; font-weight: 400; } - .iconfont{ + .iconfont { margin-right: 12px; - color: #EA0000; + color: #ea0000; } - .collapse-content-money{ - margin-left:16px; - color: #EA0000; + .collapse-content-money { + margin-left: 16px; + color: #ea0000; } - .collapse-content-time{ - margin-left:16px; + .collapse-content-time { + margin-left: 16px; } } - .waves{ + .waves { position: relative; bottom: -10px; } diff --git a/src/home/FirstSection/index.scss b/src/home/FirstSection/index.scss index de2a51305..b96b23dc2 100644 --- a/src/home/FirstSection/index.scss +++ b/src/home/FirstSection/index.scss @@ -24,6 +24,7 @@ .website-content { display: flex; justify-content: space-between; + align-items: center; height: 82vh; min-height: 600px; } @@ -51,6 +52,7 @@ font-size: 16px; line-height: 2.3; margin-bottom: 40px; + opacity: 0.8; } .website-more{ @@ -65,11 +67,9 @@ flex: none; justify-content: center; align-items: flex-end; - align-self: flex-end; position: relative; width: 680px; height: 580px; - margin-bottom: 10vh; img { opacity: 0; } @@ -177,13 +177,12 @@ @keyframes website { 0% { - top: 60vh; + top: 25vh; opacity: 0; } 100% { top: 0; opacity: 1; - transition: all 2s; } } diff --git a/src/home/Footer/index.jsx b/src/home/Footer/index.jsx index 2fbabb22e..f22b8d701 100644 --- a/src/home/Footer/index.jsx +++ b/src/home/Footer/index.jsx @@ -1,18 +1,18 @@ import React, { memo } from "react"; -import logo from '../../modules/tpm/images/hskylogo.png'; +// import logo from '../../modules/tpm/images/hskylogo.png'; import './index.scss'; function HomeFooter() { return ( - @@ -64,7 +64,8 @@ function SecondSection({ second }) { 热点资讯

习主席指出,要紧跟科技强国建设进程,优化国防创新布局和环境条件,用好用足各方面优势力量和资源, sunt in culpa qui officia deserunt mollit id est laborum.

- 2021-09-13 + 2021-09-13 +
@@ -74,7 +75,8 @@ function SecondSection({ second }) { 热点资讯

加快推进国防科技创新加优化国防创新布局和环境条件,用好用足各方面优势力量和资源,大幅加强科研投入,提高科研产出优化国防创新布局和环境条件,用好用足各方面优势力量和资源,大幅加强科研投入,提高科研产出.

- 2021-09-15 + 2021-09-15 +
@@ -84,7 +86,8 @@ function SecondSection({ second }) { 热点资讯

习主席指出,要紧跟科技强国建设进程,优化国防创新布局和环境条件,用好用足各方面优势力量和资源,大幅加强科研投入,提高科研产出

- 2021-09-12 + 2021-09-12 +
@@ -94,7 +97,8 @@ function SecondSection({ second }) { 热点资讯

加快推进国防科技创新加优化国防创新布局和环境条件,用好用足各方面优势力量和资源,大幅加强科研投入,提高科研产出.

- 2021-09-15 + 2021-09-15 + @@ -111,7 +115,7 @@ function SecondSection({ second }) { - {/* */} + {/* */} ) diff --git a/src/home/SecondSection/index.scss b/src/home/SecondSection/index.scss index c4ea54cb3..91ce46c52 100644 --- a/src/home/SecondSection/index.scss +++ b/src/home/SecondSection/index.scss @@ -3,7 +3,6 @@ text-align: center; padding-top: 40px; margin-bottom: -10px; - .community-left-tit { font-size: 20px; @@ -15,6 +14,10 @@ justify-content: space-between; margin: 20px auto 50px; text-align: left; + + .homepage-btn { + margin-top: 40px; + } } .community-english { @@ -48,7 +51,6 @@ line-height: 36px; } - .community-active { position: relative; animation: community 0.75s 1 forwards; @@ -95,6 +97,11 @@ border: 1px solid #fff; border-radius: 6px; + & > .iconfont { + float: right; + font-size: 25px !important; + color: rgb(239, 122, 48); + } .slide-title { display: flex; align-items: center; @@ -102,7 +109,7 @@ h3 { color: #000870; font-size: 18px; - + margin-bottom: 0 !important; flex: auto; } @@ -124,6 +131,12 @@ text-align: center; } + .news-time { + font-size: 15px; + font-weight: 400; + color: #3c476e; + } + .slide-tag { color: #fff; padding: 3px 13px; @@ -131,23 +144,19 @@ border-radius: 3px; } - .slide-tag-red{ - background: #E53939; + .slide-tag-red { + background: #e53939; } - .slide-tag-yellow{ - background: #FF7300; + .slide-tag-yellow { + background: #ff7300; } p { color: #3c476e; - } } .slick-center { margin-left: 100px; } - - } - diff --git a/src/home/SeventhSection/index.jsx b/src/home/SeventhSection/index.jsx index 25c5ed963..f15f4a5b1 100644 --- a/src/home/SeventhSection/index.jsx +++ b/src/home/SeventhSection/index.jsx @@ -35,36 +35,39 @@ function SeventhSection() {

论坛交流

论坛交流版块通过技术交流、学术探讨等方式,为社区用户提供自主交流空间,实现思维碰撞和智慧融合

-
- images-not_found - images-not_found - images-not_found - images-not_found - images-not_found - images-not_found +
+ images-not_found + images-not_found + images-not_found + images-not_found + images-not_found + images-not_found + + +
opersou

Linux基金会发布《2021开源职业报告》提出新的方案,促进人才成长合作发展

-

新冠疫情的大规模爆发对社会经济、人民生活各方面均造成较大影响,众多企业面临劳动用工、合同履约以及银行信贷三重危机。而今,世界各地经济正逐渐从新冠疫情常态化趋势下复苏,后疫情时代中雇佣模式的转变,对劳动关系领域带来了新挑战,这一变化与挑战在科技领域尤为凸显。当云原生技术的加速应用成为远程化工作的主流,使得相关信息化人才缺口在本次全球化疫情中更加恶化。 +

新冠疫情的大规模爆发对社会经济、人民生活各方面均造成较大影响,众多企业面临劳动用工、合同履约以及银行信贷三重危机。而今,世界各地经济正逐渐从新冠疫情常态化趋势下复苏,后疫情时代中雇佣模式的转变,对劳动关系领域带来了新挑战,这一变化与挑战在科技领域尤为凸显。当云原生技术的加速应用成为远程化工作的主流,使得相关信息化人才缺口在本次全球化疫情中更加恶化。 新冠疫情的大规模爆发对社会经济、人民生活各方面均造成较大影响,众多企业面临劳动用工、合同履约以及银行信贷三重危机。而今,世界各地经济正逐渐从新冠疫情常态化趋势下复苏,后疫情时代中雇佣模式的转变,对劳动关系领域带来了新挑战,这一变化与挑战在科技领域尤为凸显。当云原生技术的加速应用成为远程化工作的主流,使得相关信息化人才缺口在本次全球化疫情中更加恶化。

2021-09-13
- 李刚 + 李刚

Linux基金会发布《2021开源职业报告》

-

新冠疫情的大规模爆发对社会经济、人民生活各方面均造成较大影响,众多企业面临劳动用工、合同履约以及银行信贷三重危机。而今,世界各地经济正逐渐从新冠疫情常态化趋势下复苏,后疫情时代中雇佣模式的转变,对劳动关系领域带来了新挑战,这一变化与挑战在科技领域尤为凸显。当云原生技术的加速应用成为远程化工作的主流,使得相关信息化人才缺口在本次全球化疫情中更加恶化。 +

新冠疫情的大规模爆发对社会经济、人民生活各方面均造成较大影响,众多企业面临劳动用工、合同履约以及银行信贷三重危机。而今,世界各地经济正逐渐从新冠疫情常态化趋势下复苏,后疫情时代中雇佣模式的转变,对劳动关系领域带来了新挑战,这一变化与挑战在科技领域尤为凸显。当云原生技术的加速应用成为远程化工作的主流,使得相关信息化人才缺口在本次全球化疫情中更加恶化。 新冠疫情的大规模爆发对社会经济、人民生活各方面均造成较大影响,众多企业面临劳动用工、合同履约以及银行信贷三重危机。而今,世界各地经济正逐渐从新冠疫情常态化趋势下复苏,后疫情时代中雇佣模式的转变,对劳动关系领域带来了新挑战,这一变化与挑战在科技领域尤为凸显。当云原生技术的加速应用成为远程化工作的主流,使得相关信息化人才缺口在本次全球化疫情中更加恶化。

2021-09-13
- +
diff --git a/src/home/SeventhSection/index.scss b/src/home/SeventhSection/index.scss index 1183afa8b..e10d8d0fb 100644 --- a/src/home/SeventhSection/index.scss +++ b/src/home/SeventhSection/index.scss @@ -3,59 +3,75 @@ text-align: center; padding-top: 40px; - .seventh-main{ + .seventh-main { position: relative; } - .clients{ + .clients { position: absolute; width: 100%; height: 500px; left: 0; bottom: 40px; z-index: 10; - .client{ + .client { position: absolute; width: 100px; height: 100px; border-radius: 50%; } - .client:nth-child(1){ - top:0; + .client:nth-child(1) { + top: 0; left: 0; - animation: zoomin .9s infinite alternate; + animation: zoomin 0.9s infinite alternate; } - .client:nth-child(2){ - top:190px; + .client:nth-child(2) { + top: 190px; left: -115px; animation: zoomin 1.3s infinite alternate; } - .client:nth-child(3){ + .client:nth-child(3) { left: 0; bottom: 70px; animation: zoomin 1.6s infinite alternate; } - .client:nth-child(4){ + .client:nth-child(4) { top: 40px; right: 0; animation: zoomin 1.9s infinite alternate; } - .client:nth-child(5){ + .client:nth-child(5) { right: -85px; bottom: 135px; animation: zoomin 2.1s infinite alternate; } - .client:nth-child(6){ - right: 240px; - bottom: 40px; + .client:nth-child(6) { + right: 220px; + bottom: 10px; animation: zoomin 1.6s infinite alternate; } + + .icon-a-shuangyinhao12x { + position: absolute; + color: #ef7a30; + font-size: 36px !important ; + } + .start-icon { + top: 50px; + left: 280px; + transform: rotateY(180deg); + } + .end-icon { + bottom: 145px; + right: 290px; + } } .slick-slider { margin: 40px auto 20px; height: 480px; background: url(../img/7-bg.png) no-repeat; + background-size: 804px 474px; background-position: center; } .slick-list { @@ -72,16 +88,19 @@ margin: 0 auto; } .issue-author { + display: inline-block; font-size: 18px; font-weight: 500; color: #ff7300; line-height: 28px; + margin: 10px auto; } .issue-title { font-size: 20px; font-weight: 500; color: #000870; line-height: 28px; + margin-bottom: 20px; } .issue-content { text-align: left; @@ -99,9 +118,13 @@ } } + .homepage-btn { + margin-top: 50px; + } + @keyframes zoomin { 0% { - transform: scale(.9); + transform: scale(0.9); } 100% { diff --git a/src/home/SixthSection/index.jsx b/src/home/SixthSection/index.jsx index 11506df1b..3911a6d30 100644 --- a/src/home/SixthSection/index.jsx +++ b/src/home/SixthSection/index.jsx @@ -73,7 +73,7 @@ function SixthSection({ sixth }) { - + diff --git a/src/home/SixthSection/index.scss b/src/home/SixthSection/index.scss index 8fd71c69e..a9668365b 100644 --- a/src/home/SixthSection/index.scss +++ b/src/home/SixthSection/index.scss @@ -67,6 +67,7 @@ font-size: 15px; font-weight: 400; line-height: 28px; + opacity: .8; .des-item-title { font-size: 18px; font-family: PingFangSC-Medium, PingFang SC; @@ -164,6 +165,7 @@ .homepage-btn{ margin-top: 0; + background-color: #4F7DFF ; } .waves { diff --git a/src/home/ThirdSection/index.scss b/src/home/ThirdSection/index.scss index 3624f6519..29bda5773 100644 --- a/src/home/ThirdSection/index.scss +++ b/src/home/ThirdSection/index.scss @@ -20,8 +20,8 @@ display: flex; justify-content: space-around; max-width: 100%; - min-height: 35vh; - margin: 40px auto; + // min-height: 35vh; + margin: 10vh auto; } .circle-item > h4 { diff --git a/src/home/img/7-bg.png b/src/home/img/7-bg.png old mode 100755 new mode 100644 index bef897e19..ba45f598e Binary files a/src/home/img/7-bg.png and b/src/home/img/7-bg.png differ diff --git a/src/home/index.jsx b/src/home/index.jsx index 3091f531e..b32e62307 100644 --- a/src/home/index.jsx +++ b/src/home/index.jsx @@ -51,7 +51,7 @@ function HomePage(props) { console.log("top:" + top); // 第一个动效 - if (top >= clientHeight - 100) { + if (top >= clientHeight - 300) { setFirst(false); } else { setFirst(true); diff --git a/src/home/index.scss b/src/home/index.scss index 9098ed116..1361f65a4 100644 --- a/src/home/index.scss +++ b/src/home/index.scss @@ -1,6 +1,5 @@ .homePage { background: #fff; - font-family: PingFangSC-Medium, PingFang SC; // 首页多个部分公共样式 @@ -22,13 +21,13 @@ } // 8行省略号 - .ellipsis-8 { + .ellipsis-5 { text-overflow: -o-ellipsis-lastline; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; - -webkit-line-clamp: 8; - line-clamp: 8; + -webkit-line-clamp: 5; + line-clamp:5; -webkit-box-orient: vertical; } @@ -42,7 +41,12 @@ .homepage-btn { width: 140px; height: 56px; - margin-top: 40px; + font-size: 16px; + .icon-gengduoicon{ + margin-left:5px; + color: #FFBF2D; + font-size: 16px !important; + } } .text-center { text-align: center;