Skip to content

Commit cd94c62

Browse files
committed
set style to articlenavigator
1 parent 972a374 commit cd94c62

4 files changed

Lines changed: 111 additions & 8 deletions

File tree

browser/finder/text.js

Whitespace-only changes.

browser/main/HomeContainer/Components/ArticleNavigator.js

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { PropTypes } from 'react'
2+
import ProfileImage from '../../components/ProfileImage'
23

34
export default class ArticleNavigator extends React.Component {
45
render () {
@@ -11,9 +12,14 @@ export default class ArticleNavigator extends React.Component {
1112
)
1213
})
1314

14-
let members = Array.isArray(user.Members) ? user.Members.map(member => {
15+
let members = Array.isArray(user.Members) ? user.Members.sort((a, b) => {
16+
return new Date(a._pivot_createdAt) - new Date(b._pivot_createdAt)
17+
}).map(member => {
1518
return (
16-
<div>{member.profileName}</div>
19+
<div key={'member-' + member.id}>
20+
<ProfileImage className='memberImage' email={member.email} size='22'/>
21+
<div className='memberProfileName'>{member.profileName}</div>
22+
</div>
1723
)
1824
}) : null
1925

@@ -22,17 +28,17 @@ export default class ArticleNavigator extends React.Component {
2228
<div className='userInfo'>
2329
<div className='userProfileName'>{user.profileName}</div>
2430
<div className='userName'>{user.name}</div>
25-
<i className='fa fa-fw fa-chevron-down'/>
31+
<button className='settingBtn'><i className='fa fa-fw fa-chevron-down'/></button>
2632
</div>
2733

2834
<div className='controlSection'>
2935
<button className='newPostBtn'>New Post</button>
3036
</div>
3137

3238
<div className='folders'>
33-
<div className='foldersHeader'>
34-
<div className='folderTitle'>Folders</div>
35-
<button className='addFolderBtn'><i className='fa fa-fw fa-plus'/></button>
39+
<div className='header'>
40+
<div className='title'>Folders</div>
41+
<button className='addBtn'><i className='fa fa-fw fa-plus'/></button>
3642
</div>
3743
<div className='folderList'>
3844
<button>All folders</button>
@@ -43,7 +49,8 @@ export default class ArticleNavigator extends React.Component {
4349
{user.userType === 'team' ? (
4450
<div className='members'>
4551
<div className='header'>
46-
<div className='title'></div>
52+
<div className='title'>Members</div>
53+
<button className='addBtn'><i className='fa fa-fw fa-plus'/></button>
4754
</div>
4855
<div className='memberList'>
4956
{members}

browser/main/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { DevTools, DebugPanel, LogMonitor } from 'redux-devtools/lib/react'
3636
let finalCreateStore = compose(devTools(), persistState(window.location.href.match(/[?&]debug_session=([^&]+)\b/)))(createStore)
3737
let store = finalCreateStore(reducer)
3838
let devEl = (
39-
<DebugPanel left right bottom>
39+
<DebugPanel top right bottom>
4040
<DevTools store={store} monitor={LogMonitor} />
4141
</DebugPanel>
4242
)

browser/styles/main/HomeContainer/components/ArticleNavigator.styl

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,99 @@ articleNavBgColor = #353535
55
absolute top bottom
66
left 60px
77
width 200px
8+
color white
9+
.userInfo
10+
height 60px
11+
display block
12+
border-bottom 1px solid borderColor
13+
.userProfileName
14+
color brandColor
15+
font-size 28px
16+
padding 6px 0 0 10px
17+
.userName
18+
color white
19+
padding-left 20px
20+
margin-top 3px
21+
.settingBtn
22+
width 22px
23+
height 22px
24+
line-height 22px
25+
border-radius 11px
26+
position absolute
27+
top 19px
28+
right 14px
29+
color white
30+
padding 0
31+
background-color transparent
32+
border 1px solid white
33+
&:active
34+
background-color brandColor
35+
border-color brandColor
36+
.controlSection
37+
height 88px
38+
padding 22px 15px
39+
.newPostBtn
40+
border none
41+
background-color brandColor
42+
color white
43+
height 44px
44+
width 170px
45+
border-radius 5px
46+
font-size 20px
47+
.folders, .members
48+
.header
49+
border-bottom 1px solid borderColor
50+
padding-bottom 5px
51+
margin-bottom 5px
52+
clearfix()
53+
.title
54+
float left
55+
padding-left 10px
56+
font-size 18px
57+
line-height 22px
58+
.addBtn
59+
float right
60+
margin-right 15px
61+
width 22px
62+
height 22px
63+
font-size 10px
64+
padding 0
65+
line-height 22px
66+
border 1px solid white
67+
border-radius 11px
68+
background-color transparent
69+
color white
70+
padding 0
71+
font-weight bold
72+
&:active
73+
background-color brandColor
74+
border-color brandColor
75+
.folders
76+
margin-bottom 15px
77+
.folderList button
78+
height 44px
79+
width 200px
80+
border none
81+
text-align left
82+
font-size 14px
83+
background-color transparent
84+
color white
85+
padding-left 15px
86+
&:hover
87+
background-color transparentify(white, 5%)
88+
&.active, &:active
89+
background-color brandColor
90+
.members
91+
.memberList>div
92+
height 33px
93+
width 200px
94+
margin-bottom 5px
95+
padding-left 15px
96+
.memberImage
97+
float left
98+
margin-top 5.5px
99+
border-radius 11px
100+
.memberProfileName
101+
float left
102+
line-height 33px
103+
margin-left 7px

0 commit comments

Comments
 (0)