From c5a3c92902edb72a4255be21ac0e36e7e4ee4501 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Wed, 4 Jan 2017 13:04:20 -0500 Subject: [PATCH] bigger font size on chat messages --- app/assets/stylesheets/junto.scss.erb | 4 ++-- frontend/src/Metamaps/Util.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/junto.scss.erb b/app/assets/stylesheets/junto.scss.erb index f9599245..dfff7fd8 100644 --- a/app/assets/stylesheets/junto.scss.erb +++ b/app/assets/stylesheets/junto.scss.erb @@ -299,8 +299,8 @@ padding: 8px 8px 2px 8px; color: #f5f5f5; font-family: arial, sans-serif; - font-size: 13px; - line-height: 14px; + font-size: 16px; + line-height: 17px; a:link { color: #4fb5c0; diff --git a/frontend/src/Metamaps/Util.js b/frontend/src/Metamaps/Util.js index 094d6b0e..f35970da 100644 --- a/frontend/src/Metamaps/Util.js +++ b/frontend/src/Metamaps/Util.js @@ -167,13 +167,13 @@ const Util = { }) return text }, - addEmoji: function(withoutEmoji, emoticons = true) { + addEmoji: function(withoutEmoji, opts = { emoticons: false }) { let text = withoutEmoji Object.keys(emojiIndex.emojis).forEach(key => { const emoji = emojiIndex.emojis[key] text = text.replace(new RegExp(escapeRegExp(emoji.colons), 'g'), emoji.native) }) - if (emoticons) { + if (opts.emoticons) { Object.keys(emojiIndex.emoticons).forEach(emoticon => { const key = emojiIndex.emoticons[emoticon] const emoji = emojiIndex.emojis[key]