Merge branch 'content-editable' into master

wedgies · Dec 3, 2018 · edaa09e · edaa09e
2 parents 9a596c8 + 7877712
commit edaa09e
Show file tree

Hide file tree

Showing 3 changed files with 156 additions and 4 deletions.
diff --git a/css/jquery.emojipicker.css b/css/jquery.emojipicker.css
diff --git a/demo.html b/demo.html
@@ -53,7 +53,7 @@
 
   <style type="text/css">
     body {background:#888;}
-    form {margin:200px 0 0 0; text-align:center;}
+    form {margin:150px 0 0 0; text-align:center;}
     input {width:400px; height:30px;}
     input,textarea,button {padding:5px 10px; font-family:"Helvetica Neue", "Helvetica", "Arial", sans-serif; font-size:24px; font-weight:300; outline:none; border:none;}
     #emojiPickerWrap {margin:10px 0 0 0;}