diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index c8f7c907..047d2bc1 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -3908,6 +3908,17 @@ html>body #ajax-indicator { max-height: 340px; }/*头部导航条样式---2018-03-19--by-cs*/ +.privateTag{ + display: block; + padding:0px 6px; + border-radius: 12px; + border:1px solid #2FC25B; + height: 18px; + line-height: 18px; + font-size: 12px; + margin-left: 10px; + color: #2FC25B; +} .head-nav { text-align: center; height: 70px; diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index b92e5217..07bb194e 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; -import { Spin, Tooltip , message } from 'antd'; +import { Spin, Tooltip } from 'antd'; import { Link, Route, Switch } from 'react-router-dom'; -import { Content , FlexAJ } from '../Component/layout'; +import { Content , FlexAJ , AlignCenter } from '../Component/layout'; import DetailBanner from './sub/DetailBanner'; import Invite from './sub/Invite'; import '../css/index.scss' @@ -425,34 +425,32 @@ class Detail extends Component {
-
-

- {project && project.author && - - {project.author.name} - - } - / - - {project && project.name} - - { - projectDetail && projectDetail.type && projectDetail.type !== 0 ? - projectDetail.type === 2 ? - - - - : - - - - :"" + + +

+ {project && project.author && + {project.author.name} } - -

+ / + {project && project.name} +
+ { projectDetail && projectDetail.private && 私有} + { + projectDetail && projectDetail.type && projectDetail.type !== 0 ? + projectDetail.type === 2 ? + + + + : + + + + :"" + } + { firstSync ? "": - + { ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ? 同步镜像 : "" @@ -507,7 +505,7 @@ class Detail extends Component { } -
+
{ diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index ef3cbc0f..1c99ba3d 100644 --- a/src/forge/Main/Index.scss +++ b/src/forge/Main/Index.scss @@ -102,7 +102,19 @@ } } } - +.projectallName{ + display: flex; + align-items: center; + font-size: 22px; + font-weight: normal; + .projectN{ + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + flex: 1; + max-width: 500px; + } +} // coderDepot .Panels{ max-width: 1200px; diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index f11ee717..4a1b126e 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -35,9 +35,10 @@ class IndexItem extends Component {
- + {item.author.name}/{item.name} + { !item.is_public && 私有 } { item.forked_from_project_id ?