From 4613739748bd3110a96a2883440d6e36448729a1 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Tue, 18 Apr 2023 11:33:11 +0200 Subject: [PATCH] Merge file and image asset directories --- assets/{images => files}/1-writing-app.png | Bin assets/{images => files}/1-writing-upload.png | Bin .../{images => files}/2-formatting-autocomplete.png | Bin assets/{images => files}/3-advanced-paper.png | Bin .../{images => files}/3-advanced-team-settings.png | Bin docs/src/html.rs | 2 +- docs/src/lib.rs | 1 - 7 files changed, 1 insertion(+), 2 deletions(-) rename assets/{images => files}/1-writing-app.png (100%) rename assets/{images => files}/1-writing-upload.png (100%) rename assets/{images => files}/2-formatting-autocomplete.png (100%) rename assets/{images => files}/3-advanced-paper.png (100%) rename assets/{images => files}/3-advanced-team-settings.png (100%) diff --git a/assets/images/1-writing-app.png b/assets/files/1-writing-app.png similarity index 100% rename from assets/images/1-writing-app.png rename to assets/files/1-writing-app.png diff --git a/assets/images/1-writing-upload.png b/assets/files/1-writing-upload.png similarity index 100% rename from assets/images/1-writing-upload.png rename to assets/files/1-writing-upload.png diff --git a/assets/images/2-formatting-autocomplete.png b/assets/files/2-formatting-autocomplete.png similarity index 100% rename from assets/images/2-formatting-autocomplete.png rename to assets/files/2-formatting-autocomplete.png diff --git a/assets/images/3-advanced-paper.png b/assets/files/3-advanced-paper.png similarity index 100% rename from assets/images/3-advanced-paper.png rename to assets/files/3-advanced-paper.png diff --git a/assets/images/3-advanced-team-settings.png b/assets/files/3-advanced-team-settings.png similarity index 100% rename from assets/images/3-advanced-team-settings.png rename to assets/files/3-advanced-team-settings.png diff --git a/docs/src/html.rs b/docs/src/html.rs index 206dee004..8778fbafb 100644 --- a/docs/src/html.rs +++ b/docs/src/html.rs @@ -168,7 +168,7 @@ impl<'a> Handler<'a> { } fn handle_image(&self, link: &str) -> String { - if let Some(file) = IMAGES.get_file(link) { + if let Some(file) = FILES.get_file(link) { self.resolver.image(&link, file.contents()).into() } else if let Some(url) = self.resolver.link(link) { url diff --git a/docs/src/lib.rs b/docs/src/lib.rs index 491695757..92ff69f0e 100644 --- a/docs/src/lib.rs +++ b/docs/src/lib.rs @@ -23,7 +23,6 @@ use unscanny::Scanner; static SRC: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/src"); static FILES: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/../assets/files"); -static IMAGES: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/../assets/images"); static DETAILS: Lazy = Lazy::new(|| yaml("reference/details.yml")); static GROUPS: Lazy> = Lazy::new(|| yaml("reference/groups.yml"));