3 files changed, 28 insertions, 11 deletions

diff --git a/src/objects/_emoji.scss b/src/objects/_emoji.scss
index 7d03b13..6ab71d7 100644
--- a/src/objects/_emoji.scss
+++ b/src/objects/_emoji.scss
@@ -22,13 +22,18 @@
     ), 'colors');
 
     @include iro.bem-object(iro.props-namespace()) {
-        display:        inline;
-        width:          1em;
-        height:         1em;
-        margin:         calc(-.5 * fn.dim(--size)) calc(-1 * fn.dim(--pad));
-        padding:        fn.dim(--pad);
-        font-size:      fn.dim(--size);
-        vertical-align: .15em;
+        display:         inline-flex;
+        position:        relative;
+        align-items:     center;
+        justify-content: center;
+        width:           1em;
+        height:          1em;
+        margin:          calc(-.5 * fn.dim(--size)) calc(-1 * fn.dim(--pad));
+        padding:         fn.dim(--pad);
+        font-size:       fn.dim(--size);
+        line-height:     1;
+        text-align:      center;
+        vertical-align:  middle;
 
         @include iro.bem-modifier('125') {
             margin-top:    calc(-.5 * fn.dim(--125 --size));
@@ -41,6 +46,7 @@
             border-radius: calc(fn.dim(--rounding) / fn.dim(--zoom));
 
             &:hover {
+                z-index:          10;
                 transform:        scale(fn.dim(--zoom));
                 background-color: fn.color(--bg);
             }
diff --git a/tpl/objects/emoji.pug b/tpl/objects/emoji.pug
index 3509112..af56c7a 100644
--- a/tpl/objects/emoji.pug
+++ b/tpl/objects/emoji.pug
@@ -11,6 +11,11 @@ mixin emoji(id)
             classes['o-emoji--' + attributes.size] = true;
         }
 
-        src = id + '.png'
+        if (!attributes.unicode) {
+            src = id + '.png'
+        }
 
-    img(src=src, class=classes)
+    if !attributes.unicode
+        img(src=src, class=classes)
+    else
+        span(class=classes)= id
diff --git a/tpl/views/emoji.pug b/tpl/views/emoji.pug
index 8410794..2503e8d 100644
--- a/tpl/views/emoji.pug
+++ b/tpl/views/emoji.pug
@@ -4,17 +4,23 @@ mixin view-emoji
             =loremIpsum
             =' '
             +emoji('drgn')
-            +emoji('drgn')
+            =' '
+            +emoji('🐉️')(unicode=true)
             =' '
             =loremIpsum
             =' '
             +emoji('drgn')(zoomable=true)
             =' '
+            +emoji('🐉️')(zoomable=true unicode=true)
+            =' '
             =loremIpsum
             =' '
             +emoji('drgn')(size=125)
-            +emoji('drgn')(size=125)
+            =' '
+            +emoji('🐉️')(unicode=true size=125)
             =' '
             =loremIpsum
             =' '
             +emoji('drgn')(zoomable=true size=125)
+            =' '
+            +emoji('🐉️')(zoomable=true unicode=true size=125)