Browse Source

Rename .buddyimage to .avatar

pull/29/head^2
Evan Theurer 12 years ago
parent
commit
b68f541bac
  1. 2
      src/styles/components/_buddylist.scss
  2. 10
      src/styles/components/_chat.scss
  3. 2
      static/js/controllers/chatroomcontroller.js
  4. 2
      static/partials/buddy.html

2
src/styles/components/_buddylist.scss

@ -132,7 +132,7 @@
&.hovered .buddyactions { &.hovered .buddyactions {
right: 0; right: 0;
} }
.buddyimage { .avatar {
background: $actioncolor1; background: $actioncolor1;
border-radius: 2px; border-radius: 2px;
float: left; float: left;

10
src/styles/components/_chat.scss

@ -327,7 +327,7 @@ content: '\f00c';
color:#ccc; color:#ccc;
} }
.chat .output .message .buddyimage { .chat .output .message .avatar {
position: absolute; position: absolute;
top: 4px; top: 4px;
width:46px; width:46px;
@ -338,15 +338,15 @@ border-radius: 2px;
background: $actioncolor1; background: $actioncolor1;
text-align:center; text-align:center;
} }
.chat .output .message.is_self .buddyimage { .chat .output .message.is_self .avatar {
right: 4px; right: 4px;
left: auto; left: auto;
} }
.chat .output .message .buddyimage > i { .chat .output .message .avatar > i {
line-height:46px; line-height:46px;
color:$actioncolor2; color:$actioncolor2;
} }
.chat .output .message .buddyimage > img { .chat .output .message .avatar > img {
position: absolute; position: absolute;
left:0px; left:0px;
right:0px; right:0px;
@ -513,4 +513,4 @@ right:32px;
border-top: 1px solid $bordercolor; border-top: 1px solid $bordercolor;
top: 0px; top: 0px;
} }
} }

2
static/js/controllers/chatroomcontroller.js

@ -299,7 +299,7 @@ define(['underscore', 'moment', 'text!partials/fileinfo.html'], function(_, mome
title.html(displayName(from, true)); title.html(displayName(from, true));
extra_css += "with_name "; extra_css += "with_name ";
var imgSrc = buddyImageSrc(from); var imgSrc = buddyImageSrc(from);
picture = $('<div class="buddyimage"><i class="fa fa-user fa-3x"/><img/></div>'); picture = $('<div class="avatar"><i class="fa fa-user fa-3x"/><img/></div>');
if (imgSrc) { if (imgSrc) {
picture.find("img").attr("src", imgSrc); picture.find("img").attr("src", imgSrc);
} }

2
static/partials/buddy.html

@ -1,5 +1,5 @@
<div class="buddy withSubline" ng-click="doDefault(user.Id)"> <div class="buddy withSubline" ng-click="doDefault(user.Id)">
<div class="buddyimage"><i class="fa fa-user fa-3x"/><img ng-show="status.buddyPicture" alt ng-src="{{status.buddyPicture}}" width="46" height="46"/></div> <div class="avatar"><i class="fa fa-user fa-3x"/><img ng-show="status.buddyPicture" alt ng-src="{{status.buddyPicture}}" width="46" height="46"/></div>
<div class="display-name">{{user.Id|displayName}}</div> <div class="display-name">{{user.Id|displayName}}</div>
<div class="browser">{{user.Ua}}</div> <div class="browser">{{user.Ua}}</div>
</div> </div>

Loading…
Cancel
Save