haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 19:08:21 +00:00
Code Issues Releases Wiki Activity

Merge branch '10.0'

Browse Source
This commit is contained in:
杨顺强
2023-06-28 18:47:51 +08:00
parent a39dfcabf6 873b20fb8a
commit 3c59ebd62d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/dist.yml vendored
View File

@@ -4,7 +4,7 @@ on:
push: push:
branches: branches:
- master - master
- "9.0" - "10.0"
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

8
frontend/src/components/common/notification.js
View File

@@ -68,12 +68,12 @@ class Notification extends React.Component {
</a> </a>
<div id="notice-popover" className={`sf-popover ${this.state.showNotice ? '': 'hide'}`}> <div id="notice-popover" className={`sf-popover ${this.state.showNotice ? '': 'hide'}`}>
<div className="outer-caret up-outer-caret"><div className="inner-caret"></div></div> <div className="outer-caret up-outer-caret"><div className="inner-caret"></div></div>
<div className="sf-popover-hd ovhd"> <div className="sf-popover-hd h-7 d-flex align-items-center justify-content-center">
<h3 className="sf-popover-title title">{gettext('Notifications')}</h3> <h3 className="sf-popover-title title m-0">{gettext('Notifications')}</h3>
<a href="#" onClick={this.onClick} title={gettext('Close')} aria-label={gettext('Close')} className="sf-popover-close js-close sf2-icon-x1 action-icon float-right"></a> <a href="#" onClick={this.onClick} title={gettext('Close')} aria-label={gettext('Close')} className="sf-popover-close js-close sf2-icon-x1 action-icon m-0"></a>
</div> </div>
<div className="sf-popover-con"> <div className="sf-popover-con">
<ul className="notice-list"> <ul className="notice-list list-unstyled">
{this.state.noticeList.map(item => { {this.state.noticeList.map(item => {
return (<NoticeItem key={item.id} noticeItem={item} onNoticeItemClick={this.onNoticeItemClick}/>); return (<NoticeItem key={item.id} noticeItem={item} onNoticeItemClick={this.onNoticeItemClick}/>);
})} })}

2
media/css/seahub_react.css
View File

@@ -825,7 +825,7 @@ a, a:hover { color: #ec8000; }
#notice-popover .sf-popover-close { #notice-popover .sf-popover-close {
position: absolute; position: absolute;
right: 10px; right: 10px;
top: 5px; top: 17px;
} }
#notice-popover .sf-popover-hd { #notice-popover .sf-popover-hd {