Merge pull request #130 from muan/nativemoji

Display emoji characters instead in images
muan · Jul 10, 2015 · 93712ba · 93712ba
2 parents 82d835c + ab2b8b4
commit 93712ba
Show file tree

Hide file tree

Showing 12 changed files with 4,499 additions and 1,147 deletions.
diff --git a/Procfile b/Procfile
@@ -1,3 +1,2 @@
 web: ruby -run -e httpd -- --port=4001 ./
 scss: scss --watch _assets:stylesheets
-coffee: coffee -b -w -o javascripts -c _assets/*.coffee
diff --git a/_assets/speedy.coffee b/_assets/speedy.coffee
diff --git a/_assets/stuff.coffee b/_assets/stuff.coffee
diff --git a/_assets/style.scss b/_assets/style.scss
@@ -115,7 +115,8 @@ ul {
     font-size: 0;
   }
 
-  .emoji {
+  .emoji,
+  .native-emoji {
     position: absolute;
     margin-top: -3px;
   }
@@ -192,13 +193,25 @@ ul, li {
 }
 
 .alert { font-size: 13px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: none; position: fixed; margin: auto; left: 50%; width: 200px; margin-left: -100px; top: 10px; background: rgba(10,50,90,0.7); color: #fff; font-weight: bold; padding: 7px; text-align: center; border-radius: 5px; }
+
+.native-emoji,
 .emoji {
   @include inline-block;
+  cursor: pointer;
+}
+
+.native-emoji {
+  font-size: 19px;
+  padding: 10px 2px;
+  font-family: AppleColorEmoji;
+}
+
+.emoji {
   text-indent: -9999px;
   overflow: hidden;
   @include transform(scale(0.8));
-  cursor: pointer;
 }
+
 [data-clipboard-text] { cursor: pointer; }
 
 .no-results {