Upgrade to bengott:avatar 0.6.0

- Create new config file in lib/config/avatar.js (accessible to both
  client and server)
- Comment out some outdated SCSS/CSS
This commit is contained in:
Ben Gott 2014-11-24 01:48:04 -06:00
parent 3c9354ea15
commit f68ecba862
8 changed files with 18 additions and 20 deletions

View file

@ -13,7 +13,7 @@ artwells:queue@0.0.3
autoupdate@1.1.3
backbone@1.0.0
base64@1.0.1
bengott:avatar@0.5.1
bengott:avatar@0.6.0
binary-heap@1.0.1
blaze-tools@1.0.1
blaze@2.0.3

View file

@ -40,8 +40,3 @@ Statuses={
approved: 2,
rejected: 3
};
Avatar.options = {
emailHashProperty: 'email_hash',
defaultAvatarUrl: '/img/default-avatar.png',
};

View file

@ -15,7 +15,7 @@
<span>{{i18n "downvote"}}</span>
</a>
</div>
<div class="user-avatar">{{>avatar userId=userId class="circle"}}</div>
<div class="user-avatar">{{> avatar userId=userId shape="circle"}}</div>
<div class="comment-main">
<div class="comment-meta">
<a class="comment-username" href="{{profileUrl}}">{{authorName}}</a>

View file

@ -1,6 +1,6 @@
<template name="user_item">
<tr class="user">
<td>{{>avatar user=this class="circle"}}</td>
<td>{{> avatar user=this shape="circle"}}</td>
<td>
<a href="{{getProfileUrl}}">{{displayName}}</a>
<br/>
@ -31,4 +31,4 @@
</ul>
</td>
</tr>
</template>
</template>

View file

@ -3,7 +3,7 @@
<div class="user-profile grid grid-module">
<table>
<tr>
<td colspan="2">{{>avatar user=this class="large circle"}}</td>
<td colspan="2">{{> avatar user=this size="large" shape="circle"}}</td>
</tr>
{{#if isAdmin}}
<tr>

3
lib/config/avatar.js Normal file
View file

@ -0,0 +1,3 @@
Avatar.options = {
emailHashProperty: 'email_hash'
};

View file

@ -1013,10 +1013,10 @@ em {
position: block;
float: left; }
/* line 141, ../scss/modules/_comments.scss */
.comment-content .user-avatar img {
/*.comment-content .user-avatar img {
height: 40px;
width: 40px;
display: block; }
display: block; }*/
/* line 148, ../scss/modules/_comments.scss */
.comment-meta {

View file

@ -1,7 +1,7 @@
.queue-container{
position:relative;
height:0px;
@include single-transition(ease-out, opacity, 400ms, 0ms);
@include single-transition(ease-out, opacity, 400ms, 0ms);
ul{
position:absolute;
// right:0;
@ -60,7 +60,7 @@
// @extend .grid-block;
// display:block;
// padding:3px 8px;
// white-space:nowrap;
// font-size:14px;
@ -138,11 +138,11 @@
overflow:hidden;
position:block;
float:left;
img{
height:40px;
width:40px;
display:block;
}
// img{
// height:40px;
// width:40px;
// display:block;
// }
}
}
.comment-meta{
@ -262,4 +262,4 @@
margin-bottom: 10px;
padding: 10px 15px;
color: $light-text;
}
}