diff --git a/public/js/editormd/editormd.min.js b/public/js/editormd/editormd.min.js index 89aaf1bc..758c2fcc 100755 --- a/public/js/editormd/editormd.min.js +++ b/public/js/editormd/editormd.min.js @@ -560,7 +560,6 @@ // 此处影响公式加载 editormd.loadScript(loadPath + "marked.min", function () { - editormd.$marked = marked; if (settings.previewCodeHighlight) { diff --git a/src/forge/AboutUs/AboutUs.jsx b/src/forge/AboutUs/AboutUs.jsx index bb5deccd..2113f7c7 100644 --- a/src/forge/AboutUs/AboutUs.jsx +++ b/src/forge/AboutUs/AboutUs.jsx @@ -35,7 +35,7 @@ function AboutUs(){ //添加浏览器滚动监听事件 window.addEventListener('scroll', scrollListener); //请求topics.json接口获取合作单位信息 - axios.get(`/topics.json`, { params: { topic_type: "cooperator", limit: 20, group_size: 5}}).then(response=>{ + axios.get(`/topics.json`, { params: { topic_type: "cooperator", limit: 30, group_size: 5}}).then(response=>{ response && setUnits(response.data.topics); }); return ()=>window.removeEventListener('scroll', scrollListener); @@ -265,7 +265,7 @@ function AboutUs(){ {group.map(item =>{ return( - + 合作单位 ) })} diff --git a/src/forge/AboutUs/AboutUs.scss b/src/forge/AboutUs/AboutUs.scss index 3d985552..640cd4b5 100644 --- a/src/forge/AboutUs/AboutUs.scss +++ b/src/forge/AboutUs/AboutUs.scss @@ -329,6 +329,10 @@ border: 2px solid #FFFFFF; &:hover{ border: 1px solid #466AFF;} } + .unitImg{ + max-width: 90%; + max-height: 100%; + } } } .au_cont{ diff --git a/src/forge/Main/CoderDepotReadme.jsx b/src/forge/Main/CoderDepotReadme.jsx index 586f57fb..93d8b04c 100644 --- a/src/forge/Main/CoderDepotReadme.jsx +++ b/src/forge/Main/CoderDepotReadme.jsx @@ -66,7 +66,7 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){ { content &&
- +
} diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index 35da8324..f17bc480 100644 --- a/src/forge/Main/Index.scss +++ b/src/forge/Main/Index.scss @@ -522,6 +522,6 @@ } } - - - +.readmeFile p{ + white-space: normal; +} \ No newline at end of file diff --git a/src/forge/Team/List.jsx b/src/forge/Team/List.jsx index 91d56b7d..aa3a48c1 100644 --- a/src/forge/Team/List.jsx +++ b/src/forge/Team/List.jsx @@ -106,7 +106,7 @@ function List(props){ { totalCount > limit &&
- setPage(page)}/> + setPage(page)}/>
} diff --git a/src/modules/tpm/challengesnew/tpm-md-editor.js b/src/modules/tpm/challengesnew/tpm-md-editor.js index 51e65e7e..2f9c820d 100644 --- a/src/modules/tpm/challengesnew/tpm-md-editor.js +++ b/src/modules/tpm/challengesnew/tpm-md-editor.js @@ -289,8 +289,6 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla setEditorInstance(this) } }) - console.log('editor_instance'); - console.log(editor_instance); }, [containerId, editorInstance, startInit])