From cd94c625a734e0bd03005ca1c1c467099c4d1aec Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Tue, 13 Oct 2015 01:28:16 +0900 Subject: [PATCH] set style to articlenavigator --- browser/finder/text.js | 0 .../Components/ArticleNavigator.js | 21 ++-- browser/main/index.js | 2 +- .../components/ArticleNavigator.styl | 96 +++++++++++++++++++ 4 files changed, 111 insertions(+), 8 deletions(-) create mode 100644 browser/finder/text.js diff --git a/browser/finder/text.js b/browser/finder/text.js new file mode 100644 index 00000000..e69de29b diff --git a/browser/main/HomeContainer/Components/ArticleNavigator.js b/browser/main/HomeContainer/Components/ArticleNavigator.js index 2cffda47..dd901dc3 100644 --- a/browser/main/HomeContainer/Components/ArticleNavigator.js +++ b/browser/main/HomeContainer/Components/ArticleNavigator.js @@ -1,4 +1,5 @@ import React, { PropTypes } from 'react' +import ProfileImage from '../../components/ProfileImage' export default class ArticleNavigator extends React.Component { render () { @@ -11,9 +12,14 @@ export default class ArticleNavigator extends React.Component { ) }) - let members = Array.isArray(user.Members) ? user.Members.map(member => { + let members = Array.isArray(user.Members) ? user.Members.sort((a, b) => { + return new Date(a._pivot_createdAt) - new Date(b._pivot_createdAt) + }).map(member => { return ( -
{member.profileName}
+
+ +
{member.profileName}
+
) }) : null @@ -22,7 +28,7 @@ export default class ArticleNavigator extends React.Component {
{user.profileName}
{user.name}
- +
@@ -30,9 +36,9 @@ export default class ArticleNavigator extends React.Component {
-
-
Folders
- +
+
Folders
+
@@ -43,7 +49,8 @@ export default class ArticleNavigator extends React.Component { {user.userType === 'team' ? (
-
+
Members
+
{members} diff --git a/browser/main/index.js b/browser/main/index.js index 3638feaf..ca966b99 100644 --- a/browser/main/index.js +++ b/browser/main/index.js @@ -36,7 +36,7 @@ import { DevTools, DebugPanel, LogMonitor } from 'redux-devtools/lib/react' let finalCreateStore = compose(devTools(), persistState(window.location.href.match(/[?&]debug_session=([^&]+)\b/)))(createStore) let store = finalCreateStore(reducer) let devEl = ( - + ) diff --git a/browser/styles/main/HomeContainer/components/ArticleNavigator.styl b/browser/styles/main/HomeContainer/components/ArticleNavigator.styl index b8d614c8..d65b5280 100644 --- a/browser/styles/main/HomeContainer/components/ArticleNavigator.styl +++ b/browser/styles/main/HomeContainer/components/ArticleNavigator.styl @@ -5,3 +5,99 @@ articleNavBgColor = #353535 absolute top bottom left 60px width 200px + color white + .userInfo + height 60px + display block + border-bottom 1px solid borderColor + .userProfileName + color brandColor + font-size 28px + padding 6px 0 0 10px + .userName + color white + padding-left 20px + margin-top 3px + .settingBtn + width 22px + height 22px + line-height 22px + border-radius 11px + position absolute + top 19px + right 14px + color white + padding 0 + background-color transparent + border 1px solid white + &:active + background-color brandColor + border-color brandColor + .controlSection + height 88px + padding 22px 15px + .newPostBtn + border none + background-color brandColor + color white + height 44px + width 170px + border-radius 5px + font-size 20px + .folders, .members + .header + border-bottom 1px solid borderColor + padding-bottom 5px + margin-bottom 5px + clearfix() + .title + float left + padding-left 10px + font-size 18px + line-height 22px + .addBtn + float right + margin-right 15px + width 22px + height 22px + font-size 10px + padding 0 + line-height 22px + border 1px solid white + border-radius 11px + background-color transparent + color white + padding 0 + font-weight bold + &:active + background-color brandColor + border-color brandColor + .folders + margin-bottom 15px + .folderList button + height 44px + width 200px + border none + text-align left + font-size 14px + background-color transparent + color white + padding-left 15px + &:hover + background-color transparentify(white, 5%) + &.active, &:active + background-color brandColor + .members + .memberList>div + height 33px + width 200px + margin-bottom 5px + padding-left 15px + .memberImage + float left + margin-top 5.5px + border-radius 11px + .memberProfileName + float left + line-height 33px + margin-left 7px