v2.0.0

joypixels · Dec 17, 2015 · 6fb30b7 · 6fb30b7
1 parent 2531787
commit 6fb30b7
Show file tree

Hide file tree

Showing 31 changed files with 7,305 additions and 5,145 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,9 +1,9 @@
 #### Emoji One Artwork
 
 *  Applies to all PNG and SVG files as well as any adaptations made.
-*  License: Creative Commons Attribution-ShareAlike 4.0 International
-*  Human Readable License: http://creativecommons.org/licenses/by-sa/4.0/
-*  Complete Legal Terms: http://creativecommons.org/licenses/by-sa/4.0/legalcode
+*  License: Creative Commons Attribution 4.0 International
+*  Human Readable License: http://creativecommons.org/licenses/by/4.0/
+*  Complete Legal Terms: http://creativecommons.org/licenses/by/4.0/legalcode
 
 
 #### Emoji One Non-Artwork

diff --git a/demos/alternate-alt-tags.html b/demos/alternate-alt-tags.html
@@ -50,7 +50,7 @@
 <!-- Masthead -->
 <header class="masthead">
     <div class="container">
-        <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>1.5.2</span></span>
+        <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.0.0</span></span>
     </div>
 </header>
 
@@ -180,7 +180,7 @@ <h3>Code:</h3>
 <footer class="demo-footer">
     <div class="container">
         <small>&copy; Copyright 2014-2015 Ranks.com.</small>
-        <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-SA-4.0</a> License</small>
+        <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-4.0</a> License</small>
         <small>Emoji One demos, documentation, scripts, stylesheets and all other non-artwork is licensed under the <a
                 href="http://opensource.org/licenses/MIT">MIT</a> License</small>
     </div>

diff --git a/demos/ascii-smileys.html b/demos/ascii-smileys.html
diff --git a/demos/autocomplete.html b/demos/autocomplete.html
diff --git a/demos/class-convert.html b/demos/class-convert.html
@@ -54,7 +54,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>1.5.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.0.0</span></span>
   </div>
 </header>
 
@@ -139,7 +139,7 @@ <h3>jQuery Snippet:</h3>
   <footer class="demo-footer">
     <div class="container">
       <small>&copy; Copyright 2014-2015 Ranks.com.</small>
-      <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-SA-4.0</a> License</small>
+      <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-4.0</a> License</small>
       <small>Emoji One demos, documentation, scripts, stylesheets and all other non-artwork is licensed under the <a
         href="http://opensource.org/licenses/MIT">MIT</a> License</small>
     </div>

diff --git a/demos/convert-on-submit.html b/demos/convert-on-submit.html
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>1.5.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.0.0</span></span>
   </div>
 </header>
 
@@ -128,7 +128,7 @@ <h3>jQuery Snippet:</h3>
 <footer class="demo-footer">
   <div class="container">
     <small>&copy; Copyright 2014-2015 Ranks.com.</small>
-    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-SA-4.0</a> License</small>
+    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-4.0</a> License</small>
     <small>Emoji One demos, documentation, scripts, stylesheets and all other non-artwork is licensed under the <a
       href="http://opensource.org/licenses/MIT">MIT</a> License</small>
   </div>

diff --git a/demos/index.html b/demos/index.html
@@ -23,7 +23,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>1.5.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.0.0</span></span>
   </div>
 </header>
 
@@ -160,7 +160,7 @@ <h3 id="extras">Extras</h3>
 <footer class="demo-footer">
   <div class="container">
     <small>&copy; Copyright 2014-2015 Ranks.com.</small>
-    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-SA-4.0</a> License</small>
+    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-4.0</a> License</small>
     <small>Emoji One demos, documentation, scripts, stylesheets and all other non-artwork is licensed under the <a
       href="http://opensource.org/licenses/MIT">MIT</a> License</small>
   </div>

diff --git a/demos/jsshortnametoimage.html b/demos/jsshortnametoimage.html
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>1.5.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.0.0</span></span>
   </div>
 </header>
 
@@ -122,7 +122,7 @@ <h3>JS Snippet:</h3>
 <footer class="demo-footer">
   <div class="container">
     <small>&copy; Copyright 2014-2015 Ranks.com.</small>
-    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-SA-4.0</a> License</small>
+    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-4.0</a> License</small>
     <small>Emoji One demos, documentation, scripts, stylesheets and all other non-artwork is licensed under the <a
       href="http://opensource.org/licenses/MIT">MIT</a> License</small>
   </div>

diff --git a/demos/jstoimage.html b/demos/jstoimage.html
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>1.5.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.0.0</span></span>
   </div>
 </header>
 
@@ -122,7 +122,7 @@ <h3>JS Snippet:</h3>
 <footer class="demo-footer">
   <div class="container">
     <small>&copy; Copyright 2014-2015 Ranks.com.</small>
-    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-SA-4.0</a> License</small>
+    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-4.0</a> License</small>
     <small>Emoji One demos, documentation, scripts, stylesheets and all other non-artwork is licensed under the <a
       href="http://opensource.org/licenses/MIT">MIT</a> License</small>
   </div>

diff --git a/demos/jstoshort.html b/demos/jstoshort.html
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>1.5.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.0.0</span></span>
   </div>
 </header>
 
@@ -120,7 +120,7 @@ <h3>JS Snippet:</h3>
 <footer class="demo-footer">
   <div class="container">
     <small>&copy; Copyright 2014-2015 Ranks.com.</small>
-    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-SA-4.0</a> License</small>
+    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-4.0</a> License</small>
     <small>Emoji One demos, documentation, scripts, stylesheets and all other non-artwork is licensed under the <a
       href="http://opensource.org/licenses/MIT">MIT</a> License</small>
   </div>

diff --git a/demos/jsunicodetoimage.html b/demos/jsunicodetoimage.html
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>1.5.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.0.0</span></span>
   </div>
 </header>
 
@@ -124,7 +124,7 @@ <h3>JS Snippet:</h3>
 <footer class="demo-footer">
   <div class="container">
     <small>&copy; Copyright 2014-2015 Ranks.com.</small>
-    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-SA-4.0</a> License</small>
+    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-4.0</a> License</small>
     <small>Emoji One demos, documentation, scripts, stylesheets and all other non-artwork is licensed under the <a
       href="http://opensource.org/licenses/MIT">MIT</a> License</small>
   </div>

diff --git a/demos/live-preview.html b/demos/live-preview.html
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>1.5.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.0.0</span></span>
   </div>
 </header>
 
@@ -127,7 +127,7 @@ <h3>jQuery Snippet:</h3>
 <footer class="demo-footer">
   <div class="container">
     <small>&copy; Copyright 2014-2015 Ranks.com.</small>
-    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-SA-4.0</a> License</small>
+    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-4.0</a> License</small>
     <small>Emoji One demos, documentation, scripts, stylesheets and all other non-artwork is licensed under the <a
       href="http://opensource.org/licenses/MIT">MIT</a> License</small>
   </div>

diff --git a/demos/phpshortnametoimage.php b/demos/phpshortnametoimage.php
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>1.5.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.0.0</span></span>
   </div>
 </header>
 
@@ -155,7 +155,7 @@
 <footer class="demo-footer">
   <div class="container">
     <small>&copy; Copyright 2014-2015 Ranks.com.</small>
-    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-SA-4.0</a> License</small>
+    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-4.0</a> License</small>
     <small>Emoji One demos, documentation, scripts, stylesheets and all other non-artwork is licensed under the <a
           href="http://opensource.org/licenses/MIT">MIT</a> License</small>
   </div>

diff --git a/demos/phptoimage.php b/demos/phptoimage.php
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>1.5.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.0.0</span></span>
   </div>
 </header>
 
@@ -158,7 +158,7 @@
 <footer class="demo-footer">
   <div class="container">
     <small>&copy; Copyright 2014-2015 Ranks.com.</small>
-    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-SA-4.0</a> License</small>
+    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-4.0</a> License</small>
     <small>Emoji One demos, documentation, scripts, stylesheets and all other non-artwork is licensed under the <a
           href="http://opensource.org/licenses/MIT">MIT</a> License</small>
   </div>

diff --git a/demos/phptoshort.php b/demos/phptoshort.php
@@ -50,7 +50,7 @@
 <!-- Masthead -->
 <header class="masthead">
     <div class="container">
-        <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>1.5.2</span></span>
+        <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.0.0</span></span>
     </div>
 </header>
 
@@ -133,7 +133,7 @@
 <footer class="demo-footer">
     <div class="container">
         <small>&copy; Copyright 2014-2015 Ranks.com.</small>
-        <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-SA-4.0</a> License</small>
+        <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-4.0</a> License</small>
         <small>Emoji One demos, documentation, scripts, stylesheets and all other non-artwork is licensed under the <a
                 href="http://opensource.org/licenses/MIT">MIT</a> License</small>
     </div>

diff --git a/demos/phpunicodetoimage.php b/demos/phpunicodetoimage.php
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>1.5.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.0.0</span></span>
   </div>
 </header>
 
@@ -161,7 +161,7 @@
 <footer class="demo-footer">
   <div class="container">
     <small>&copy; Copyright 2014-2015 Ranks.com.</small>
-    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-SA-4.0</a> License</small>
+    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-4.0</a> License</small>
     <small>Emoji One demos, documentation, scripts, stylesheets and all other non-artwork is licensed under the <a
           href="http://opensource.org/licenses/MIT">MIT</a> License</small>
   </div>

diff --git a/demos/sprites-png.html b/demos/sprites-png.html
@@ -65,7 +65,7 @@
   <!-- Masthead -->
   <header class="masthead">
     <div class="container">
-      <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>1.5.2</span></span>
+      <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.0.0</span></span>
     </div>
   </header>
 
@@ -85,7 +85,7 @@ <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <spa
 
       <h1>Emoji One PNG Sprites</h1>
 
-      <p class="convert-emoji" style="font-size: 28px; text-align: center">
+      <p class="convert-emoji" style="font-size: 32px; text-align: center">
         &#x1f352;
 
         :)
@@ -128,9 +128,9 @@ <h3>2. Enable PNG Sprite mode</h3>
 $client->imageType = 'png';
 $client->sprites = true;</pre>
 
-      <p>If you are not using our conversion scripts, PNG sprites can be implemented using the following markup structure. In this example we're using the unicode symbol 1F433 aka <span class="emojione-1F433">&#x1f433;</span></p>
+      <p>If you are not using our conversion scripts, PNG sprites can be implemented using the following markup structure. In this example we're using the unicode symbol 1F433 aka <span class="emojione-1f433">&#x1f433;</span></p>
       <pre class="brush: php">
-&lt;span class="emojione-1F433"&gt;
+&lt;span class="emojione-1f433"&gt;
   &amp;#x1f433;
 &lt;/span&gt;</pre>
 
@@ -142,7 +142,7 @@ <h3>2. Enable PNG Sprite mode</h3>
   <footer class="demo-footer">
     <div class="container">
       <small>&copy; Copyright 2014-2015 Ranks.com.</small>
-      <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-SA-4.0</a> License</small>
+      <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-4.0</a> License</small>
       <small>Emoji One demos, documentation, scripts, stylesheets and all other non-artwork is licensed under the <a
         href="http://opensource.org/licenses/MIT">MIT</a> License</small>
     </div>

diff --git a/demos/sprites-svg.html b/demos/sprites-svg.html
@@ -69,7 +69,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>1.5.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.0.0</span></span>
   </div>
 </header>
 
@@ -139,12 +139,12 @@ <h3>2. Enable SVG Sprite mode and set the relative path</h3>
 $client->sprites = true;
 $client->imagePathSVGSprites = './../assets/sprites/emojione.sprites.svg';</pre>
 
-    <p>If you are not using our conversion scripts, SVG sprites can be implemented using the following markup structure. In this example we're using the unicode symbol 1F433 aka <svg class="emojione"><description>&#x1f433;</description><use xlink:href="../assets/sprites/emojione.sprites.svg#emoji-1F433"></use></svg>. The <code>&lt;description&gt;</code> tag works similarly to alt text, enabling copy pasting of the emoji unicode characters.
+    <p>If you are not using our conversion scripts, SVG sprites can be implemented using the following markup structure. In this example we're using the unicode symbol 1F433 aka <svg class="emojione"><description>&#x1f433;</description><use xlink:href="../assets/sprites/emojione.sprites.svg#emoji-1f433"></use></svg>. The <code>&lt;description&gt;</code> tag works similarly to alt text, enabling copy pasting of the emoji unicode characters.
     </p>
       <pre class="brush: php">
 &lt;svg class=&quot;emojione&quot;&gt;
     &lt;description&gt;&amp;#x1f433;&lt;/description&gt;
-    &lt;use xlink:href=&quot;path/to/emojione.sprites.svg#emoji-1F433&quot;&gt;&lt;/use&gt;
+    &lt;use xlink:href=&quot;path/to/emojione.sprites.svg#emoji-1f433&quot;&gt;&lt;/use&gt;
 &lt;/svg&gt;</pre>
 
 
@@ -155,7 +155,7 @@ <h3>2. Enable SVG Sprite mode and set the relative path</h3>
 <footer class="demo-footer">
   <div class="container">
     <small>&copy; Copyright 2014-2015 Ranks.com.</small>
-    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-SA-4.0</a> License</small>
+    <small>Emoji One artwork is licensed under the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">CC-BY-4.0</a> License</small>
     <small>Emoji One demos, documentation, scripts, stylesheets and all other non-artwork is licensed under the <a
       href="http://opensource.org/licenses/MIT">MIT</a> License</small>
   </div>

diff --git a/demos/styles/demos.css b/demos/styles/demos.css
@@ -500,7 +500,7 @@
         margin: 0;
         padding-left: 3.5em;
         height: 4em;
-        background-image: url('//cdn.jsdelivr.net/emojione/assets/svg/26A0.svg');
+        background-image: url('//cdn.jsdelivr.net/emojione/assets/svg/26a0.svg');
         background-size: 2.5em;
         background-position: left;
         background-repeat: no-repeat;