diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js index 13ad2d2f9..5c55b2c1b 100644 --- a/src/common/UrlTool.js +++ b/src/common/UrlTool.js @@ -10,15 +10,12 @@ export const TEST_HOST = "https://testforgeplus.trustie.net/" export function getImageUrl(path) { const local = 'https://testforgeplus.educoder.net'; const normal = 'https://ali-cdn.educoder.net/images'; - const normalend = 'https://ali-cdn.educoder.net'; if(path.substr(0, 7) !== "/system"){ if (isDev) { return `${local}/${path}` } if(path.substr(0, 7) !== "/images"){ return `${normal}${path}`; - }else{ - return `${normalend}${path}`; } } return `${path}`; diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index ca0622d80..6cb20a751 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -258,7 +258,7 @@ class NewHeader extends Component { addMenu=(list)=>{ return( list && list.length >0 && -
+
{ list.map((item,key)=>{ diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss index 0246658a9..dc872cc3d 100644 --- a/src/forge/Head/header.scss +++ b/src/forge/Head/header.scss @@ -1,17 +1,45 @@ - +.dropdownFlex.double{ + width: 232px; + .ant-menu{ + height: 145px; + .ant-menu-item:nth-child(-n+4){ + border-right: 1px solid #eee; + } + .ant-menu-item{ + padding:0px 5px; + } + .ant-menu-item:hover a{ + color: #fff!important; + background-color: #1890ff; + } + } +} .dropdownFlex{ display:flex; background:#fff; border-radius: 3px; - .ant-menu-vertical > .ant-menu-item{ + padding:5px 0px; + box-sizing: border-box; + .ant-menu{ + display: flex; + flex-direction: column; + line-height: 45px; + flex-wrap: wrap; + } + .ant-menu > .ant-menu-item{ border:none; height: 35px; line-height: 35px; margin:0px; + width: 116px; &.ant-menu-item-selected{ background-color: #fff; a{color: rgba(0, 0, 0, 0.65)!important;} } + a{ + width: 100%; + text-align: center; + } &.ant-menu-item-active{ a{color: #4cacff!important;} } diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js index 70a379d24..3c3ffe9a8 100644 --- a/src/forge/Main/Index.js +++ b/src/forge/Main/Index.js @@ -274,9 +274,9 @@ class Index extends Component { - + */}
{ diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx index df97b2056..8728abed0 100644 --- a/src/forge/Main/sub/DetailBanner.jsx +++ b/src/forge/Main/sub/DetailBanner.jsx @@ -39,7 +39,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
  • - 代码库 + 代码
  • } @@ -69,7 +69,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa item.menu_name === "devops" && platform ?
  • - 工作流(beta版) + 工作流(beta) {projectDetail && projectDetail.ops_count ? {projectDetail.ops_count} : ""}
  • @@ -109,7 +109,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
  • 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}> - 仓库设置 + 设置
  • } @@ -127,7 +127,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
  • 0 ? "iconfont icon-tijiao color-grey-3 mr5 font-18":"iconfont icon-tijiao color-grey-6 font-18 mr5"}> - 代码质量分析 + 质量分析
  • }