actions
/
mdBook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1272 from ehuss/fix-favicon-link 

Fix favicon when only one is overridden.
This commit is contained in:
Eric Huss 2020-08-07 08:34:46 -07:00 committed by GitHub
parent 8746206060 20a0b99c3d
commit a00e7d1769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/renderer/html_handlebars/hbs_renderer.rs
View File

@ -478,7 +478,7 @@ impl Renderer for HtmlHandlebars {
debug!("Register handlebars helpers"); debug!("Register handlebars helpers");
self.register_hbs_helpers(&mut handlebars, &html_config); self.register_hbs_helpers(&mut handlebars, &html_config);
let mut data = make_data(&ctx.root, &book, &ctx.config, &html_config)?; let mut data = make_data(&ctx.root, &book, &ctx.config, &html_config, &theme)?;
// Print version // Print version
let mut print_content = String::new(); let mut print_content = String::new();
@ -551,6 +551,7 @@ fn make_data(
book: &Book, book: &Book,
config: &Config, config: &Config,
html_config: &HtmlConfig, html_config: &HtmlConfig,
theme: &Theme,
) -> Result<serde_json::Map<String, serde_json::Value>> { ) -> Result<serde_json::Map<String, serde_json::Value>> {
trace!("make_data"); trace!("make_data");
@ -567,6 +568,12 @@ fn make_data(
"description".to_owned(), "description".to_owned(),
json!(config.book.description.clone().unwrap_or_default()), json!(config.book.description.clone().unwrap_or_default()),
); );
if theme.favicon_png.is_some() {
data.insert("favicon_png".to_owned(), json!("favicon.png"));
}
if theme.favicon_svg.is_some() {
data.insert("favicon_svg".to_owned(), json!("favicon.svg"));
}
if let Some(ref livereload) = html_config.livereload_url { if let Some(ref livereload) = html_config.livereload_url {
data.insert("livereload".to_owned(), json!(livereload)); data.insert("livereload".to_owned(), json!(livereload));
} }

4
src/theme/index.hbs
View File

@ -20,8 +20,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#ffffff" /> <meta name="theme-color" content="#ffffff" />
{{#if favicon_svg}}
<link rel="icon" href="{{ path_to_root }}favicon.svg"> <link rel="icon" href="{{ path_to_root }}favicon.svg">
{{/if}}
{{#if favicon_png}}
<link rel="shortcut icon" href="{{ path_to_root }}favicon.png"> <link rel="shortcut icon" href="{{ path_to_root }}favicon.png">
{{/if}}
<link rel="stylesheet" href="{{ path_to_root }}css/variables.css"> <link rel="stylesheet" href="{{ path_to_root }}css/variables.css">
<link rel="stylesheet" href="{{ path_to_root }}css/general.css"> <link rel="stylesheet" href="{{ path_to_root }}css/general.css">
<link rel="stylesheet" href="{{ path_to_root }}css/chrome.css"> <link rel="stylesheet" href="{{ path_to_root }}css/chrome.css">