From 4358bdfac78067494050e5c1c3870d2bfcae72e2 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Mon, 21 Mar 2016 11:06:47 -0700
Subject: [PATCH] Use url xor color on avatar, never both

Combining them often leaves a crufty colored ring on the outer edge of
the avatar image.

// FREEBIE
---
 background.html          | 7 ++++++-
 stylesheets/_global.scss | 1 -
 stylesheets/manifest.css | 1 -
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/background.html b/background.html
index 428ae755..7df6f2cd 100644
--- a/background.html
+++ b/background.html
@@ -139,7 +139,12 @@
   </script>
   <script type='text/x-tmpl-mustache' id='avatar'>
     <span class='avatar'
-          style='background-image: url("{{ avatar.url }}"); background-color: {{ avatar.color }}'>
+          {{ #avatar.url }}
+            style='background-image: url("{{ avatar.url }}");'>
+          {{ /avatar.url }}
+          {{ ^avatar.url }}
+            style='background-color: {{ avatar.color }};'>
+          {{ /avatar.url }}
         {{ avatar.content }}
     </span>
   </script>
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index 17471150..ae680bb3 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -209,7 +209,6 @@ $avatar-size: 44px;
   display: inline-block;
   height: $avatar-size;
   width: $avatar-size;
-  background: $grey_l url('/images/default.png') no-repeat center;
   border-radius: 50%;
   background-size: cover;
   vertical-align: middle;
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index d33a67de..8695ed12 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -173,7 +173,6 @@ img.emoji {
   display: inline-block;
   height: 44px;
   width: 44px;
-  background: #f3f3f3 url("/images/default.png") no-repeat center;
   border-radius: 50%;
   background-size: cover;
   vertical-align: middle;