Skip to content

Highlight code blocks according to the current theme #1221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 27, 2020
Merged

Highlight code blocks according to the current theme #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af14cbd
Highlight code blocks according to the current theme
jyn514 Dec 25, 2020
74c5311
Fix highlighting for users visiting in private mode
jyn514 Dec 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@
<link rel="stylesheet" href="/-/static/vendored.css?{{ docsrs_version() | slugify }}" type="text/css" media="all" />
<link rel="stylesheet" href="/-/static/style.css?{{ docsrs_version() | slugify }}" type="text/css" media="all" />

{%- block css -%}{%- endblock css -%}

<link rel="search" href="/-/static/opensearch.xml" type="application/opensearchdescription+xml" title="Docs.rs" />

<title>{%- block title -%} Docs.rs {%- endblock title -%}</title>

<script type="text/javascript">{%- include "theme.js" -%}</script>
{%- block css -%}{%- endblock css -%}
</head>

<body>
Expand Down
26 changes: 24 additions & 2 deletions templates/macros.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,30 @@
{# Makes the appropriate CSS imports for highlighting #}
{% macro highlight_css() %}
{# Load the highlighting theme css #}
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/styles/github.min.css"
type="text/css" media="all" />
<script>
// Choose which highlight.js theme to load based on the user theme
var stylesheet;
switch(document.documentElement.dataset.theme) {
case "dark":
case "ayu":
stylesheet = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/styles/dark.min.css";
break;
case "null": // The user is visiting docs.rs for the first time and hasn't set a theme yet.
case "light":
stylesheet = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/styles/github.min.css";
break;
default:
throw "unrecognized theme " + document.documentElement.dataset.theme;
break;
}
// Now add the stylesheet to the document
var link = document.createElement("link");
link.rel = "stylesheet";
link.href = stylesheet;
link.type = "text/css";
link.media = "all";
document.head.appendChild(link);
</script>
{% endmacro highlight_css %}

{#
Expand Down
2 changes: 1 addition & 1 deletion templates/style/base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ body {
border-bottom: 1px solid;
}
pre {
background-color: #F5F5F5;
background-color: var(--color-background-code);
padding: 14px;
}
code, kbd, pre, samp {
Expand Down