diff options
| author | Daniel García <[email protected]> | 2022-12-12 22:54:49 +0100 |
|---|---|---|
| committer | Daniel García <[email protected]> | 2022-12-12 22:54:49 +0100 |
| commit | 121031006351f84ea64ec08507a64c07a3892489 (patch) | |
| tree | 660d39dc5d8a84cd4ee0a4b1be4ac0cc05877e1d | |
| parent | e6dd584dd63fca8b6809bdbf9ee8bdfc0d197c78 (diff) | |
| parent | b093384385b1a78e7bce4b0ae2e54211f638cc3c (diff) | |
| download | vaultwarden-121031006351f84ea64ec08507a64c07a3892489.tar.gz vaultwarden-121031006351f84ea64ec08507a64c07a3892489.zip | |
Merge branch 'tessus-fix/admin-icon'
| -rw-r--r-- | src/api/web.rs | 1 | ||||
| -rw-r--r-- | src/static/images/vaultwarden-favicon.png | bin | 0 -> 886 bytes | |||
| -rw-r--r-- | src/static/templates/404.hbs | 2 | ||||
| -rw-r--r-- | 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 index a7640cd9..72bb66d0 100644 --- 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 differnew file mode 100644 index 00000000..15b499e8 --- /dev/null +++ b/src/static/images/vaultwarden-favicon.png diff --git a/src/static/templates/404.hbs b/src/static/templates/404.hbs index dc30b9e4..230c30ca 100644 --- 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 index 8b5e891b..b9ccbfae 100644 --- 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> |
