Merge pull request '1013' (#589) from gitlink_server into pre_gitlink_server

1

src/forge/Merge/merge.js

@@ -407,7 +407,7 @@ class merge extends Component {
             </li>
           </ul>
         </div>
-        <div style={{minHeight:"470px"}}>
+        <div style={{minHeight:"470px",paddingBottom:"50px"}}>
           <Spin spinning={isSpin}>
             {data && data.search_count && data.search_count > 0 ? (
               <div className="mergeData">
@@ -427,7 +427,7 @@ class merge extends Component {
               </div>
             ):""}
             {search_count > select_params.limit ? (
-              <div className="mt30 mb50 edu-txt-center">
+              <div className="mt30 edu-txt-center">
                 <Pagination
                   simple
                   current={select_params.page}

src/forge/Team/RightBox.jsx

@@ -175,7 +175,7 @@ function RightBox({ OIdentifier , history , admin , showCompeleteDialog ,complet
                     (item.is_admin || item.is_member) ?
                     <Link to={`/${OIdentifier}/teams/${item.id}`}><ColorListName>{item.nickname}</ColorListName></Link>
                     :
-                    <ColorListName>{item.name}</ColorListName>
+                    <ColorListName>{item.nickname}</ColorListName>
                   }
                   <Align>
                     <Span><span style={{color:"rgba(31, 35, 41, 1)"}}>{item.num_users}</span>名成员</Span>

src/home/Index.scss

@@ -812,8 +812,13 @@ body{
           text-decoration: underline;
         }
       }
-      span{
+      span.listboxcount{
+        margin-left: 20px;
+      }
+      span.listboxtime{
         margin-left: 40px;
+        width: 97px;
+        text-align: right;
       }
       .listboxcount{
         min-width: 60px;

src/home/ThirdEdition.jsx

@@ -1,5 +1,6 @@
 import React,{ useState , useEffect , useMemo } from 'react';
 import { Spin , Skeleton } from 'antd';
+import moment from 'moment';
 import T311 from './Img/3-1-1.png';
 import T312 from './Img/3-1-2.png';
 import T321 from './Img/3-2-1.png';
@@ -141,8 +142,8 @@ function ThirdEdition() {
                       return(
                         <li>
                           <a href={i.url} target="_blank">{i.title}</a>
-                          <span className="listboxcount"><i className="iconfont icon-a-liulanicon2x mr5"></i>{i.visits}</span>
-                          <span>{i.created_time && i.created_time.split(" ")[0]}</span>
+                          {i.from !== "other" && <span className="listboxcount"><i className="iconfont icon-a-liulanicon2x mr5"></i>{i.visits}</span> }
+                          {i.from !== "other" && <span className="listboxtime">{i.created_time && moment(i.created_time).format("YYYY-MM-DD")}</span> }
                         </li>
                       )
                     }):""
@@ -180,7 +181,7 @@ function ThirdEdition() {
                       <li>
                         <a href={i.url} target="_blank">{i.title}</a>
                         {i.from !== "other" && <span className="listboxcount"><i className="iconfont icon-a-liulanicon2x mr5"></i>{i.visits}</span> }
-                        <span>{i.created_time && i.created_time.split(" ")[0]}</span>
+                        {i.from !== "other" && <span className="listboxtime">{i.created_time && moment(i.created_time).format("YYYY-MM-DD")}</span> }
                       </li>
                     )
                   }):""
@@ -198,8 +199,8 @@ function ThirdEdition() {
                     return(
                       <li>
                         <a href={i.url} target="_blank">{i.title}</a>
-                        <span className="listboxcount"><i className="iconfont icon-a-liulanicon2x mr5"></i>{i.visits}</span>
-                        <span>{i.created_time && i.created_time.split(" ")[0]}</span>
+                        {i.from !== "other" && <span className="listboxcount"><i className="iconfont icon-a-liulanicon2x mr5"></i>{i.visits}</span> }
+                        {i.from !== "other" && <span className="listboxtime">{i.created_time && moment(i.created_time).format("YYYY-MM-DD")}</span> }
                       </li>
                     )
                   }):""

src/modules/tpm/challengesnew/css/newquestion.css

@@ -80,6 +80,6 @@
     border: none;
     margin:0px auto;
 }
-.editormd-editing .quoteBox{
+.editormd-editing.quoteBox .editormd{
     overflow: unset;
 }

src/modules/tpm/challengesnew/tpm-md-editor.js

@@ -762,8 +762,8 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
 
   return (
     <Fragment>
-      <div ref={editorEl} className={`df editormd-editing ${className} ${imageExpand && 'editormd-image-click-expand'} `}>
-        <div className={`edu-back-greyf5 radius4 editormd ${error ? 'error' : ''} ${quoteVisible || atWhoVisible ? 'quoteBox' : ''}`} id={containerId} >
+      <div ref={editorEl} className={`df editormd-editing ${className} ${imageExpand && 'editormd-image-click-expand'}  ${(quoteVisible || atWhoVisible) ? 'quoteBox' : ''} `}>
+        <div className={`edu-back-greyf5 radius4 editormd ${error ? 'error' : ''}`} id={containerId} >
           {quoteVisible && QuoteDiv }
           {atWhoVisible && atWhoList}
           <textarea style={{ display: 'none' }} id={editorBodyId} name="content"></textarea>