diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-11-29 12:11:02 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-11-29 12:11:02 +0200 |
| commit | c72792e4ed0e1ff88a1de494e7885238dc6c9881 (patch) | |
| tree | c8fd646292b810f12ab53762d2404b82d58b2f64 /client/components/users/userHeader.jade | |
| parent | 7e4b42e9b3482460cac77a603809a8b5d4016477 (diff) | |
| parent | c3e2ee1db8b84102ffb58ffa07d6a0a687ef7455 (diff) | |
| download | wekan-c72792e4ed0e1ff88a1de494e7885238dc6c9881.tar.gz wekan-c72792e4ed0e1ff88a1de494e7885238dc6c9881.tar.bz2 wekan-c72792e4ed0e1ff88a1de494e7885238dc6c9881.zip | |
Merge branch 'nztqa-conflict-resolution-458' into devel
Optimize for mobile web, show single list per page with navigate bar.
Thanks to floatinghotpot and nztqa ! Related #953
Diffstat (limited to 'client/components/users/userHeader.jade')
| -rw-r--r-- | client/components/users/userHeader.jade | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index f67f82ee..096745ad 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -3,10 +3,11 @@ template(name="headerUserBar") a.header-user-bar-name.js-open-header-member-menu .header-user-bar-avatar +userAvatar(userId=currentUser._id) - if currentUser.profile.fullname - = currentUser.profile.fullname - else - = currentUser.username + unless isMiniScreen + if currentUser.profile.fullname + = currentUser.profile.fullname + else + = currentUser.username template(name="memberMenuPopup") ul.pop-over-list |