diff --git a/app/assets/images/ellipsis.gif b/app/assets/images/ellipsis.gif
new file mode 100644
index 00000000..28d4982f
Binary files /dev/null and b/app/assets/images/ellipsis.gif differ
diff --git a/app/assets/images/invitepeer16.png b/app/assets/images/invitepeer16.png
new file mode 100644
index 00000000..73ef64be
Binary files /dev/null and b/app/assets/images/invitepeer16.png differ
diff --git a/app/assets/images/junto.gif b/app/assets/images/junto.gif
deleted file mode 100644
index e4a72d4b..00000000
Binary files a/app/assets/images/junto.gif and /dev/null differ
diff --git a/app/assets/images/junto_spinner_dark.gif b/app/assets/images/junto_spinner_dark.gif
new file mode 100644
index 00000000..945de492
Binary files /dev/null and b/app/assets/images/junto_spinner_dark.gif differ
diff --git a/app/assets/javascripts/src/views/chatView.js.erb b/app/assets/javascripts/src/views/chatView.js.erb
index d2a7cc36..e5eb7c91 100644
--- a/app/assets/javascripts/src/views/chatView.js.erb
+++ b/app/assets/javascripts/src/views/chatView.js.erb
@@ -15,7 +15,7 @@ Metamaps.Views.chatView = (function () {
participantHTML: "
" +
"
" +
"
{{ username }}
" +
- "
" +
+ "
" +
"
" +
"
",
templates: function() {
@@ -121,7 +121,7 @@ Metamaps.Views.chatView = (function () {
var date = (m.timestamp.getMonth() + 1) + '/' + m.timestamp.getDate();
date += " " + addZero(m.timestamp.getHours()) + ":" + addZero(m.timestamp.getMinutes());
m.timestamp = date;
- m.image = m.user_image || 'http://www.hotpepper.ca/wp-content/uploads/2014/11/default_profile_1_200x200.png';
+ m.image = m.user_image || 'http://www.hotpepper.ca/wp-content/uploads/2014/11/default_profile_1_200x200.png'; // TODO: remove
m.message = linker.link(m.message);
var $html = $(this.messageTemplate(m));
this.$messages.append($html);
diff --git a/app/assets/stylesheets/junto.css.erb b/app/assets/stylesheets/junto.css.erb
index b84f9a07..73b7077d 100644
--- a/app/assets/stylesheets/junto.css.erb
+++ b/app/assets/stylesheets/junto.css.erb
@@ -111,7 +111,7 @@
cursor: pointer;
}
.chat-box .chat-button.active {
- background: url(<%= asset_path 'junto.gif' %>) no-repeat 2px 9px, url(<%= asset_path 'tray_tab.png' %>) no-repeat !important;
+ background: url(<%= asset_path 'junto_spinner_dark.gif' %>) no-repeat 2px 8px, url(<%= asset_path 'tray_tab.png' %>) no-repeat !important;
}
.chat-box .chat-button .chat-unread {
display: none;
@@ -231,6 +231,7 @@
}
.chat-box .participants .participant .chat-participant-invite {
float: right;
+ background: #4FC059 url(<%= asset_path 'invitepeer16.png' %>) no-repeat center center;
}
.chat-box .chat-header {
width: 100%;