From f21f83a163a2bbe8a9ef4b9a5413e124e02958be Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Thu, 18 Oct 2018 11:39:23 -0700 Subject: [PATCH] Conversations have blue avatar backgrounds if no image provided --- js/models/conversations.js | 2 +- stylesheets/_modules.scss | 3 +++ ts/components/Avatar.md | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/js/models/conversations.js b/js/models/conversations.js index ca2c8c168..9c94f34a8 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -1375,7 +1375,7 @@ getColor() { if (!this.isPrivate()) { - return null; + return 'signal-blue'; } const { migrateColor } = Util; diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss index 56a130585..785991e37 100644 --- a/stylesheets/_modules.scss +++ b/stylesheets/_modules.scss @@ -2036,6 +2036,9 @@ background-color: $color-conversation-grey; } +.module-avatar--signal-blue { + background-color: $color-signal-blue; +} .module-avatar--red { background-color: $color-conversation-red; } diff --git a/ts/components/Avatar.md b/ts/components/Avatar.md index c80850e44..5e15cb4b1 100644 --- a/ts/components/Avatar.md +++ b/ts/components/Avatar.md @@ -60,6 +60,13 @@ ### All colors ```jsx +