diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 70d1901eb..fe7eba521 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -22,6 +22,7 @@ import UpdateDescModal from './sub/UpdateDescModal'; import Nodata from '../Nodata'; import Invite from './sub/Invite'; import CheckProfile from '../Component/ProfileModal/Profile'; +import RenderHtml from '../../components/render-html'; /** * projectDetail.type:0是托管项目,1是镜像项目,2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能) */ @@ -196,7 +197,7 @@ function CoderDepot(props){ let ele = document.getElementById("ptxt"); if(ele){ let h = ele.offsetHeight; - if( h > 18 ) setHideBtn(true); + if( h > 33 ) setHideBtn(true); } } },[projectDetail,lastCommit]) @@ -457,7 +458,7 @@ function CoderDepot(props){
-
{lastCommit.message}
+
{ hideBtn && changeHide(hide)}> } diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx index a50c16c71..f5220b092 100644 --- a/src/forge/Main/Diff.jsx +++ b/src/forge/Main/Diff.jsx @@ -86,7 +86,7 @@ export default (props) => {
{commit && commit.message && - + } {data.branch}
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index f2f7cd2b4..f87b82f97 100644 --- a/src/forge/Main/Index.scss +++ b/src/forge/Main/Index.scss @@ -252,7 +252,13 @@ border: 1px solid rgba(42, 97, 255, 0.23); background-color: #FAFCFF; .ellipsistxt{ - margin-top: 6px; + .markdown-body{ + line-height: 8px; + & p { + margin: 0 0px !important; + } + } + margin-top: 2px; // cursor: pointer; #ptxt{ margin-bottom: 0px; @@ -270,7 +276,7 @@ width: 0; color: #666; &.hidetxt{ - height: 18px; + height: 22px; overflow: hidden; position: relative; padding-right:8px; diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index 12ebae462..a19619d73 100644 --- a/src/forge/css/index.scss +++ b/src/forge/css/index.scss @@ -104,7 +104,7 @@ ul,ol,dl{ white-space: normal; &:hover{ text-decoration: underline; - & p{ + & .markdown-body{ color: #466AFF; } }