vw_small

commit 121031006351f84ea64ec08507a64c07a3892489
parent e6dd584dd63fca8b6809bdbf9ee8bdfc0d197c78
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Mon, 12 Dec 2022 22:54:49 +0100

Merge branch 'tessus-fix/admin-icon'

Diffstat:
M
src/api/web.rs
 | 
1
+
A
src/static/images/vaultwarden-favicon.png
 | 
0

M
src/static/templates/404.hbs
 | 
2
+-
M
src/static/templates/admin/base.hbs
 | 
2
+-

4 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/api/web.rs b/src/api/web.rs
@@ -101,6 +101,7 @@ pub fn static_files(filename: String) -> Result<(ContentType, &'static [u8]), Er
         "error-x.svg" => Ok((ContentType::SVG, include_bytes!("../static/images/error-x.svg"))),
         "hibp.png" => Ok((ContentType::PNG, include_bytes!("../static/images/hibp.png"))),
         "vaultwarden-icon.png" => Ok((ContentType::PNG, include_bytes!("../static/images/vaultwarden-icon.png"))),
+        "vaultwarden-favicon.png" => Ok((ContentType::PNG, include_bytes!("../static/images/vaultwarden-favicon.png"))),
         "bootstrap.css" => Ok((ContentType::CSS, include_bytes!("../static/scripts/bootstrap.css"))),
         "bootstrap-native.js" => Ok((ContentType::JavaScript, include_bytes!("../static/scripts/bootstrap-native.js"))),
         "jdenticon.js" => Ok((ContentType::JavaScript, include_bytes!("../static/scripts/jdenticon.js"))),
diff --git a/src/static/images/vaultwarden-favicon.png b/src/static/images/vaultwarden-favicon.png
Binary files differ.
diff --git a/src/static/templates/404.hbs b/src/static/templates/404.hbs
@@ -4,7 +4,7 @@
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
     <meta name="robots" content="noindex,nofollow" />
-    <link rel="icon" type="image/png" href="{{urlpath}}/vw_static/vaultwarden-icon.png">
+    <link rel="icon" type="image/png" href="{{urlpath}}/vw_static/vaultwarden-favicon.png">
     <title>Page not found!</title>
     <link rel="stylesheet" href="{{urlpath}}/vw_static/bootstrap.css" />
     <style>
diff --git a/src/static/templates/admin/base.hbs b/src/static/templates/admin/base.hbs
@@ -4,7 +4,7 @@
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
     <meta name="robots" content="noindex,nofollow" />
-    <link rel="icon" type="image/png" href="{{urlpath}}/vw_static/vaultwarden-icon.png">
+    <link rel="icon" type="image/png" href="{{urlpath}}/vw_static/vaultwarden-favicon.png">
     <title>Vaultwarden Admin Panel</title>
     <link rel="stylesheet" href="{{urlpath}}/vw_static/bootstrap.css" />
     <style>