From 5d5570b6fc1c036c3b49b5fdb5c328eaaa104445 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Feb 2022 15:52:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=A2=E5=B1=B1=E5=BC=80?= =?UTF-8?q?=E6=BA=90=E6=95=B4=E4=BD=93=E6=A0=B7=E5=BC=8F=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E7=BB=86=E8=8A=82=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 3 +- src/Loading.js | 15 +++++++- src/forge/Main/Index.js | 5 +-- src/forge/Main/IndexItem.js | 18 ++++------ src/forge/css/index.scss | 3 +- src/military/index.scss | 6 ++-- src/military/notice/noticeList/index.scss | 43 ++++++++++++++++++----- src/military/task/index.scss | 24 +++++++++++++ src/military/task/taskDetail/index.jsx | 2 +- src/military/task/taskDetail/index.scss | 10 ++++-- src/military/task/taskList/index.jsx | 5 +-- src/modules/courses/css/Courses.css | 4 +-- src/modules/tpm/TPMIndex.css | 4 +-- 13 files changed, 104 insertions(+), 38 deletions(-) diff --git a/src/App.js b/src/App.js index e3b02f52f..8675a9553 100644 --- a/src/App.js +++ b/src/App.js @@ -300,7 +300,8 @@ class App extends Component { this.Modifyloginvalue()}> - + {/* 红山开源项目暂无右下方便捷按钮 */} + {/* */} {/* */} {/* wiki预览 */} diff --git a/src/Loading.js b/src/Loading.js index 8175b7df8..f99057471 100644 --- a/src/Loading.js +++ b/src/Loading.js @@ -9,7 +9,20 @@ class Loading extends Component { } render() { - return "" + return ( +
+ + +
+ ); } } diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js index ea1a51a07..c953026d3 100644 --- a/src/forge/Main/Index.js +++ b/src/forge/Main/Index.js @@ -10,6 +10,7 @@ import ListItem from './IndexItem'; import axios from 'axios'; import img_new from '../Images/new.png'; import img_array from '../Images/array.png'; +import banner from '../Images/banner_list.png'; import CheckProfile from '../Component/ProfileModal/Profile'; const Search = Input.Search; @@ -291,9 +292,9 @@ class Index extends Component { return (
- {/*

+

-

*/} +

{/* { recommendOriList && recommendOriList.length>0? diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index a5792d974..632f55560 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -102,18 +102,12 @@ class IndexItem extends Component { } - { - item.praises_count && item.praises_count>0 ? - - 赞 {item.praises_count} - :"" - } - { - item.forked_count && item.forked_count>0 ? - - fork {item.forked_count} - :"" - } + + 赞 {item.praises_count} + + + fork {item.forked_count} +

{item.description}

diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index 0084e8dbb..29bf18656 100644 --- a/src/forge/css/index.scss +++ b/src/forge/css/index.scss @@ -2,7 +2,8 @@ ul,ol,dl{ margin-bottom: 0px; } .newMain{ - background-color: #fff; + padding-bottom: 110px; + background-color: #f5f5f5; } .newTable{ background-color: #F0F5FF; diff --git a/src/military/index.scss b/src/military/index.scss index d698d19b4..8ba0cfb8a 100644 --- a/src/military/index.scss +++ b/src/military/index.scss @@ -123,11 +123,11 @@ max-width: 500px; } -.link { - color: #0089ff; +.link, .link:hover { + color: #4154f1; cursor: pointer; &:hover { - color: #509eff; + opacity: 0.8; } } diff --git a/src/military/notice/noticeList/index.scss b/src/military/notice/noticeList/index.scss index d4b58f5fe..2c2eabe92 100644 --- a/src/military/notice/noticeList/index.scss +++ b/src/military/notice/noticeList/index.scss @@ -41,9 +41,16 @@ justify-content: space-between; padding: .3rem 2rem 1.5rem; margin: 0px -1.25rem; - // border: 1px solid; border-bottom: 1px solid #E0E0E0; - // background: #f5f5f5; + .ant-input:hover{ + border-color: #4154f1; + } + .ant-btn-primary{ + background-color: #4154f1; + &:hover{ + opacity: 0.8; + } + } } .notice-center-content{ @@ -66,7 +73,7 @@ } i{ margin-right: .25em; - color: #1890FF; + color: #4154f1; } } } @@ -91,10 +98,10 @@ color: #333; cursor: pointer; &:hover{ - color: #1890FF; + color: #4154f1; } &.active{ - color: #1890FF; + color: #4154f1; } } } @@ -108,6 +115,9 @@ margin-right: 20px; width: 20.8em; caret-color: rgba(0, 0, 0, 0); + .menu-ul:last-child{ + margin-top: 12px; + } } .none_p_title{ @@ -135,9 +145,9 @@ } span:hover{ - color: #1484EF; + color: #4154f1; .iconfont{ - color: #1484EF !important; + color: #4154f1 !important; } } } @@ -174,7 +184,7 @@ width: 6px; content: ''; height: 30px; - background: #1484EF; + background: #4154f1; } } @@ -185,4 +195,21 @@ .ant-input-group-addon .ant-btn-lg { height: 40px; +} + +.edu-txt-center .ant-pagination { + margin: 2rem auto; + text-align: center; + .ant-pagination-item:focus, .ant-pagination-item:hover, .ant-pagination-item-active, .ant-pagination-prev:hover a, .ant-pagination-next:hover a, .ant-pagination-options-quick-jumper input:focus, .ant-pagination-options-quick-jumper input:hover{ + border-color: #4154f1; + } + .ant-pagination-disabled{ + & a, & :hover a, & :focus a, & .ant-pagination-item-link, &:hover .ant-pagination-item-link , &:focus .ant-pagination-item-link { + color: rgba(0, 0, 0, 0.25) !important; + border-color: #d9d9d9; + } + } + .ant-pagination-item-active a{ + color: #4154f1 + } } \ No newline at end of file diff --git a/src/military/task/index.scss b/src/military/task/index.scss index 107587d29..fe484d808 100644 --- a/src/military/task/index.scss +++ b/src/military/task/index.scss @@ -90,6 +90,15 @@ span.list-gray { .center-content .ant-pagination { margin: 2rem auto; text-align: center; + .ant-pagination-item:focus, .ant-pagination-item:hover, .ant-pagination-item-active, .ant-pagination-prev:hover a, .ant-pagination-next:hover a, .ant-pagination-options-quick-jumper input:focus, .ant-pagination-options-quick-jumper input:hover{ + border-color: #4154f1; + } + .ant-pagination-disabled{ + & a, & :hover a, & :focus a, & .ant-pagination-item-link, &:hover .ant-pagination-item-link , &:focus .ant-pagination-item-link { + color: rgba(0, 0, 0, 0.25) !important; + border-color: #d9d9d9; + } + } } .text-ellipsis { @@ -105,3 +114,18 @@ span.list-gray { max-width: 80%; } } + +.demand_submission,.demand_submission:focus,.failByPression .ant-modal-body .ant-btn-primary{ + background-color: #4154f1; + border: none; + &:hover{ + background-color: #4154f1; + opacity: 0.8; + } +} +.center-right-but .ant-input:hover, .center-content .ant-pagination-prev:hover{ + border-color: #4154f1 !important; +} +.failByPression .ant-modal-body .anticon, .center-right-but .ant-input-search-icon:hover, .center-content .ant-pagination-item-active a{ + color: #4154f1; +} \ No newline at end of file diff --git a/src/military/task/taskDetail/index.jsx b/src/military/task/taskDetail/index.jsx index b390dff54..46fc29357 100644 --- a/src/military/task/taskDetail/index.jsx +++ b/src/military/task/taskDetail/index.jsx @@ -470,7 +470,7 @@ export default Form.create()( {!current_user.enterpriseCertification && } {current_user.enterpriseCertification && detailData.status === 3 && (!detailData.exceptClosedBoolean) && signContent()} diff --git a/src/military/task/taskDetail/index.scss b/src/military/task/taskDetail/index.scss index 9f7a05492..2f12465d1 100644 --- a/src/military/task/taskDetail/index.scss +++ b/src/military/task/taskDetail/index.scss @@ -21,7 +21,7 @@ background: #f1f8ff; border-radius: 4px; float: left; - color: #459be6; + color: #4154f1; height: 1.25rem; line-height: 1.25rem; } @@ -61,7 +61,7 @@ } .tasks_status li.active { - background: #4cacff; + background: #4154f1; color: #fff; } @@ -92,7 +92,7 @@ } .tasks_status li.active:after { - border-color: transparent transparent #4cacff transparent; + border-color: transparent transparent #4154f1 transparent; transform: rotate(90deg); } @@ -167,4 +167,8 @@ li.except-close{ background: #fa6400; color: #fff; +} + +.color-blue_41{ + color: #4154f1; } \ No newline at end of file diff --git a/src/military/task/taskList/index.jsx b/src/military/task/taskList/index.jsx index f4fedc068..5e5dc6d93 100644 --- a/src/military/task/taskList/index.jsx +++ b/src/military/task/taskList/index.jsx @@ -163,7 +163,8 @@ export default ({ history, current_user, showLoginDialog, location }) => { }); } else { Modal.info({ - content: '您没有权限需求提报' + content: '您没有权限需求提报', + className:'failByPression' }); } } @@ -227,7 +228,7 @@ export default ({ history, current_user, showLoginDialog, location }) => { onSearch={(value) => { setSearchInput(value); setCurPage(1); }} /> - + diff --git a/src/modules/courses/css/Courses.css b/src/modules/courses/css/Courses.css index 06466b072..70e2e59ec 100644 --- a/src/modules/courses/css/Courses.css +++ b/src/modules/courses/css/Courses.css @@ -580,7 +580,7 @@ span.CodeMirror-selectedtext { body #root { - background: #fff; + background: #f5f5f5; } .newedu-class-leftnav { @@ -1531,7 +1531,7 @@ samp { } .ant-input-search-icon:hover { - color: #4CACFF !important; + /* color: #4CACFF !important; */ } .coursehomework:hover .activity-title { diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index 6ba5a974c..740207ed7 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -32,7 +32,7 @@ body>.-task-title { position: fixed; background: #fff; color: #333; - box-shadow: 0 0 12px rgb(0 ,0 ,0,10%); + /* box-shadow: 0 0 12px rgb(0 ,0 ,0,10%); */ } .newHeaders.publicNav{ position: absolute; @@ -103,7 +103,7 @@ body>.-task-title { } .newContainer { - background: #fff; + background: #fafafa; } .ant-modal-title {