allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject allura git commit: Limit twemoji parsing to main body content, so ™© etc in header & footer areas don't get styled differently
Date Thu, 14 Jul 2016 16:14:04 GMT
Repository: allura
Updated Branches:
  refs/heads/master cea578b46 -> caebe19a8


Limit twemoji parsing to main body content, so ™© etc in header & footer areas don't
get styled differently


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/caebe19a
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/caebe19a
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/caebe19a

Branch: refs/heads/master
Commit: caebe19a8e5b311bd0ac407f609b8793fb92f72e
Parents: cea578b
Author: Dave Brondsema <dave@brondsema.net>
Authored: Thu Jul 14 12:13:48 2016 -0400
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Thu Jul 14 12:13:48 2016 -0400

----------------------------------------------------------------------
 Allura/allura/nf/allura/css/site_style.css | 2 +-
 Allura/allura/public/nf/js/allura-base.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/caebe19a/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
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 @@ div .bubble .CodeMirror {
   }
 }
 
-img.emoji {
+#content_base img.emoji {
     display: inline !important;
     height: 1em;
     width: 1em;

http://git-wip-us.apache.org/repos/asf/allura/blob/caebe19a/Allura/allura/public/nf/js/allura-base.js
----------------------------------------------------------------------
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 @@ $(function(){
     });
 
     twemoji.size = '36x36';
-    twemoji.parse(document.body);
+    twemoji.parse($('#content_base')[0]);
 });


Mime
View raw message