From 49057810fb1f787c6ac059228adba885b70aaa1a Mon Sep 17 00:00:00 2001
From: Rokt33r <fluke8259@gmail.com>
Date: Wed, 29 Jul 2015 13:17:55 +0900
Subject: [PATCH] =?UTF-8?q?=E5=AE=9F=E8=A3=85=EF=BC=9APlanetNavigator?=
 =?UTF-8?q?=E3=81=AEUser=20icon=E3=82=92=E6=8A=BC=E3=81=99=E3=81=A8?=
 =?UTF-8?q?=E3=81=9D=E3=81=AEUser=20page=E3=81=AB=E9=A3=9B=E3=81=B6=20?=
 =?UTF-8?q?=E6=94=B9=E5=96=84=EF=BC=9AProfile=20Photo=E3=81=AB=E5=BD=B1?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 browser/main/Components/PlanetNavigator.jsx         | 10 +++++++---
 browser/main/Containers/UserContainer.jsx           |  3 ++-
 browser/styles/main/containers/PlanetContainer.styl |  8 +++++++-
 browser/styles/main/containers/UserContainer.styl   |  4 ++--
 browser/styles/shared/modal.styl                    |  2 ++
 browser/styles/vars.styl                            |  2 ++
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/browser/main/Components/PlanetNavigator.jsx b/browser/main/Components/PlanetNavigator.jsx
index 583463ee..278959f2 100644
--- a/browser/main/Components/PlanetNavigator.jsx
+++ b/browser/main/Components/PlanetNavigator.jsx
@@ -1,4 +1,6 @@
 var React = require('react/addons')
+var ReactRouter = require('react-router')
+var Link = ReactRouter.Link
 
 var ProfileImage = require('./ProfileImage')
 
@@ -27,8 +29,10 @@ var PlanetNavigator = React.createClass({
     var users = this.props.currentPlanet.Users.map(function (user) {
       return (
         <li key={'user-' + user.id}>
-          <ProfileImage size='44' email={user.email}/>
-          <div className='userTooltip'>{user.profileName}</div>
+          <Link to='user' params={{userName: user.name}}>
+            <ProfileImage className='userPhoto' size='44' email={user.email}/>
+            <div className='userTooltip'>{user.profileName}</div>
+          </Link>
         </li>
       )
     })
@@ -62,7 +66,7 @@ var PlanetNavigator = React.createClass({
         <div className='usersLabel'>Users</div>
         <ul className='users'>
           {users}
-          <li onClick={this.props.openAddUserModal} className='btn-default'><i className='fa fa-plus'/></li>
+          <li onClick={this.props.openAddUserModal} className='addUserButton btn-default'><i className='fa fa-plus'/></li>
         </ul>
       </div>
     )
diff --git a/browser/main/Containers/UserContainer.jsx b/browser/main/Containers/UserContainer.jsx
index 1cb76ee5..0bbb2056 100644
--- a/browser/main/Containers/UserContainer.jsx
+++ b/browser/main/Containers/UserContainer.jsx
@@ -6,6 +6,7 @@ var Link = ReactRouter.Link
 var request = require('superagent')
 
 var UserNavigator = require('../Components/UserNavigator')
+var ProfileImage = require('../Components/ProfileImage')
 
 var AuthStore = require('../Stores/AuthStore')
 var PlanetStore = require('../Stores/PlanetStore')
@@ -130,7 +131,7 @@ module.exports = React.createClass({
           <div className='UserHome'>
             <h1>User Profile</h1>
             <div className='userProfile'>
-              <img className='userPhoto' width='150' height='150' src='../vendor/dummy.jpg'/>
+              <ProfileImage className='userPhoto' size='150' email={user.email}/>
               <div className='userIntro'>
                 <div className='userProfileName'>{user.profileName}</div>
                 <Link className='userName' to='user' params={{userName: user.name}}>{user.name}</Link>
diff --git a/browser/styles/main/containers/PlanetContainer.styl b/browser/styles/main/containers/PlanetContainer.styl
index ed9d6e7f..f0fa87d1 100644
--- a/browser/styles/main/containers/PlanetContainer.styl
+++ b/browser/styles/main/containers/PlanetContainer.styl
@@ -132,9 +132,13 @@
       width 44px
       height 44px
       float left
-      circle()
       margin 3px
       line-height 44px
+      .userPhoto
+        circle()
+        width 44px
+        height 44px
+        box-shadow 1px 1px 4px 0px #C5C5C5
       .userTooltip
         position absolute
         z-index 500
@@ -149,6 +153,8 @@
         pointer-events none
       &:hover .userTooltip
         opacity 1
+      &.addUserButton
+        circle()
 
 
 .PlanetArticleList
diff --git a/browser/styles/main/containers/UserContainer.styl b/browser/styles/main/containers/UserContainer.styl
index 0eb13efb..36c701ec 100644
--- a/browser/styles/main/containers/UserContainer.styl
+++ b/browser/styles/main/containers/UserContainer.styl
@@ -14,10 +14,10 @@
       padding 0
       border none
       cursor pointer
+      box-sizing border-box
       img
         transition 0.1s
-        opacity 0.8
-      box-sizing border-box
+        opacity 0.9
       &.active, &:active, &.focus, &:focus, &.hover, &:hover
         img
           opacity 1
diff --git a/browser/styles/shared/modal.styl b/browser/styles/shared/modal.styl
index 5893cd07..46afd88d 100644
--- a/browser/styles/shared/modal.styl
+++ b/browser/styles/shared/modal.styl
@@ -246,6 +246,7 @@
         .userPhoto
           margin-bottom 25px
           circle()
+          box-shadow 1px 1px 4px 0px #C5C5C5
 
   .PlanetSettingModal.modal
     .settingBody
@@ -295,6 +296,7 @@
               width 44px
               height 44px
               circle()
+              box-shadow 1px 1px 4px 0px #C5C5C5
             .userName
               float left
               height 44px
diff --git a/browser/styles/vars.styl b/browser/styles/vars.styl
index 8a9af728..0422be42 100644
--- a/browser/styles/vars.styl
+++ b/browser/styles/vars.styl
@@ -15,6 +15,8 @@ textColor = #4D4D4D
 backgroundColor= white
 fontSize= 16px
 
+shadowColor= #C5C5C5
+
 invBackgroundColor = #4C4C4C
 invTextColor = white