From 86574ea5248219fa35ecb0748920df9ff1ce6110 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 8 Nov 2016 21:45:51 +0100
Subject: Adding Emoji One

---
 app/assets/stylesheets/components.scss | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index 16327168c..71ef7f3a8 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -71,6 +71,17 @@
   }
 }
 
+.emojione {
+  display: inline-block;
+  font-size: inherit;
+  vertical-align: middle;
+  margin: -.2ex .15em .2ex;
+
+  img {
+    width: auto;
+  }
+}
+
 .status__content, .reply-indicator__content {
   font-size: 15px;
   line-height: 20px;
@@ -78,6 +89,11 @@
   font-weight: 300;
   overflow: hidden;
 
+  .emojione {
+    width: 18px;
+    height: 18px;
+  }
+
   p {
     margin-bottom: 20px;
 
@@ -110,6 +126,11 @@
   .status__content {
     font-size: 19px;
     line-height: 24px;
+
+    .emojione {
+      width: 22px;
+      height: 22px;
+    }
   }
 }
 
-- 
cgit