Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pro-blocks
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
duanledexianxianxian
pro-blocks
Commits
2618a582
Commit
2618a582
authored
Oct 19, 2017
by
afc163
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update notice style
parent
5e27eba7
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
13 deletions
+13
-13
mock/notices.js
mock/notices.js
+2
-2
src/components/NoticeIcon/NoticeList.js
src/components/NoticeIcon/NoticeList.js
+1
-1
src/components/NoticeIcon/NoticeList.less
src/components/NoticeIcon/NoticeList.less
+3
-4
src/components/NoticeIcon/demo/popover.md
src/components/NoticeIcon/demo/popover.md
+2
-2
src/components/NoticeIcon/index.less
src/components/NoticeIcon/index.less
+1
-1
src/layouts/BasicLayout.js
src/layouts/BasicLayout.js
+4
-3
No files found.
mock/notices.js
View file @
2618a582
...
@@ -56,8 +56,8 @@ export default {
...
@@ -56,8 +56,8 @@ export default {
id
:
'
000000009
'
,
id
:
'
000000009
'
,
title
:
'
任务名称
'
,
title
:
'
任务名称
'
,
description
:
'
任务需要在 2017-01-12 20:00 前启动
'
,
description
:
'
任务需要在 2017-01-12 20:00 前启动
'
,
extra
:
'
马上到期
'
,
extra
:
'
未开始
'
,
status
:
'
urgent
'
,
status
:
'
todo
'
,
type
:
'
待办
'
,
type
:
'
待办
'
,
},
{
},
{
id
:
'
000000010
'
,
id
:
'
000000010
'
,
...
...
src/components/NoticeIcon/NoticeList.js
View file @
2618a582
...
@@ -29,7 +29,7 @@ export default function NoticeList({
...
@@ -29,7 +29,7 @@ export default function NoticeList({
className
=
{
styles
.
meta
}
className
=
{
styles
.
meta
}
avatar
=
{
item
.
avatar
?
<
Avatar
className
=
{
styles
.
avatar
}
src
=
{
item
.
avatar
}
/> : null
}
avatar
=
{
item
.
avatar
?
<
Avatar
className
=
{
styles
.
avatar
}
src
=
{
item
.
avatar
}
/> : null
}
title
=
{
title
=
{
<
div
>
<
div
className
=
{
styles
.
title
}
>
{
item
.
title
}
{
item
.
title
}
<
div
className
=
{
styles
.
extra
}
>
{
item
.
extra
}
<
/div
>
<
div
className
=
{
styles
.
extra
}
>
{
item
.
extra
}
<
/div
>
<
/div
>
<
/div
>
...
...
src/components/NoticeIcon/NoticeList.less
View file @
2618a582
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
.avatar {
.avatar {
background: #fff;
background: #fff;
margin-top: 4px;
}
}
&.read {
&.read {
...
@@ -29,10 +30,7 @@
...
@@ -29,10 +30,7 @@
}
}
.title {
.title {
font-weight: normal;
font-weight: normal;
color: @text-color;
margin-bottom: 8px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
.description {
.description {
font-size: 12px;
font-size: 12px;
...
@@ -48,6 +46,7 @@
...
@@ -48,6 +46,7 @@
color: @text-color-secondary;
color: @text-color-secondary;
font-weight: normal;
font-weight: normal;
margin-right: 0;
margin-right: 0;
margin-top: -1.5px;
}
}
}
}
}
}
...
...
src/components/NoticeIcon/demo/popover.md
View file @
2618a582
...
@@ -55,13 +55,13 @@ ReactDOM.render(
...
@@ -55,13 +55,13 @@ ReactDOM.render(
list
=
{
noticeData
[
'
通知
'
]
}
list
=
{
noticeData
[
'
通知
'
]
}
title
=
"通知"
title
=
"通知"
emptyText
=
"你已查看所有通知"
emptyText
=
"你已查看所有通知"
emptyImage
=
"https://gw.alipayobjects.com/zos/rmsportal/
sAuJeJzSKbUmHfBQRzmZ
.svg"
emptyImage
=
"https://gw.alipayobjects.com/zos/rmsportal/
wAhyIChODzsoKIOBHcBk
.svg"
/>
/>
<
NoticeIcon
.
Tab
<
NoticeIcon
.
Tab
list
=
{
noticeData
[
'
消息
'
]
}
list
=
{
noticeData
[
'
消息
'
]
}
title
=
"消息"
title
=
"消息"
emptyText
=
"您已读完所有消息"
emptyText
=
"您已读完所有消息"
emptyImage
=
"https://gw.alipayobjects.com/zos/rmsportal/
wAhyIChODzsoKIOBHcBk
.svg"
emptyImage
=
"https://gw.alipayobjects.com/zos/rmsportal/
sAuJeJzSKbUmHfBQRzmZ
.svg"
/>
/>
<
NoticeIcon
.
Tab
<
NoticeIcon
.
Tab
list
=
{
noticeData
[
'
待办
'
]
}
list
=
{
noticeData
[
'
待办
'
]
}
...
...
src/components/NoticeIcon/index.less
View file @
2618a582
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
text-align: center;
text-align: center;
}
}
.ant-tabs-bar {
.ant-tabs-bar {
margin-bottom:
0
;
margin-bottom:
4px
;
}
}
}
}
}
}
src/layouts/BasicLayout.js
View file @
2618a582
...
@@ -122,9 +122,10 @@ class BasicLayout extends React.PureComponent {
...
@@ -122,9 +122,10 @@ class BasicLayout extends React.PureComponent {
}
}
if
(
newNotice
.
extra
&&
newNotice
.
status
)
{
if
(
newNotice
.
extra
&&
newNotice
.
status
)
{
const
color
=
({
const
color
=
({
todo
:
''
,
processing
:
'
blue
'
,
processing
:
'
blue
'
,
urgent
:
'
red
'
,
urgent
:
'
red
'
,
doing
:
'
yellow
'
,
doing
:
'
gold
'
,
})[
newNotice
.
status
];
})[
newNotice
.
status
];
newNotice
.
extra
=
<
Tag
color
=
{
color
}
>
{
newNotice
.
extra
}
<
/Tag>
;
newNotice
.
extra
=
<
Tag
color
=
{
color
}
>
{
newNotice
.
extra
}
<
/Tag>
;
}
}
...
@@ -243,13 +244,13 @@ class BasicLayout extends React.PureComponent {
...
@@ -243,13 +244,13 @@ class BasicLayout extends React.PureComponent {
list
=
{
noticeData
[
'
通知
'
]}
list
=
{
noticeData
[
'
通知
'
]}
title
=
"
通知
"
title
=
"
通知
"
emptyText
=
"
你已查看所有通知
"
emptyText
=
"
你已查看所有通知
"
emptyImage
=
"
https://gw.alipayobjects.com/zos/rmsportal/
sAuJeJzSKbUmHfBQRzmZ
.svg
"
emptyImage
=
"
https://gw.alipayobjects.com/zos/rmsportal/
wAhyIChODzsoKIOBHcBk
.svg
"
/>
/>
<
NoticeIcon
.
Tab
<
NoticeIcon
.
Tab
list
=
{
noticeData
[
'
消息
'
]}
list
=
{
noticeData
[
'
消息
'
]}
title
=
"
消息
"
title
=
"
消息
"
emptyText
=
"
您已读完所有消息
"
emptyText
=
"
您已读完所有消息
"
emptyImage
=
"
https://gw.alipayobjects.com/zos/rmsportal/
wAhyIChODzsoKIOBHcBk
.svg
"
emptyImage
=
"
https://gw.alipayobjects.com/zos/rmsportal/
sAuJeJzSKbUmHfBQRzmZ
.svg
"
/>
/>
<
NoticeIcon
.
Tab
<
NoticeIcon
.
Tab
list
=
{
noticeData
[
'
待办
'
]}
list
=
{
noticeData
[
'
待办
'
]}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment