Merge pull request #450 from agebhar1/feature/emojione

utilize »EMOJIone« for website
This commit is contained in:
Julien Bisconti 2017-09-12 20:35:13 +03:00 committed by GitHub
commit 234f161872
2 changed files with 5 additions and 1 deletions

View File

@ -14,7 +14,9 @@
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="style.css"> <link rel="stylesheet" href="style.css">
<link rel="stylesheet" href="/awesome-docker/style.min.css"> <link rel="stylesheet" href="/awesome-docker/style.min.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/emojione@3.1.2/extras/css/emojione.min.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/1.7.2/showdown.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/1.7.2/showdown.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/emojione@3.1.2/lib/js/emojione.min.js"></script>
</head> </head>
<body> <body>
@ -40,7 +42,7 @@
.then(res => res.text()) .then(res => res.text())
.catch(err => console.error(err)) .catch(err => console.error(err))
.then(text => { .then(text => {
md.innerHTML = converter.makeHtml(text); md.innerHTML = emojione.toImage(converter.makeHtml(text));
}); });
</script> </script>
<!--Place this tag in your head or just before your close body tag. --> <!--Place this tag in your head or just before your close body tag. -->

2
style.css vendored
View File

@ -55,6 +55,8 @@ sub { bottom: -0.25em; }
/** Remove border when inside `a` element in IE 8/9/10. */ /** Remove border when inside `a` element in IE 8/9/10. */
img { border: 0; } img { border: 0; }
img.emojione { height: 20px; }
/** Correct overflow not hidden in IE 9/10/11. */ /** Correct overflow not hidden in IE 9/10/11. */
svg:not(:root) { overflow: hidden; } svg:not(:root) { overflow: hidden; }