diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index fe7eba52..c86e31d9 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -197,7 +197,7 @@ function CoderDepot(props){ let ele = document.getElementById("ptxt"); if(ele){ let h = ele.offsetHeight; - if( h > 33 ) setHideBtn(true); + if( h > 35 ) setHideBtn(true); } } },[projectDetail,lastCommit]) diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx index f5220b09..04550061 100644 --- a/src/forge/Main/Diff.jsx +++ b/src/forge/Main/Diff.jsx @@ -18,6 +18,9 @@ const Infos = styled.div` border: 1px solid rgba(42, 97, 255, 0.23); border-radius: 3px 3px 0px 0px; padding: 10px 20px 10px 16px; + & .markdown-body table{ + background: #f1f8ff; + } & .f-wrap-between{ align-items: center; } diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index f87b82f9..a177ccc7 100644 --- a/src/forge/Main/Index.scss +++ b/src/forge/Main/Index.scss @@ -252,10 +252,10 @@ border: 1px solid rgba(42, 97, 255, 0.23); background-color: #FAFCFF; .ellipsistxt{ - .markdown-body{ - line-height: 8px; - & p { - margin: 0 0px !important; + &:hover .markdown-body{ + color: #466AFF; + & a{ + color: #466AFF; } } margin-top: 2px; @@ -269,6 +269,25 @@ white-space:-pre-wrap; /* Opera 4-6 */ white-space:-o-pre-wrap; /* Opera 7 */ word-wrap:break-word; + .markdown-body{ + line-height: 10px; + & p { + margin: 0px 0px !important; + } + & ol,ul{ + padding-bottom: 3px; + & li{ + min-height: 18px; + } + } + & table{ + line-height: 1; + background: #FAFCFF; + } + &:first-child { + margin-top: -1px !important; + } + } } margin-left: 13px; line-height:18px; @@ -276,7 +295,7 @@ width: 0; color: #666; &.hidetxt{ - height: 22px; + height: 24px; overflow: hidden; position: relative; padding-right:8px; diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss index 73b534de..83b4d5ee 100644 --- a/src/forge/Main/list.scss +++ b/src/forge/Main/list.scss @@ -735,6 +735,9 @@ a.color-grey-ccc:hover{ border-radius: 4px; margin-left: 16px; align-items: center; + & .markdown-body table{ + background: #FAFCFF; + } &:after,&:before{ content: ""; position: absolute; @@ -760,6 +763,9 @@ a.color-grey-ccc:hover{ &:before{ border-right: 10px solid rgba(42, 97, 255, 0.58); } + & .markdown-body table{ + background: #EEF6FF; + } } .treecopy-cont{ padding: 4px 15px; diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx index 87260cdd..b4cf5b48 100644 --- a/src/forge/Merge/Files.jsx +++ b/src/forge/Merge/Files.jsx @@ -52,7 +52,7 @@ function Files({ data,history,owner,projectsId , parentsSha }){ {item.name}
- 0 && ":"}${item.addition>0?item.addition+"处添加":""}${item.addition>0 && item.deletion>0 ?"和":""}${item.deletion>0?item.deletion+"处删除":""}`}> + 0 ? ":":""}${item.addition>0?item.addition+"处添加":""}${item.addition>0 && item.deletion>0 ?"和":""}${item.deletion>0?item.deletion+"处删除":""}`}> {item.addition >0 && +{item.addition}} {item.deletion >0 && -{item.deletion}} @@ -100,7 +100,7 @@ function Files({ data,history,owner,projectsId , parentsSha }){
- 0 && ":"} ${item.addition > 0 ? item.addition + "处添加" : ""}${item.addition > 0 && item.deletion > 0 ? "和" : ""}${item.deletion > 0 ? item.deletion + "处删除" : ""}`}> + 0 ? ":":""} ${item.addition > 0 ? item.addition + "处添加" : ""}${item.addition > 0 && item.deletion > 0 ? "和" : ""}${item.deletion > 0 ? item.deletion + "处删除" : ""}`}> {item.addition+item.deletion}处