diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-07-22 20:38:40 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-07-22 20:38:40 +0500 |
| commit | fe0291a025eb8abf0b77e21d60cc3eaa9115de00 (patch) | |
| tree | 9b0c0f841e48c6faf8b86807e90ccb8246e56210 /web | |
| parent | 9dc1f46d6ef2a9e0ce6cf0353082ba0f13696df6 (diff) | |
| download | chat-fe0291a025eb8abf0b77e21d60cc3eaa9115de00.tar.gz chat-fe0291a025eb8abf0b77e21d60cc3eaa9115de00.tar.bz2 chat-fe0291a025eb8abf0b77e21d60cc3eaa9115de00.zip | |
Profile pic changes in LHS Header
Removing profile pic in the LHS Header if the user hasn't uploaded a custom profile pic.
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/sidebar_header.jsx | 4 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_headers.scss | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx index bab2897b6..7a7e92854 100644 --- a/web/react/components/sidebar_header.jsx +++ b/web/react/components/sidebar_header.jsx @@ -115,7 +115,11 @@ module.exports = React.createClass({ return ( <div className="team__header theme"> <a className="settings_link" href="#" data-toggle="modal" data-target="#user_settings1"> + { me.last_picture_update ? <img className="user__picture" src={"/api/v1/users/" + me.id + "/image?time=" + me.update_at} /> + : + <div /> + } <div className="header__info"> <div className="user__name">{ '@' + me.username}</div> <div className="team__name">{ teamDisplayName }</div> diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index adeaa70d7..c45ffb6bf 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -106,9 +106,9 @@ height: 36px; float: left; @include border-radius(36px); + margin-right: 6px; } .header__info { - padding-left: 42px; color: #fff; } .team__name, .user__name { |