Skip to content

Commit

Permalink
displays profile card on listed sidebar users
Browse files Browse the repository at this point in the history
  • Loading branch information
santisiri committed Nov 7, 2017
1 parent bf07c4b commit 355984a
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 3 deletions.
6 changes: 6 additions & 0 deletions imports/ui/css/earth.css
Original file line number Diff line number Diff line change
Expand Up @@ -5370,6 +5370,12 @@ blockquote {
float: right;
}

.avatar-icon-box {
max-width: 24px;
margin: -9px 5px -10px -10px;
float: left;
}

@media (max-width: 991px) {
.contract {
margin-right: 15px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template name="avatar">
<div class="w-clearfix avatar-editor">
<div class="w-clearfix avatar-editor {{sidebarIcon}}">
{{#if editor}}
<img src="{{profilePicture}}" class="symbol profile-pic profile-pic-edit" ontouchstart="">
<div class="avatar-description">
Expand Down
6 changes: 6 additions & 0 deletions imports/ui/templates/components/identity/avatar/avatar.js
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,12 @@ Template.avatar.helpers({
flag(profile) {
return getNation(profile, true);
},
sidebarIcon() {
if (this.sidebar) {
return 'avatar-icon-box';
}
return '';
},
});

Template.avatar.events({
Expand Down
2 changes: 1 addition & 1 deletion imports/ui/templates/widgets/feed/feedItem.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="w-list-unstyled w-clearfix identity-list identity-feed-item extra">
{{#each signatures}}
<div class="w-clearfix identity">
{{> avatar size=24 profile=this._id includeName=true includeNation=true editable=false microFont=true disabled=false includeRole=false}}
{{> avatar size=24 profile=this._id includeName=true includeNation=true editable=false microFont=true disabled=false includeRole=false}}
</div>
{{/each}}
<div class="data data-feed">
Expand Down
3 changes: 2 additions & 1 deletion imports/ui/templates/widgets/inbox/inbox.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
<a id='menuButton' href="{{url}}">
<li id='sidebar-button-{{id}}' class="menu-item {{selected}} w-clearfix" feed="{{feed}}">
{{#if isAvatar}}
<img class="symbol profile-pic profile-inbox " src="{{icon}}">
{{> avatar size=24 profile=this.id includeName=false includeNation=false editable=false microFont=true disabled=false includeRole=false sidebar=true}}
<!--<img class="symbol profile-pic profile-inbox " src="{{icon}}">-->
{{else}}
{{#if selected}}
<img class="icon-inbox" src="{{pathFor route='home'}}{{iconActivated}}">
Expand Down

0 comments on commit 355984a

Please sign in to comment.