Skip to content

Commit

Permalink
Don't highlight code spans in headers. (rust-lang#1162)
Browse files Browse the repository at this point in the history
  • Loading branch information
ehuss authored Mar 24, 2020
1 parent ce09c93 commit 7947260
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
13 changes: 7 additions & 6 deletions src/theme/book.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,11 @@ function playpen_text(playpen) {
languages: [], // Languages used for auto-detection
});

let code_nodes = Array
.from(document.querySelectorAll('code'))
// Don't highlight `inline code` blocks in headers.
.filter(function (node) {return !node.parentElement.classList.contains("header"); });

if (window.ace) {
// language-rust class needs to be removed for editable
// blocks or highlightjs will capture events
Expand All @@ -154,16 +159,12 @@ function playpen_text(playpen) {
.from(document.querySelectorAll('code:not(.editable)'))
.forEach(function (block) { hljs.highlightBlock(block); });
} else {
Array
.from(document.querySelectorAll('code'))
.forEach(function (block) { hljs.highlightBlock(block); });
code_nodes.forEach(function (block) { hljs.highlightBlock(block); });
}

// Adding the hljs class gives code blocks the color css
// even if highlighting doesn't apply
Array
.from(document.querySelectorAll('code'))
.forEach(function (block) { block.classList.add('hljs'); });
code_nodes.forEach(function (block) { block.classList.add('hljs'); });

Array.from(document.querySelectorAll("code.language-rust")).forEach(function (block) {

Expand Down
5 changes: 5 additions & 0 deletions src/theme/css/general.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ code {
font-size: 0.875em; /* please adjust the ace font size accordingly in editor.js */
}

/* Don't change font size in headers. */
h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
font-size: unset;
}

.left { float: left; }
.right { float: right; }
.boring { opacity: 0.6; }
Expand Down

0 comments on commit 7947260

Please sign in to comment.