diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index ecce221de..fe8784145 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -1268,11 +1268,17 @@ a.shixun-task-btn { /*-----------实训配置、评测脚本-------------*/ +@font-face { + font-family: "iconfont"; /* Project id 2340181 */ + src: url('iconfont.woff2?t=1631773579834') format('woff2'), + url('iconfont.woff?t=1631773579834') format('woff'), + url('iconfont.ttf?t=1631773579834') format('truetype'); +} html body { font-size: 14px; line-height: 2.0; background: #fafafa; - font-family: "Microsoft YaHei", "SimSun"; + font-family: "iconfont"; color: #05101a; height: 100%; position: relative; diff --git a/src/home/FifthEdition.jsx b/src/home/FifthEdition.jsx index bd071a7f7..6e709b434 100644 --- a/src/home/FifthEdition.jsx +++ b/src/home/FifthEdition.jsx @@ -22,7 +22,6 @@ import LSLM from './Img/unit/LSLM.png'; import TG from './Img/unit/TG.png'; import LC from './Img/unit/LC.png'; import YKD from './Img/unit/YKD.png'; -import { Link } from 'react-router-dom'; const list = [ {image_url:GFKJ, name:"国防科技大学",src:"https://www.nudt.edu.cn/"}, @@ -38,7 +37,7 @@ const list = [ {image_url:ML, name:"木兰开源社区",src:"https://www.mulanos.cn/"}, {image_url:TX, name:"腾讯",src:"https://www.tencent.com/zh-cn"}, {image_url:KYRJLM, name:"中国开源软件推进联盟",src:"http://www.copu.org.cn/"}, - {image_url:WXYJY, name:"无锡大数据研究院",src:""}, + {image_url:XH, name:"中国计算机学会",src:"https://www.ccf.org.cn/"}, {image_url:QZ, name:"openi启智",src:"https://www.openi.org.cn/"}, {image_url:HSKY, name:"红山开源",src:"https://osredm.com/"}, {image_url:LSLM, name:"绿色产业联盟",src:"https://www.opengcc.org/"}, diff --git a/src/home/Img/2-1bg.png b/src/home/Img/2-1bg.png index 6e38e8282..eedd40394 100644 Binary files a/src/home/Img/2-1bg.png and b/src/home/Img/2-1bg.png differ diff --git a/src/home/Img/2-4bg.png b/src/home/Img/2-4bg.png index 1d88f5b6f..38271d613 100644 Binary files a/src/home/Img/2-4bg.png and b/src/home/Img/2-4bg.png differ diff --git a/src/home/Index.scss b/src/home/Index.scss index 65b51362d..d0989cdbd 100644 --- a/src/home/Index.scss +++ b/src/home/Index.scss @@ -164,7 +164,7 @@ body{ top:0px; height: 100%; content: ""; - transition: 3s; + transition: 5.2s; transition-property: width; } &.slick-active::after{ @@ -460,7 +460,7 @@ body{ color: #637497; font-size: 20px; line-height: 36px; - max-width: 922px; + max-width: 950px; margin:30px auto 28px; text-align: center; span{ diff --git a/src/home/TopEdition.jsx b/src/home/TopEdition.jsx index af8eacef3..abf41a57e 100644 --- a/src/home/TopEdition.jsx +++ b/src/home/TopEdition.jsx @@ -3,11 +3,11 @@ import Slider from 'react-slick'; let setting={ dots:true, infinite: true, - speed: 3000, + speed: 2000, slidesToShow: 1, slidesToScroll: 1, pauseOnDotsHover:true, - autoplaySpeed:0, + autoplaySpeed:5000, pauseOnFocus:true, autoplay:true, arrows:true,