Merge branch 'newVersion_forge' into dev_devOps

src/forge/Main/Detail.js

@@ -443,9 +443,8 @@ class Detail extends Component {
                   }
                   <span className="detail_tag_btn">
                     <a className="detail_tag_btn_name" onClick={() => this.focusFunc(watched)}>
-                      {/* <img src={watched ? "iconf" : img_focus} alt="" width="14px" /> */}
-                      <i className={watched ? "iconfont icon-shixing color-orange font-14 mr3":"iconfont icon-kongxing color-grey-9 font-14 mr3"}></i>
-                      {watched ? '取消关注' : '关注'}
+                      <i className={watched ? "iconfont icon-shixing color-orange font-16 mr3":"iconfont icon-kongxing color-grey-9 font-16 mr3"}></i>
+                      <span>{watched ? '取消关注' : '关注'}</span>
                     </a>
                     <Link className="detail_tag_btn_count" style={{color:`${watched?"#2878FF":"#666"}`}} to={{ pathname: `/projects/${owner}/${projectsId}/watchers`, state }}>
                       {watchers_count}
@@ -453,9 +452,8 @@ class Detail extends Component {
                   </span>
                   <span className="detail_tag_btn">
                     <a className="detail_tag_btn_name" onClick={() => this.pariseFunc(praised)}>
-                      {/* <img src={praised ? img_parised : img_parise} width="13px" alt="" /> */}
                       <i className={praised ? "iconfont icon-weibiaoti105 color-orange font-14 mr3":"iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
-                      {praised ? '取消点赞' : '点赞'}
+                      <span>{praised ? '取消点赞' : '点赞'}</span>
                     </a>
                     <Link className="detail_tag_btn_count" style={{color:`${praised?"#2878FF":"#666"}`}} to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}>
                       {praises_count}
@@ -463,7 +461,8 @@ class Detail extends Component {
                   </span>
                   <span className="detail_tag_btn">
                     <a className="detail_tag_btn_name" onClick={this.forkFunc}>
-                      <i className="iconfont icon-fork color-grey-9 mr3"></i>Fork</a>
+                      <i className="iconfont icon-fork color-grey-9 mr3"></i>Fork
+                    </a>
                     <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}>
                       {forked_count}
                     </Link>
@@ -478,20 +477,20 @@ class Detail extends Component {
                   <li className={pathname==="about" ? "active" : ""}>
                     <Link to={{ pathname: `/projects/${owner}/${projectsId}/about`, state }}>
                       <i className={(pathname==="" || urlFlag) ? "iconfont icon-zhuye1 color-grey-3 mr5 font-14":"iconfont icon-zhuye1 color-grey-6 font-14 mr5"}></i>
-                      主页
+                      <span>主页</span>
                       </Link>
                   </li>
                   <li className={(pathname==="" || urlFlag) ? "active" : ""}>
                     <Link to={{ pathname: `/projects/${owner}/${projectsId}`, state }}>
                       <i className={(pathname==="" || urlFlag) ? "iconfont icon-daimaku color-grey-3 mr5 font-14":"iconfont icon-daimaku color-grey-6 font-14 mr5"}></i>
-                      代码库
+                      <span>代码库</span>
                       </Link>
                   </li>
                   <li className={pathname==="issues" ? "active" : ""}>
                     <Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}>
                       <i className={pathname==="issues" ? "iconfont icon-renwu color-grey-3 mr5 font-14":"iconfont icon-renwu color-grey-6 font-14 mr5"}></i>
-                      任务
-                      {projectDetail && projectDetail.issues_count ? <span>{projectDetail.issues_count}</span> : ""}
+                      <span>任务</span>
+                      {projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""}
                     </Link>
                   </li>
                   {
@@ -499,8 +498,8 @@ class Detail extends Component {
                     <li className={pathname==="pulls" ? "active" : ""}>
                       <Link to={{ pathname: `/projects/${owner}/${projectsId}/pulls`, state }}>
                         <i className={pathname==="pulls" ? "iconfont icon-hebingqingqiu1 color-grey-3 mr5 font-14":"iconfont icon-hebingqingqiu1 color-grey-6 font-14 mr5"}></i>
-                        合并请求
-                        {projectDetail && projectDetail.pull_requests_count ? <span>{projectDetail.pull_requests_count}</span> : ""}
+                        <span>合并请求</span>
+                        {projectDetail && projectDetail.pull_requests_count ? <span className="num">{projectDetail.pull_requests_count}</span> : ""}
                       </Link>
                     </li>
                   }
@@ -513,21 +512,24 @@ class Detail extends Component {
                   <li className={pathname==="milestones" ? "active" : ""}>
                     <Link to={{ pathname: `/projects/${owner}/${projectsId}/milestones`, state }}>
                         <i className={pathname==="milestones" ? "iconfont icon-lichengbei color-grey-3 mr5 font-14":"iconfont icon-lichengbei color-grey-6 font-14 mr5"}></i>
-                        里程碑
-                        {projectDetail && projectDetail.versions_count ? <span>{projectDetail.versions_count}</span> :""}
+                        <span>里程碑</span>
+                        {projectDetail && projectDetail.versions_count ? <span className="num">{projectDetail.versions_count}</span> :""}
                     </Link>
                   </li>
                   <li className={pathname==="activity" ? "active" : ""}>
                     <Link to={{ pathname: `/projects/${owner}/${projectsId}/activity`, state }}>
-                    <i className={pathname==="activity" ? "iconfont icon-tongzhi color-grey-3 mr5 font-14":"iconfont icon-tongzhi color-grey-6 font-14 mr5"}></i>
-                      动态
-                      </Link>
+                      <i className={pathname==="activity" ? "iconfont icon-tongzhi color-grey-3 mr5 font-14":"iconfont icon-tongzhi color-grey-6 font-14 mr5"}></i>
+                      <span>动态</span>
+                    </Link>
                   </li>
                   {
                     isManager &&
-                    <li className={url.indexOf("/setting") > 0 ? "active" : ""}><Link to={`/projects/${owner}/${projectsId}/setting`}>
-                      <i className={url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i>
-                      仓库设置</Link></li>
+                    <li className={url.indexOf("/setting") > 0 ? "active" : ""}>
+                      <Link to={`/projects/${owner}/${projectsId}/setting`}>
+                        <i className={url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i>
+                        <span>仓库设置</span>
+                      </Link>
+                    </li>
                   }
                 </ul>
               </div>

src/forge/Main/list.css

@@ -226,18 +226,17 @@
 }
 .headerMenu-wrapper li a{
   color: #666;
-  display: flex;
-  align-items: center;
 }
 .headerMenu-wrapper li a > img{
   margin-right: 8px;
 }
-.headerMenu-wrapper li a > span{
-  height: 18px;
-  line-height: 18px;
+.headerMenu-wrapper li a > span.num{
+  height: 28px;
+  line-height: 29px;
   margin-left: 8px;
   font-size: 12px;
   color: #2878FF;
+  float: right;
 }
 .headerMenu-wrapper li.active::after{
   position: absolute;
@@ -262,8 +261,6 @@
 }
 .detail_tag_btn_name{
   padding:0px 10px;
-  display: flex;
-  align-items: center;
   color: #666;
 }
 .detail_tag_btn_name img{