From 9f5e1a0a1660fa454f4735be3991845a9a096d68 Mon Sep 17 00:00:00 2001
From: Panos Sakkos <panos.sakkos@gmail.com>
Date: Fri, 20 Nov 2015 03:22:31 +0100
Subject: [PATCH] Fixes #70

---
 .travis.yml                        | 2 +-
 README.md                          | 1 +
 _config.yml                        | 4 +++-
 _posts/2015-06-19-writing-posts.md | 6 ++++++
 css/grayscale.scss                 | 6 ++++++
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0bfde76b01790..6c8d16bd8f5bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: ruby
 rvm:
 - 2.1
 
-install: gem install jekyll jekyll-paginate html-proofer
+install: gem install jekyll jekyll-paginate jemoji html-proofer
 script: jekyll serve --baseurl "" --detach && htmlproof ./_site --disable-external --empty-alt-ignore
 
 env:
diff --git a/README.md b/README.md
index 288e0932557e4..003a12122eb9e 100755
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ You can watch it in action [here](https://panossakkos.github.io/personal-jekyll-
 * Blogging functionality
   * Preview of the latest post in the home page
   * Archive page
+  * Emojis
   * Gesture navigation in archive and post pages by swiping
   * #tags
   * Disqus comments
diff --git a/_config.yml b/_config.yml
index 73179e2560e9d..7121989557d0d 100755
--- a/_config.yml
+++ b/_config.yml
@@ -151,4 +151,6 @@ paginate_path: "blog/page:num/"
 sass:
   style: compressed
 
-gems: [jekyll-paginate]
+gems:
+  - jekyll-paginate
+  - jemoji
diff --git a/_posts/2015-06-19-writing-posts.md b/_posts/2015-06-19-writing-posts.md
index bd1d9670bdf4d..02386eb47ee1d 100644
--- a/_posts/2015-06-19-writing-posts.md
+++ b/_posts/2015-06-19-writing-posts.md
@@ -71,3 +71,9 @@ int main()
 </code></pre>
 
 <small>If you don't need syntax highlight in your website you can disable it by setting the syntax-highlight variable to False</small>
+
+### Emoji support
+
+You can add emojis to your posts by simply typing their [emoji code](http://www.emoji-cheat-sheet.com/)
+
+:wink:
diff --git a/css/grayscale.scss b/css/grayscale.scss
index beddf749fb7b2..5de9778fd9464 100644
--- a/css/grayscale.scss
+++ b/css/grayscale.scss
@@ -317,3 +317,9 @@ body {
 /* END Added in { Personal } for Typed Cursor in Header */
 
 code { text-align: left; }
+
+img.emoji {
+  // Override any img styles to ensure Emojis are displayed inline
+  margin: 0px !important;
+  display: inline !important;
+}