Adding Emoji One

2016-11-08 21:45:51 +01:00
parent b6832553ff
commit 86574ea524
1837 changed files with 34 additions and 3 deletions
--- 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;
+    }
  }
 }