| commit | caebe19a8e5b311bd0ac407f609b8793fb92f72e | [log] [tgz] |
|---|---|---|
| author | Dave Brondsema <dave@brondsema.net> | Thu Jul 14 12:13:48 2016 -0400 |
| committer | Dave Brondsema <dave@brondsema.net> | Thu Jul 14 12:13:48 2016 -0400 |
| tree | ba690a17be2f7a37f27027b5dcf922ce6a8e2353 | |
| parent | cea578b4648b45961c16c4a776ff039cf42718ac [diff] |
Limit twemoji parsing to main body content, so ™© etc in header & footer areas don't get styled differently
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css index b6bde7a..9137d30 100644 --- a/Allura/allura/nf/allura/css/site_style.css +++ b/Allura/allura/nf/allura/css/site_style.css
@@ -3605,7 +3605,7 @@ } } -img.emoji { +#content_base img.emoji { display: inline !important; height: 1em; width: 1em;
diff --git a/Allura/allura/public/nf/js/allura-base.js b/Allura/allura/public/nf/js/allura-base.js index 95f153c..7a1d731 100644 --- a/Allura/allura/public/nf/js/allura-base.js +++ b/Allura/allura/public/nf/js/allura-base.js
@@ -209,5 +209,5 @@ }); twemoji.size = '36x36'; - twemoji.parse(document.body); + twemoji.parse($('#content_base')[0]); });