From 67c262bcec612b62be25886ec1671d3f9f982ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= Date: Tue, 14 Jun 2022 15:09:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A3=8E=E6=A0=BC=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=9F=E4=B8=80=E9=A2=9C=E8=89=B2=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/webpack.config.dev.js | 6 + package-lock.json | 86 +++++++++ package.json | 1 + public/css/edu-purge.css | 11 +- src/forge/GetData/getData.jsx | 3 +- src/forge/Head/Header.js | 2 +- src/forge/Head/header.scss | 3 +- src/forge/Notice/Index.scss | 45 ++--- src/forge/Settings/setting.scss | 2 +- src/forge/css/index.scss | 7 +- src/forge/users/GeneralView/Index.scss | 4 + src/forge/users/Index.css | 245 ------------------------- src/forge/users/Index.scss | 1 - src/forge/users/Personal/Index.scss | 7 +- src/global.scss | 5 + 15 files changed, 143 insertions(+), 285 deletions(-) delete mode 100644 src/forge/users/Index.css create mode 100644 src/global.scss diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js index 55cbafe3..1603ddad 100644 --- a/config/webpack.config.dev.js +++ b/config/webpack.config.dev.js @@ -206,6 +206,12 @@ module.exports = { { loader: require.resolve("sass-loader"), }, + { + loader: 'sass-resources-loader', + options: { + resources: ['src/global.scss'] + } + } ], }, { diff --git a/package-lock.json b/package-lock.json index 8f4c24ca..391406a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15903,6 +15903,92 @@ } } }, + "sass-resources-loader": { + "version": "2.2.5", + "resolved": "http://173.15.15.82:8081/repository/npm-all/sass-resources-loader/-/sass-resources-loader-2.2.5.tgz", + "integrity": "sha512-po8rfETH9cOQACWxubT/1CCu77KjxwRtCDm6QAXZH99aUHBydwSoxdIjC40SGp/dcS/FkSNJl0j1VEojGZqlvQ==", + "dev": true, + "requires": { + "async": "^3.2.3", + "chalk": "^4.1.0", + "glob": "^7.1.6", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "http://173.15.15.82:8081/repository/npm-all/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "async": { + "version": "3.2.4", + "resolved": "http://173.15.15.82:8081/repository/npm-all/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", + "dev": true + }, + "chalk": { + "version": "4.1.2", + "resolved": "http://173.15.15.82:8081/repository/npm-all/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "http://173.15.15.82:8081/repository/npm-all/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "http://173.15.15.82:8081/repository/npm-all/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "http://173.15.15.82:8081/repository/npm-all/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "json5": { + "version": "2.2.1", + "resolved": "http://173.15.15.82:8081/repository/npm-all/json5/-/json5-2.2.1.tgz", + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", + "dev": true + }, + "loader-utils": { + "version": "2.0.2", + "resolved": "http://173.15.15.82:8081/repository/npm-all/loader-utils/-/loader-utils-2.0.2.tgz", + "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "http://173.15.15.82:8081/repository/npm-all/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "save-dev": { "version": "0.0.1-security", "resolved": "https://registry.npmjs.org/save-dev/-/save-dev-0.0.1-security.tgz", diff --git a/package.json b/package.json index c30bb6c3..30dcc9b1 100644 --- a/package.json +++ b/package.json @@ -213,6 +213,7 @@ "react-json-view": "^1.21.3", "reqwest": "^2.0.5", "resize-observer-polyfill": "^1.5.1", + "sass-resources-loader": "^2.2.5", "terser-webpack-plugin": "^2.3.5", "uglifyjs-webpack-plugin": "^2.2.0", "webpack": "^4.42.1", diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index 70f21467..407693a1 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -1365,15 +1365,12 @@ table { border: 0; } -a:link{ - color: #466aff; -} -a:visited { +a:link,a:visited{ text-decoration: none; - /* color: #05101a; */ - color: #1A47FF; + color: #05101a; } + ol, ul, li { @@ -2469,7 +2466,7 @@ a.hoverLine:hover{ } a:hover{ - color: #6684FE !important; + color: #6684FE; } .color-grey-98 { diff --git a/src/forge/GetData/getData.jsx b/src/forge/GetData/getData.jsx index 2ecc3111..753044b8 100644 --- a/src/forge/GetData/getData.jsx +++ b/src/forge/GetData/getData.jsx @@ -1,7 +1,8 @@ import axios from 'axios'; // 获取分支列表 export const getBranch = async (id,owner)=>{ - return (await axios.get(`/${owner}/${id}/branches.json`)).data; + let res = await axios.get(`/${owner}/${id}/branches.json`); + return res&&res.data; } // 获取标签列表 export const getTag = async (id,owner)=>{ diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 58d3fcae..15435612 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -386,7 +386,7 @@ class NewHeader extends Component { } : - + 头像 diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss index bcdb9499..d46969b8 100644 --- a/src/forge/Head/header.scss +++ b/src/forge/Head/header.scss @@ -62,7 +62,8 @@ color: #666; &:hover{ color: #fff; - background: #4CACFF; + // background: #4CACFF; + background: #829BFF; } } } diff --git a/src/forge/Notice/Index.scss b/src/forge/Notice/Index.scss index ff43ac11..f3e5fa1d 100644 --- a/src/forge/Notice/Index.scss +++ b/src/forge/Notice/Index.scss @@ -1,28 +1,28 @@ -.noticeMenu{ - padding:0px 30px; +.noticeMenu { + padding: 0px 30px; display: flex; border-bottom: 1px solid #eee; - li{ + li { font-size: 16px; - padding:0px; - margin-right:30px; + padding: 0px; + margin-right: 30px; height: 70px; line-height: 70px; position: relative; transform: none; - a{ + a { display: flex; } - &.active a span{ - color: #1890ff; + &.active a span { + color: $primary-color; } - .unNum{ + .unNum { color: #d38900; font-size: 12px; border-radius: 13px; height: 16px; line-height: 16px; - padding:0px 4px; + padding: 0px 4px; min-width: 23px; text-align: center; background-color: #ffe4b3; @@ -32,30 +32,31 @@ } } } -.notifyList{ - padding:0px 30px; - li{ +.notifyList { + padding: 0px 30px; + li { display: flex; border-bottom: 1px solid #eee; - padding:20px 0px; - .notifyImg{ + padding: 20px 0px; + .notifyImg { width: 48px; height: 48px; border-radius: 50%; margin-right: 15px; } - .notifyFlex{ - flex:1; - p{ - margin:0px; + .notifyFlex { + flex: 1; + p { + margin: 0px; max-width: 660px; } - .notifyInfos{ + .notifyInfos { margin-bottom: 8px; + } } - &:last-child{ + &:last-child { border-bottom: none; } } -} \ No newline at end of file +} diff --git a/src/forge/Settings/setting.scss b/src/forge/Settings/setting.scss index f1855ddb..274cbf46 100644 --- a/src/forge/Settings/setting.scss +++ b/src/forge/Settings/setting.scss @@ -146,7 +146,7 @@ .bbr{border-bottom: 1px solid #f6f6f6;} .ant-input-group-addon{border: 0 !important;} .grid-item-left{display: grid; align-items: center; grid-template-columns: 1fr max-content;} -.text-primary{color: #1890ff !important;} +.text-primary{color: $primary-color !important;} .ant-dropdown-menu{min-width: 90px ; text-align: center !important;} .text-green{color: #28BD6C !important;} .text-yellow{color: #FF6E21 !important;} diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index ad1aad36..deedfc39 100644 --- a/src/forge/css/index.scss +++ b/src/forge/css/index.scss @@ -266,7 +266,8 @@ form{ width: 6px; content: ''; height: 33px; - background: #4CACFF; + // background: #4CACFF; + background: $primary-color; } .MenuTitle{ font-size: 16px; @@ -295,8 +296,8 @@ form{ border-color: #D0D0D0; } .ant-btn.ant-btn-background-ghost.ant-btn-primary:hover{ - background-color: #1890ff!important; - border-color: #1890ff; + background-color:$primary-color-hover!important; + border-color: $primary-color-hover; color: #fff; } .ant-btn.ant-btn-background-ghost.ant-btn-danger:hover{ diff --git a/src/forge/users/GeneralView/Index.scss b/src/forge/users/GeneralView/Index.scss index 17f3ee6c..2bd0a9ef 100644 --- a/src/forge/users/GeneralView/Index.scss +++ b/src/forge/users/GeneralView/Index.scss @@ -19,6 +19,10 @@ .name{ font-size: 16px; // color: #4CACFF; + color: $primary-color; + &:hover{ + color: $primary-color-hover; + } } .desc{ color: #999; diff --git a/src/forge/users/Index.css b/src/forge/users/Index.css deleted file mode 100644 index e2d9cf9a..00000000 --- a/src/forge/users/Index.css +++ /dev/null @@ -1,245 +0,0 @@ -.headerbox { - padding: 20px; - border-bottom: 1px solid #E0E0E0; - display: flex; - align-items: center; - justify-content: space-between; -} -.headerbox > div { - width: 400px; -} -.headerbox > p { - display: flex; - align-items: center; -} -.headerbox > p a { - color: #5091FF; - margin-left: 30px; - font-size: 16px; - display: flex; - align-items: center; -} -.headerbox .ant-btn.ant-input-search-button { - margin-top: -1px; - margin-right: -1px; -} - -.echartBox { - border: 1px solid #DEDEDE; -} -.echartBox > p { - color: #999; - padding: 15px 20px; - text-align: center; -} - -.contentBox { - padding: 20px 20px 0px 20px; -} -.contentBox > div { - margin-bottom: 20px; - display: flex; - align-items: center; - padding: 20px 25px; - background-color: #fafafa; -} -.contentBox > div .imgBox { - width: 190px; - height: 90px; - display: flex; - align-items: center; - justify-content: center; - margin-right: 20px; - background-color: #fff; -} -.contentBox > div .imgBox img { - max-width: 90%; - max-height: 90%; -} -.contentBox .item-news { - display: flex; - justify-content: space-between; - font-size: 12px; - color: #888; - margin-top: 3px; - margin-bottom: 0px; -} -.contentBox .teamdesc { - word-break: break-all; - line-height: 20px; -} - -.infosType { - padding: 20px 30px 0px 20px; - display: flex; - justify-content: space-between; -} -.infosType .infoStatus { - height: 30px; - background: white; - border-radius: 15px; - border: 1px solid #dddddd; - line-height: 30px; - font-size: 12px; - color: #888; - display: flex; -} -.infosType .infoStatus > span { - display: block; - padding: 0px 12px; - border-radius: 15px; - cursor: pointer; -} -.infosType .infoStatus > span.active { - background-color: #5091FF; - color: #fff; - padding: 0px 15px; -} -.infosType .infoStatus .statusDivider { - margin: 8px 0 0 0 !important; -} - -.userDescription { - color: #666666; - line-height: 18px; - text-align: left; - margin: 10px 0px; - word-break: break-all; - text-align: justify; - font-size: 16px; - text-align: center; -} - -.focusBox, .infoBox { - width: 100% !important; - display: inline-block; - margin-top: 30px; - padding-top: 30px; - border-top: 1px solid #f1f1f1; -} - -.infoBox { - padding-bottom: 10px; - text-align: left; - line-height: 28px; - color: #666; - margin-top: 20px; -} -.infoBox > div { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; -} -.infoBox i { - color: #DEDEDE; - font-size: 15px !important; -} -.infoBox span { - margin-left: 10px; -} -.headimg { - position: relative; - display: block; -} -.headimg img { - width: 110px; - height: 110px; - border-radius: 50%; -} -.headimg span { - position: absolute; - bottom: -6px; - right: -16px; -} -.headimg span i { - font-size: 25px !important; - border-radius: 50%; - color: #fff; -} -.headimg span i.icon-nan1 { - background-color: #1890FF; -} -.headimg span i.icon-nv1 { - background-color: pink; -} - -ul.ant-menu.menuStyle { - padding: 0px 30px; - font-size: 16px; -} -ul.ant-menu.menuStyle li { - height: 70px; - line-height: 70px; - padding: 0px; - margin-right: 30px !important; - border-bottom: transparent !important; -} - -.disposeInfo { - padding: 0px 30px; - min-height: 400px; -} -.disposeInfo .disposeItem { - display: flex; - justify-content: space-between; - padding: 30px 0px; - border-bottom: 1px solid #eee; -} - -.authTag { - display: inline-block; - padding: 0px 10px; - border-radius: 12px; - font-size: 12px; - height: 22px; - line-height: 22px; -} -.authTag.red { - border: 1px solid #F73030; - color: #F73030; -} -.authTag.green { - border: 1px solid #28BD6C; - color: #28BD6C; -} - -.CIList { - padding: 0px 30px; - min-height: 400px; -} -.CIList li { - display: flex; - justify-content: space-between; - padding: 28px 0px; - border-bottom: 1px solid #eee; -} - -.infosRightMenu .ant-menu-item { - padding: 0px; - margin: 0px 20px 0px 0px !important; - font-size: 17px; - height: 32px; - line-height: 0px; - border-bottom: 2px solid transparent !important; - position: relative; -} -.infosRightMenu .ant-menu-item a > i { - font-size: 15px; - margin-right: 8px; -} -.infosRightMenu .ant-menu-item .menuNum { - font-size: 12px; - margin-left: 3px; - color: #FF6E21; -} -.infosRightMenu .ant-menu-item.ant-menu-item-selected::before { - position: absolute; - width: 100%; - bottom: -1px; - height: 2px; - left: 0px; - background-color: #466aff; - content: ""; -} - -/*# sourceMappingURL=Index.css.map */ diff --git a/src/forge/users/Index.scss b/src/forge/users/Index.scss index 72f0c705..388c34ef 100644 --- a/src/forge/users/Index.scss +++ b/src/forge/users/Index.scss @@ -307,7 +307,6 @@ ul.ant-menu.menuStyle{ bottom: -1px; height: 2px; left: 0px; - // background-color: #1890ff; background-color: $primary-color; content:""; } diff --git a/src/forge/users/Personal/Index.scss b/src/forge/users/Personal/Index.scss index 4c739e9d..d9cc3ded 100644 --- a/src/forge/users/Personal/Index.scss +++ b/src/forge/users/Personal/Index.scss @@ -7,12 +7,13 @@ color: #d0d0d0; } .ant-btn.ant-btn-primary.ant-btn-background-ghost { - border-color: #1890ff; - color: #1890ff; + border-color: $primary-color; + color: $primary-color; margin-left: 20px; &:hover{ background-color: #fff!important; - color: #1890ff;; + border-color: $primary-color-hover; + color: $primary-color-hover; } } } diff --git a/src/global.scss b/src/global.scss new file mode 100644 index 00000000..0ee7a627 --- /dev/null +++ b/src/global.scss @@ -0,0 +1,5 @@ +$primary-color: #466aff; +$primary-color-hover: #6684FE; +$primary-color-active: #1A47FF; +$link-color: #466aff; +$link-black-color: #05101a;