Merge branch 'dev'

bitwave-tv · Dec 19, 2019 · c507f09 · c507f09
2 parents df179d4 + 47e2ef0
commit c507f09
Show file tree

Hide file tree

Showing 4 changed files with 664 additions and 684 deletions.
diff --git a/components/Channel/StreamArchives.vue b/components/Channel/StreamArchives.vue
@@ -121,7 +121,3 @@
     },
   };
 </script>
-
-<style lang='scss'>
-
-</style>
diff --git a/components/Chat/ChatMessage.vue b/components/Chat/ChatMessage.vue
@@ -7,7 +7,8 @@
       @click="listeners.reply(props.username)"
     >
       <img v-if="!!props.avatar" :src="props.avatar" :alt="props.username">
-      <div v-else class="v-icon notranslate material-icons" :style="{ background: props.color }">person</div>
+      <img v-else src="https://cdn.bitwave.tv/static/img/santahat-100.png" alt="santa troll" :style="{ background: props.color }" class="pa-1">
+      <!--<div v-else class="v-icon notranslate material-icons" :style="{ background: props.color }">person</div>-->
     </div>
 
     <!-- Chat Content -->