From bca15a758945c27f67afcfc133b605a2e7748d12 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Sat, 27 Jul 2013 10:39:24 -0700 Subject: [PATCH] Show avatar until video becomes available --- src/packages/collaboration/lib/participant-view.coffee | 5 ++--- src/packages/collaboration/stylesheets/collaboration.less | 6 ++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/packages/collaboration/lib/participant-view.coffee b/src/packages/collaboration/lib/participant-view.coffee index b23dcad13..e4f491b73 100644 --- a/src/packages/collaboration/lib/participant-view.coffee +++ b/src/packages/collaboration/lib/participant-view.coffee @@ -21,8 +21,7 @@ class ParticipantView extends View @video.click => @toggleClass('large') @avatar.click => @toggleClass('large') - emailMd5 = crypto.createHash('md5').update(@participant.state.email).digest('hex') - @avatar.css('background-image': "url(http://www.gravatar.com/avatar/#{emailMd5}?s=160)") + @video.css('background-image', "url('#{participant.getState().avatar_url}')") @removeButton.click @onClickRemove @toggleVideoButton.click @onClickToggleVideo @@ -69,4 +68,4 @@ class ParticipantViewContainer extends View rootView.append(this) this -module.exports = {ParticipantView, ParticipantViewContainer} \ No newline at end of file +module.exports = {ParticipantView, ParticipantViewContainer} diff --git a/src/packages/collaboration/stylesheets/collaboration.less b/src/packages/collaboration/stylesheets/collaboration.less index 69146e85f..6a8c2a37e 100644 --- a/src/packages/collaboration/stylesheets/collaboration.less +++ b/src/packages/collaboration/stylesheets/collaboration.less @@ -75,11 +75,13 @@ video { width: @small-width; display: block; + background-repeat: no-repeat; + background-position: center; } .avatar { display: none; } - .volume-container { + .volume-container { position: relative; width: @small-width; @@ -109,7 +111,7 @@ border-radius: 2px 2px 0 0; cursor: pointer; } - .volume-container { + .volume-container { width: @large-width; height: 5px;