diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css
index 80fb12a64..ac97837fc 100644
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@@ -2346,7 +2346,6 @@ input::-ms-clear {
/*中间部分宽度固定为1200*/
.newMain {
margin: 0 auto;
- padding-bottom: 110px;
min-width: 1200px;
}
@@ -4108,21 +4107,6 @@ em.vertical-line {
/* 右侧内容宽度变化的话,需要调整posi-search right的值*/
-/*底部*/
-.newFooter {
- max-height: 110px;
-}
-
-.newFooter {
- position: absolute;
- bottom: 0;
- width: 100%;
- background: #323232;
- clear: both;
- min-width: 1200px;
- z-index: 8;
- left: 0px;
-}
.footercon {
border-bottom: 1px solid #47494d;
diff --git a/src/forge/Component/Contributors.jsx b/src/forge/Component/Contributors.jsx
index d64e0d42a..7215c735a 100644
--- a/src/forge/Component/Contributors.jsx
+++ b/src/forge/Component/Contributors.jsx
@@ -1,9 +1,30 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
import { AlignCenter , FlexAJ } from '../Component/layout';
import { Link } from 'react-router-dom';
+import { Dropdown , Spin } from 'antd';
import { getImageUrl } from 'educoder';
+import Axios from 'axios';
function Contributors({contributors,owner,projectsId}){
+
+ // function menuFunc(login){
+ // let data = undefined;
+ // const url = `/users/${login}.json`;
+ // Axios.get(url).then(result=>{
+ // if(result && result.data){
+ // data = result.data;
+ // }
+ // }).catch(error=>{})
+
+ // if(data){
+ // return(
+ //
111
+ // )
+ // }else{
+ // return
+ // }
+ // }
+
return(
@@ -15,7 +36,9 @@ function Contributors({contributors,owner,projectsId}){
contributors && contributors.total_count > 0 ?
contributors.list.map((item,key)=>{
return(
-
+ // menuFunc(item.login)}>
+
+ //
)
})
:""
diff --git a/src/forge/Head/Footer.jsx b/src/forge/Head/Footer.jsx
new file mode 100644
index 000000000..8a69c2ad1
--- /dev/null
+++ b/src/forge/Head/Footer.jsx
@@ -0,0 +1,66 @@
+import React, { useEffect , useState } from 'react';
+import './header.scss';
+
+function Footer(){
+ const [ value , setValue ] = useState(undefined);
+
+ useEffect(()=>{
+ try {
+ var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
+ setValue(chromesettingArray.footer);
+ } catch (e) {
+ }
+ },[])
+
+ function showhtml(htmlString){
+ var html = {__html:htmlString};
+ return ;
+ }
+
+ return(
+
+
+
+ {value && showhtml(value)}
+ {/*
+
+
+
+
+ - 合作伙伴
+ - 热线:
+ - QQ群:1071514693
+
+
+
© Copyright 2007~2021 国防科技大学Trustie团队 & IntelliDE 湘ICP备 17009477号
*/}
+
+
+ )
+}
+export default Footer;
diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss
index 3cde4d8fc..130df4ca8 100644
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@@ -7,4 +7,56 @@
.ant-menu-vertical > .ant-menu-item{
border:none
}
+}
+
+.newFooter {
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ background: #323232;
+ clear: both;
+ min-width: 1200px;
+ z-index: 8;
+ left: 0px;
+ p {
+ margin-top: 0;
+ margin-bottom:0px !important;
+ }
+ .footerInfos{
+ display: flex;
+ max-width: 1200px;
+ margin:0px auto;
+ justify-content: space-around;
+ padding:60px 0px;
+ & >ul{
+ padding:0px 40px;
+ box-sizing: border-box;
+ max-width: 25%;
+ text-align: left;
+ li{
+ color: #fff;
+ font-weight: 300;
+ &:first-child{
+ font-size: 17px;
+ }
+ &>a,&>span{
+ color: #bbb;
+ }
+ &>a:hover{
+ color: #4cacff;
+ }
+ }
+ }
+ }
+ .footerCopy{
+ color: #bbb;
+ border-top: 1px solid #4e4e4e;
+ padding:10px 0px;
+ a{
+ color: #bbb;
+ &:hover{
+ color: #4cacff;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js
index 13939981d..deb555a82 100644
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@@ -262,11 +262,7 @@ class CoderRootFileDetail extends Component {
{detail.image_type ? (
-

+
) : detail.direct_download ? (
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index 631d52c99..3bec062f0 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -286,6 +286,9 @@
.downMenu{
box-shadow: 0px 0px 9px rgba(134, 134, 134,0.4);
background-color: #fff;
+ .ant-menu-vertical .ant-menu-item:hover{
+ background-color: #e6f7ff;
+ }
}
.menuslist{
diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js
index 9883ce8f3..6c921c9fc 100644
--- a/src/forge/Newfile/UserSubmitComponent.js
+++ b/src/forge/Newfile/UserSubmitComponent.js
@@ -117,7 +117,7 @@ class UserSubmitComponent extends Component {
diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js
index 4e2e68516..7f773d98c 100644
--- a/src/forge/Newfile/m_editor.js
+++ b/src/forge/Newfile/m_editor.js
@@ -51,7 +51,7 @@ class m_editor extends Component {
return (