diff --git a/public/css/gitlink.min.css b/public/css/gitlink.min.css index 166380ad..40f3ec41 100644 --- a/public/css/gitlink.min.css +++ b/public/css/gitlink.min.css @@ -20,6 +20,10 @@ font-family: "ziyouwenyihei"; src: url("../fonts/ziyouwenyihei.ttf"); } +@font-face { + font-family: "DouyinSansBold"; + src: url("../fonts/DouyinSansBold.ttf"); +} .header { width: 100%; height: 51px; @@ -1433,6 +1437,10 @@ a.edu-txt-w80, font-size: 36px !important } +.font-38 { + font-size: 38px !important +} + .font-40 { font-size: 40px !important } @@ -1441,6 +1449,10 @@ a.edu-txt-w80, font-size: 50px !important } +.font-60 { + font-size: 60px !important +} + .font-80 { font-size: 80px !important } @@ -1462,6 +1474,14 @@ a.decoration { font-weight: 400 } +.mt-5{ + margin-top: -5px; +} + +.mt-8{ + margin-top: -8px; +} + .mt1 { margin-top: 1px } @@ -1618,6 +1638,10 @@ a.decoration { margin-bottom: 7px } +.mb8 { + margin-bottom: 8px +} + .mb10 { margin-bottom: 10px } @@ -1658,6 +1682,10 @@ a.decoration { margin-bottom: 30px !important } +.mb35 { + margin-bottom: 35px !important +} + .mb40 { margin-bottom: 40px !important } @@ -1742,6 +1770,10 @@ a.decoration { margin-left: 22px } +.ml24 { + margin-left: 24px +} + .ml25 { margin-left: 25px } @@ -1782,6 +1814,10 @@ a.decoration { margin-left: 180px } +.mr2 { + margin-right: 2px +} + .mr3 { margin-right: 3px } @@ -1862,6 +1898,10 @@ a.decoration { padding-top: 5px !important } +.pt8 { + padding-top: 8px !important +} + .pt10 { padding-top: 10px } @@ -1902,6 +1942,10 @@ a.decoration { padding-top: 60px } +.pt70 { + padding-top: 70px +} + .pt80 { padding-top: 80px } @@ -1923,11 +1967,7 @@ a.decoration { } .pb25 { - padding-bottom: 20px -} - -.pb25 { - padding-bottom: 20px + padding-bottom: 25px } .pb28 { @@ -1954,6 +1994,18 @@ a.decoration { padding-bottom: 60px } +.pb70 { + padding-bottom: 70px +} + +.pb80 { + padding-bottom: 80px +} + +.pb90 { + padding-bottom: 90px +} + .pb100 { padding-bottom: 100px } @@ -1982,6 +2034,10 @@ a.decoration { padding-right: 35px !important } +.pr50 { + padding-right: 50px !important +} + .pl0 { padding-left: 0 !important } @@ -2030,6 +2086,10 @@ a.decoration { padding-left: 40px } +.pl45 { + padding-left: 45px +} + .pl50 { padding-left: 50px } @@ -2111,6 +2171,11 @@ a.decoration { box-sizing: border-box } +.padding25-30{ + padding: 25px 30px; + box-sizing: border-box +} + .padding30 { padding: 30px; box-sizing: border-box @@ -2172,6 +2237,14 @@ a.decoration { line-height: 40px !important } +.lineh-50 { + line-height: 50px !important +} + +.lineh-80 { + line-height: 80px !important +} + .break_word { word-break: break-all; word-wrap: break-word diff --git a/public/css/iconfont.css b/public/css/iconfont.css index 35355092..1af2903d 100644 --- a/public/css/iconfont.css +++ b/public/css/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 2340181 */ - src: url('iconfont.woff2?t=1762825432985') format('woff2'), - url('iconfont.woff?t=1762825432985') format('woff'), - url('iconfont.ttf?t=1762825432985') format('truetype'); + src: url('iconfont.woff2?t=1765938619495') format('woff2'), + url('iconfont.woff?t=1765938619495') format('woff'), + url('iconfont.ttf?t=1765938619495') format('truetype'); } .iconfont { @@ -13,6 +13,34 @@ -moz-osx-font-smoothing: grayscale; } +.icon-svg_jiantou1:before { + content: "\e9c3"; +} + +.icon-zuojiantou1:before { + content: "\e9c4"; +} + +.icon-jiantou4:before { + content: "\e9c2"; +} + +.icon-hezuohuoban:before { + content: "\e9bf"; +} + +.icon-xiangmugongxian:before { + content: "\e9c1"; +} + +.icon-sijiaoxing:before { + content: "\e9c0"; +} + +.icon-a-zu15512:before { + content: "\e9be"; +} + .icon-wendangbangong-01:before { content: "\e9bd"; } diff --git a/public/css/iconfont.js b/public/css/iconfont.js index fff49574..548738c3 100644 --- a/public/css/iconfont.js +++ b/public/css/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_2340181='',(c=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,i,o,z,t,p=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_2340181,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?p(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,z=c.document,t=!1,m(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,v())})}function v(){t||(t=!0,o())}function m(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}v()}})(window); \ No newline at end of file +window._iconfont_svg_string_2340181='',(c=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,i,o,z,t,p=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_2340181,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?p(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,z=c.document,t=!1,m(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,v())})}function v(){t||(t=!0,o())}function m(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}v()}})(window); \ No newline at end of file diff --git a/public/css/iconfont.json b/public/css/iconfont.json index cfe1eb79..ac9ae795 100644 --- a/public/css/iconfont.json +++ b/public/css/iconfont.json @@ -5,6 +5,55 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "46370299", + "name": "svg_箭头1", + "font_class": "svg_jiantou1", + "unicode": "e9c3", + "unicode_decimal": 59843 + }, + { + "icon_id": "46370300", + "name": "左箭头", + "font_class": "zuojiantou1", + "unicode": "e9c4", + "unicode_decimal": 59844 + }, + { + "icon_id": "46329189", + "name": "箭头", + "font_class": "jiantou4", + "unicode": "e9c2", + "unicode_decimal": 59842 + }, + { + "icon_id": "46248622", + "name": "合作伙伴", + "font_class": "hezuohuoban", + "unicode": "e9bf", + "unicode_decimal": 59839 + }, + { + "icon_id": "46248621", + "name": "项目贡献", + "font_class": "xiangmugongxian", + "unicode": "e9c1", + "unicode_decimal": 59841 + }, + { + "icon_id": "46245203", + "name": "四角星", + "font_class": "sijiaoxing", + "unicode": "e9c0", + "unicode_decimal": 59840 + }, + { + "icon_id": "46244977", + "name": "组 15512", + "font_class": "a-zu15512", + "unicode": "e9be", + "unicode_decimal": 59838 + }, { "icon_id": "46034062", "name": "文档办公-01", diff --git a/public/css/iconfont.ttf b/public/css/iconfont.ttf index 0437f985..ae09e439 100644 Binary files a/public/css/iconfont.ttf and b/public/css/iconfont.ttf differ diff --git a/public/css/iconfont.woff b/public/css/iconfont.woff index ac3ebbe9..a1ebdfd2 100644 Binary files a/public/css/iconfont.woff and b/public/css/iconfont.woff differ diff --git a/public/css/iconfont.woff2 b/public/css/iconfont.woff2 index d02145ae..2f02631b 100644 Binary files a/public/css/iconfont.woff2 and b/public/css/iconfont.woff2 differ diff --git a/public/fonts/DouyinSansBold.ttf b/public/fonts/DouyinSansBold.ttf new file mode 100644 index 00000000..eb8555c6 Binary files /dev/null and b/public/fonts/DouyinSansBold.ttf differ diff --git a/src/App.css b/src/App.css index 2abbaf5e..57580bf8 100644 --- a/src/App.css +++ b/src/App.css @@ -146,3 +146,23 @@ body { min-height: calc(100% - 60px) !important; } } + +.width1600 { + width: 1600px; + margin: 0 auto; +} +.opacity9 { + opacity: 0.9; +} +.opacity8 { + opacity: 0.8; +} +.opacity7 { + opacity: 0.7; +} +.opacity6 { + opacity: 0.6; +} +.opacity4 { + opacity: 0.4; +} \ No newline at end of file diff --git a/src/App.js b/src/App.js index 44379970..7f7b5623 100644 --- a/src/App.js +++ b/src/App.js @@ -145,7 +145,7 @@ const ProjectIndex = Loadable({ }); const Home = Loadable({ - loader: () => import('./forge/Main/projecthome/Index'), + loader: () => import('./forge/Main/projecthome/v2/index'), loading: Loading, }) @@ -216,8 +216,18 @@ const GovernanceIframe = Loadable({ loading: Loading, }); +const Forums = Loadable({ + loader: () => import("./forums"), + loading: Loading, +}); + +const News = Loadable({ + loader: () => import("./news"), + loading: Loading, +}); + // 此处仅维护前端可能的一级路由,不用进行项目或者组织判断的字段。 -const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize", "login", "register", "resetPassword", "aboutus", "educoder", "glcc", "bindlogin", "softbot", "zone", "hiagent", "softwareFactory", "development", "governance"]; +const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize", "login", "register", "resetPassword", "aboutus","educoder", "glcc","bindlogin", "softbot","zone", "hiagent","softwareFactory", "development", "governance", "forums", "news"]; class App extends Component { constructor(props) { @@ -400,20 +410,32 @@ class App extends Component { {pathName && pathName.toLowerCase() === 'glcc' && } {/* */} { - pathType ? - - {/* iframe页面 */} - (