From bc6b199588cd31df1b8d8d0e3e2b91bd196d2dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20BRANSTETT?= Date: Thu, 13 Jan 2022 14:44:30 +0100 Subject: [PATCH 1/2] Use the updated Rust logo and change it's format to SVG --- src/librustdoc/html/render/write_shared.rs | 2 +- .../html/static/images/rust-logo.png | Bin 5758 -> 0 bytes .../html/static/images/rust-logo.svg | 61 ++++++++++++++++++ src/librustdoc/html/static_files.rs | 5 +- src/librustdoc/templates/page.html | 4 +- 5 files changed, 67 insertions(+), 5 deletions(-) delete mode 100644 src/librustdoc/html/static/images/rust-logo.png create mode 100644 src/librustdoc/html/static/images/rust-logo.svg diff --git a/src/librustdoc/html/render/write_shared.rs b/src/librustdoc/html/render/write_shared.rs index 2e763dbd8fe..d5e5af7bbf8 100644 --- a/src/librustdoc/html/render/write_shared.rs +++ b/src/librustdoc/html/render/write_shared.rs @@ -240,7 +240,7 @@ pub(super) fn write_shared( } if (*cx.shared).layout.logo.is_empty() { - write_toolchain("rust-logo.png", static_files::RUST_LOGO)?; + write_toolchain("rust-logo.svg", static_files::RUST_LOGO_SVG)?; } if (*cx.shared).layout.favicon.is_empty() { write_toolchain("favicon.svg", static_files::RUST_FAVICON_SVG)?; diff --git a/src/librustdoc/html/static/images/rust-logo.png b/src/librustdoc/html/static/images/rust-logo.png deleted file mode 100644 index 74b4bd695045ebc52c21af95301adc9311ca881c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5758 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 v#bP0l+XkK|AsFv diff --git a/src/librustdoc/html/static/images/rust-logo.svg b/src/librustdoc/html/static/images/rust-logo.svg new file mode 100644 index 00000000000..62424d8ffd7 --- /dev/null +++ b/src/librustdoc/html/static/images/rust-logo.svg @@ -0,0 +1,61 @@ + + + diff --git a/src/librustdoc/html/static_files.rs b/src/librustdoc/html/static_files.rs index 56c5399d074..cd369a93d82 100644 --- a/src/librustdoc/html/static_files.rs +++ b/src/librustdoc/html/static_files.rs @@ -67,8 +67,9 @@ crate static LICENSE_APACHE: &[u8] = include_bytes!("static/LICENSE-APACHE.txt") /// The contents of `LICENSE-MIT.txt`, the text of the MIT License. crate static LICENSE_MIT: &[u8] = include_bytes!("static/LICENSE-MIT.txt"); -/// The contents of `rust-logo.png`, the default icon of the documentation. -crate static RUST_LOGO: &[u8] = include_bytes!("static/images/rust-logo.png"); +/// The contents of `rust-logo.svg`, the default icon of the documentation. +crate static RUST_LOGO_SVG: &[u8] = include_bytes!("static/images/rust-logo.svg"); + /// The default documentation favicons (SVG and PNG fallbacks) crate static RUST_FAVICON_SVG: &[u8] = include_bytes!("static/images/favicon.svg"); crate static RUST_FAVICON_PNG_16: &[u8] = include_bytes!("static/images/favicon-16x16.png"); diff --git a/src/librustdoc/templates/page.html b/src/librustdoc/templates/page.html index 673260ac6d0..02808754b53 100644 --- a/src/librustdoc/templates/page.html +++ b/src/librustdoc/templates/page.html @@ -79,7 +79,7 @@ {%- if !layout.logo.is_empty() %} logo {#- -#} {%- else -%} - {#- -#} + {#- -#} {%- endif -%} {#- -#} @@ -92,7 +92,7 @@ {%- if !layout.logo.is_empty() %} logo {#- -#} {%- else -%} - {#- -#} + {#- -#} {%- endif -%} {#- -#}