From 7cd70438bc2ebf3a6f415f31cc891262f4d87f22 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Wed, 21 Dec 2016 03:36:09 -0500 Subject: [PATCH] make pending work --- app/assets/stylesheets/junto.css.erb | 4 ++-- frontend/src/components/MapChat/Participant.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/junto.css.erb b/app/assets/stylesheets/junto.css.erb index c8cc6ab7..f738705f 100644 --- a/app/assets/stylesheets/junto.css.erb +++ b/app/assets/stylesheets/junto.css.erb @@ -223,8 +223,8 @@ float: right; background: #4FC059 url(<%= asset_path 'invitepeer16.png' %>) no-repeat center center; } -.chat-box .participants .participant.pending .chat-participant-invite-call, -.chat-box .participants .participant.pending .chat-participant-invite-join { +.chat-box .participants .participant .chat-participant-invite-call.pending, +.chat-box .participants .participant .chat-participant-invite-join.pending { background: #dab539 url(<%= asset_path 'ellipsis.gif' %>) no-repeat center center; } .chat-box .participants .participant .chat-participant-participating { diff --git a/frontend/src/components/MapChat/Participant.js b/frontend/src/components/MapChat/Participant.js index d8552dfc..340c92a4 100644 --- a/frontend/src/components/MapChat/Participant.js +++ b/frontend/src/components/MapChat/Participant.js @@ -12,12 +12,12 @@ class Participant extends Component { {username} {self ? '(me)' : ''} {!self && !conversationLive &&