通知管理
-
-
您可以通过通知管理来选择接受通知的方式
-
- 我创建或负责的
-
-
-
-
易修截止日期到达最后一天
-
站内信
-
邮件
-
-
+
+
您可以通过通知管理来选择接受通知的方式
+
+ 我创建或负责的
+
+
+
+
易修截止日期到达最后一天
+
站内信
+
邮件
+
+
+
+
-
- 我管理的仓库
-
-
-
+
+ 我管理的仓库
+
+
+
+
+
+
+
+ 我关注的仓库
+
+
+
+
+
+
)
diff --git a/src/forge/SecuritySetting/notice/manager/Index.scss b/src/forge/SecuritySetting/notice/manager/Index.scss
index 987e81118..1b5729ae6 100644
--- a/src/forge/SecuritySetting/notice/manager/Index.scss
+++ b/src/forge/SecuritySetting/notice/manager/Index.scss
@@ -1,5 +1,8 @@
-
-.cont-top{
+.notice-manager-tip{
+ font-size:16px;
+ font-weight:400;
+}
+.manager-cont-top{
font-size: 14px;
font-weight: 600;
height: 44px;
@@ -12,18 +15,63 @@
margin-top: 25px;
}
-.cont{
+.manager-cont{
padding: 8px 20px 6px;
display: flex;
align-items: center;
font-size: 14px;
- .title{
+ .manager-cont-title{
width: 320px;
}
- label{
- margin-left: 6px;
- margin-right: 34px;
+
+}
+
+.notice01{
+ .ant-checkbox-disabled.ant-checkbox-checked .ant-checkbox-inner::after {
+ border-color: white;
+ }
+ .ant-checkbox-disabled .ant-checkbox-inner {
+ background-color: #999999 !important;
+ border-color: #999999 !important;
+ }
+
+ .ant-checkbox-checked .ant-checkbox-inner {
+ background-color: #466AFF;
+ border: #466AFF;
+ }
+
+ .ant-checkbox-checked::after{
+ border: 1px solid #466AFF;
+ }
+ .ant-checkbox-wrapper:hover .ant-checkbox-inner, .ant-checkbox:hover .ant-checkbox-inner, .ant-checkbox-input:focus + .ant-checkbox-inner,.ant-radio-checked .ant-radio-inner,.ant-radio-wrapper:hover .ant-radio, .ant-radio:hover .ant-radio-inner, .ant-radio-input:focus + .ant-radio-inner {
+ border-color: #466AFF;
+ }
+
+ .ant-checkbox + span,.manager-cont-title {
+ color: #000000;
+ }
+
+ .ant-radio-inner::after{
+ background-color:#466AFF;
+ }
+
+ // .ant-radio-checked .ant-radio-inner {
+ // border-color: #466AFF;
+ // }
+
+ .but25{
+ background-color: #466AFF;
+ color: #fff;
+ border-color: #466AFF;
+ &:hover{
+ background-color: #4a76f8;
+ border-color: #4a76f8;
+ }
+ &:active{
+ background-color: #466AFF;
+ border-color: #466AFF;
+ }
}
}
\ No newline at end of file
diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.jsx b/src/forge/SecuritySetting/notice/myNotice/Index.jsx
index 0989eb1e3..3a5eb1751 100644
--- a/src/forge/SecuritySetting/notice/myNotice/Index.jsx
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.jsx
@@ -1,6 +1,7 @@
import React, { useState, useEffect } from 'react';
-import { Badge, Button, Menu } from 'antd';
+import { Badge, Button, Checkbox, Menu } from 'antd';
import './Index.scss';
+import '../manager/Index.scss'
import DelModal from '../../../Wiki/components/ModalFun';
function MyNotice(props) {
@@ -47,29 +48,30 @@ function MyNotice(props) {
}
return (
-
+
-
+
-
+
全选 已选择 {selectedNum} 项
-
+
@@ -77,7 +79,7 @@ function MyNotice(props) {
{noticeType === "1" ?
- props.history.push('/settings/notice/privateLetter')}>
+
props.history.push('/settings/notice/privateLetter')}>
@@ -86,28 +88,28 @@ function MyNotice(props) {
删除
- 最好的OpenStack控制台,对标OpenStack社区Horizon项目,在易用性、页面性能等方面进行深度优化,提供简单控制台。
+ 最好的OpenStack控制台,对标OpenStack社区Horizon项目,最好的OpenStack控制台,对标OpenStack社区Horizon项目,在易用性、页面性能等方面进行深度优化,提供简单控制台。
- :
-
+ :
+
{/* 系统通知 */}
{noticeType === "0" ?
: ""}
{noticeType === "0" ?
: ""}
{noticeType === "2" ?
: ""}
{noticeType === "2" ?
: ""}
-
蒋宇航在Gitlink/Gitlink新建易修:【Bug】链接地址错误
+
蒋宇航在Gitlink/Gitlink新建易修:【Bug】链接地址错误
-
+
4分钟前
-
标记为已读 {noticeType === "0" ? "" :
删除}
+
标记为已读 {noticeType === "0" ? "" :
删除}
}
{noticeType === "1" ?
-
+
@@ -116,28 +118,28 @@ function MyNotice(props) {
删除
- gitlink平台 react 前端代码
+ gitlink平台 react 前端代码
- :
-
+ :
+
{/* 系统通知 */}
{noticeType === "0" ?
: ""}
{noticeType === "0" ?
: ""}
{noticeType === "2" ?
: ""}
{noticeType === "2" ?
: ""}
-
蒋宇航在蒋宇航/软件工程课程协同开发案例指派给你一个合并请求:请进行合并请求test请进行合并请求test请进行合并请求test请进行合并请求test请进行合并请求test请进行合并请求test
+
蒋宇航在蒋宇航/软件工程课程协同开发案例指派给你一个合并请求:请进行合并请求test请进行合并请求test请进行合并请求test请进行合并请求test请进行合并请求test请进行合并请求test
-
+
10分钟前
-
标记为已读 {noticeType === "0" ? "" :
删除}
+
标记为已读 {noticeType === "0" ? "" :
删除}
}
{noticeType === "1" ?
-
+
@@ -146,22 +148,22 @@ function MyNotice(props) {
删除
- 构建卷积神经网络,训练模型,预测模型效果。
+ 构建卷积神经网络,训练模型,预测模型效果。
- :
-
+ :
+
{/* 系统通知 */}
{noticeType === "0" ?
: ""}
{noticeType === "0" ?
: ""}
{noticeType === "2" ?
: ""}
-
你关注的仓库王涛/协同案例分析已被删除
+
你关注的仓库王涛/协同案例分析已被删除
-
+
1小时前
-
标记为已读 {noticeType === "0" ? "" :
删除}
+
标记为已读 {noticeType === "0" ? "" :
删除}
}
diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.scss b/src/forge/SecuritySetting/notice/myNotice/Index.scss
index c784bc88c..6b8afdd87 100644
--- a/src/forge/SecuritySetting/notice/myNotice/Index.scss
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.scss
@@ -49,6 +49,7 @@ button {
background: #FAFBFC;
border: 1px solid #D0D0D0;
border-radius: 4px;
+ height: 32px;
}
button:hover {
background: #F3F4F6;
@@ -74,8 +75,6 @@ button:active {
}
.mynotice-content {
- display: flex;
- align-items: center;
justify-content: space-between;
padding: 15px 0 15px 10px;
border-bottom: 1px solid #EEEEEE;
@@ -112,9 +111,7 @@ button:active {
// margin-right: 10px;
}
- .cont{
- display: flex;
- align-items: center;
+ .mynotice-cont{
padding:0;
}
}
@@ -156,16 +153,35 @@ button:active {
}
.highlightSpan{
- max-width: 40rem;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
&:hover{
color: #466AFF;
cursor: pointer;
}
}
+.letter-length-limit{
+ max-width: 50rem;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
+
+.sysNotice-length{
+ max-width: 52rem;
+}
+
+.at-length{
+ max-width: 48rem;
+}
#numberSpan{
color: #466AFF;
+}
+
+.vertical-center-style{
+ display: flex;
+ align-items: center;
+}
+
+.float-left-little{
+ margin-right: 10px;
}
\ No newline at end of file
diff --git a/src/forge/SecuritySetting/sub/SSH.jsx b/src/forge/SecuritySetting/sub/SSH.jsx
index bc004e119..80294b398 100644
--- a/src/forge/SecuritySetting/sub/SSH.jsx
+++ b/src/forge/SecuritySetting/sub/SSH.jsx
@@ -56,7 +56,7 @@ function SSH(props) {
setVisibleDesc(false)} desc={content}/>
SSH密钥
-
+
{
list && list.length > 0 &&
diff --git a/src/forge/users/Material/Base.jsx b/src/forge/users/Material/Base.jsx
index 5f776f8db..f9707ab0d 100644
--- a/src/forge/users/Material/Base.jsx
+++ b/src/forge/users/Material/Base.jsx
@@ -125,7 +125,7 @@ export default Form.create()(
-
+
{/* */}
diff --git a/src/forge/users/Material/Index.jsx b/src/forge/users/Material/Index.jsx
index 2ea0ecc17..869c1877f 100644
--- a/src/forge/users/Material/Index.jsx
+++ b/src/forge/users/Material/Index.jsx
@@ -1,5 +1,6 @@
import React , { useEffect , useState } from 'react';
import './Index.scss';
+import '../../SecuritySetting/notice/manager/Index.scss'
import { Menu } from 'antd';
import { Link } from 'react-router-dom';
import Base from './Base';
@@ -25,11 +26,14 @@ function Index(props){
return(
-
-
+
+
+
+
{
key === "0" ?
diff --git a/src/forge/users/Material/Index.scss b/src/forge/users/Material/Index.scss
index b24d3eb19..f4e79a52b 100644
--- a/src/forge/users/Material/Index.scss
+++ b/src/forge/users/Material/Index.scss
@@ -19,6 +19,12 @@
.ant-menu-item{
a{
font-size: 16px;
+ color: #333333;
+ position: relative;
+ bottom: -10px;
+ }
+ a:hover{
+ color: #333333;
}
}
}
\ No newline at end of file
diff --git a/src/forge/users/Material/Password.jsx b/src/forge/users/Material/Password.jsx
index 12b31ac53..d7a2abc6a 100644
--- a/src/forge/users/Material/Password.jsx
+++ b/src/forge/users/Material/Password.jsx
@@ -89,7 +89,7 @@ export default Form.create()(
-
+