You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/06/29 19:40:27 UTC
[4/4] allura git commit: added twemoji cdn and added changes in
master template
added twemoji cdn and added changes in master template
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/8a926be5
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/8a926be5
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/8a926be5
Branch: refs/heads/master
Commit: 8a926be51365f7df4a580fb3b77f2500766b384a
Parents: 8dbbeb4
Author: rhnvrm <ro...@gmail.com>
Authored: Tue Mar 22 22:44:44 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jun 29 15:39:34 2016 -0400
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/master.html | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/8a926be5/Allura/allura/templates/jinja_master/master.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index 8e9754e..05e50bb 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -50,6 +50,7 @@
<html lang="en" class="no-js"> <!--<![endif]-->
<head>
<meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+ <script src="//twemoji.maxcdn.com/twemoji.min.js"></script>
<title>{% block title %}Your title goes here{% endblock %}</title>
{{ theme_macros.extra_header(g.theme_href('')) }}
{% for blob in g.resource_manager.emit('head_css') %}
@@ -186,6 +187,18 @@
$(this).tooltipster('hide');
});
});
+
+ window.onload = function() {
+ twemoji.size = '16x16';
+ twemoji.parse(document.body);
+ }
+
</script>
+<style type="text/css">
+ img.emoji {
+ margin: 0px !important;
+ display: inline !important;
+ }
+</style>
</body>
</html>