diff --git a/src/forge/Head/NoticeContent.jsx b/src/forge/Head/NoticeContent.jsx index f5519f412..6b6384ec6 100644 --- a/src/forge/Head/NoticeContent.jsx +++ b/src/forge/Head/NoticeContent.jsx @@ -186,7 +186,7 @@ function NoticeContent({ visible, showNotification, resetUserInfo, current_user: noticeUnreadList.map(item => { return (
{ readItem(item) }}> -
+
diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss index affb697a9..263cd1ee5 100644 --- a/src/forge/Head/header.scss +++ b/src/forge/Head/header.scss @@ -200,9 +200,11 @@ } .noticeCont-back{ + .pointer{ + cursor: pointer; + } &:hover{ background: #F3F4F6; - cursor: pointer; } } @@ -212,7 +214,7 @@ padding: 12px 0 10px 0; line-height: 24px; border-bottom: 1px solid #EEEEEE; - + cursor: default; i{ font-size: 14px !important; margin-right: 6px; @@ -227,6 +229,8 @@ .noticeCont-text{ display: flex; color:#333333; + flex:auto; + justify-content: space-between; & .content-span{ word-break: break-all; @@ -248,7 +252,6 @@ .timeSpan{ font-size: 12px; color: #666666; - margin-left: 5px; } .at-name{ diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.scss b/src/forge/SecuritySetting/notice/myNotice/Index.scss index d0eadee92..8eab84c0c 100644 --- a/src/forge/SecuritySetting/notice/myNotice/Index.scss +++ b/src/forge/SecuritySetting/notice/myNotice/Index.scss @@ -91,7 +91,6 @@ button:active { & b{ font-weight: 400; text-shadow: 0.5px 0 #333; - margin: 0 6px; } & .invisable-read{ diff --git a/src/forge/common/static.js b/src/forge/common/static.js index a3973b38a..17e10c4e7 100644 --- a/src/forge/common/static.js +++ b/src/forge/common/static.js @@ -36,6 +36,8 @@ export const noticeSourceType = { PullRequestChanged:"icon-hebingqingqiuicon", // 我创建或负责的合并请求状态变更 PullRequestJournal:"icon-hebingqingqiuicon", // 我创建或负责的合并请求有新的评论 PullRequestClosed:"icon-hebingqingqiuicon", // 提交的合并请求被拒绝 + PullRequestMerged:"icon-hebingqingqiuicon", // 提交的合并请求被合并 + PullRequestClosed:"icon-hebingqingqiuicon", // 提交的合并请求被关闭 //里程碑 ProjectMilestone:"icon-lichengbeiicon", // 我管理的仓库有新的里程碑 }; \ No newline at end of file