From 6b62daa62b3f89914b391c2a514798e7ae84922c Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Mon, 26 Jun 2017 16:13:28 -1000 Subject: [PATCH] Make Jumbomoji normal size when in the conversation preview FREEBIE --- components/emojijs/demo/emoji.css | 18 ++++++++++++++++++ stylesheets/manifest.css | 16 ++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/components/emojijs/demo/emoji.css b/components/emojijs/demo/emoji.css index 25b57c88434e..fd36cc8db87a 100644 --- a/components/emojijs/demo/emoji.css +++ b/components/emojijs/demo/emoji.css @@ -61,3 +61,21 @@ img.emoji.jumbo { width: 2em; height: 2em; } + +// we need these, or we'll make conversation items too big in the left-nav +.conversations img.emoji.small { + width: 1em; + height: 1em; +} +.conversations img.emoji.medium { + width: 1em; + height: 1em; +} +.conversations img.emoji.large { + width: 1em; + height: 1em; +} +.conversations img.emoji.jumbo { + width: 1em; + height: 1em; +} diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css index 85033d775136..be6af755b248 100644 --- a/stylesheets/manifest.css +++ b/stylesheets/manifest.css @@ -722,6 +722,22 @@ img.emoji.jumbo { width: 2em; height: 2em; } +.conversations img.emoji.small { + width: 1em; + height: 1em; } + +.conversations img.emoji.medium { + width: 1em; + height: 1em; } + +.conversations img.emoji.large { + width: 1em; + height: 1em; } + +.conversations img.emoji.jumbo { + width: 1 em; + height: 1em; } + .settings.modal { padding: 50px; } .settings.modal .content {