diff --git a/src/api/web.rs b/src/api/web.rs index 29c64ae4..96af81f1 100644 --- a/src/api/web.rs +++ b/src/api/web.rs @@ -78,9 +78,9 @@ fn static_files(filename: String) -> Result, Error> { match filename.as_ref() { "mail-github.png" => Ok(Content(ContentType::PNG, include_bytes!("../static/images/mail-github.png"))), "logo-gray.png" => Ok(Content(ContentType::PNG, include_bytes!("../static/images/logo-gray.png"))), - "shield-white.png" => Ok(Content(ContentType::PNG, include_bytes!("../static/images/shield-white.png"))), "error-x.svg" => Ok(Content(ContentType::SVG, include_bytes!("../static/images/error-x.svg"))), "hibp.png" => Ok(Content(ContentType::PNG, include_bytes!("../static/images/hibp.png"))), + "vaultwarden-icon.png" => Ok(Content(ContentType::PNG, include_bytes!("../static/images/vaultwarden-icon.png"))), "bootstrap.css" => Ok(Content(ContentType::CSS, include_bytes!("../static/scripts/bootstrap.css"))), "bootstrap-native.js" => { diff --git a/src/mail.rs b/src/mail.rs index 025a1a9a..ff04f7b9 100644 --- a/src/mail.rs +++ b/src/mail.rs @@ -27,7 +27,7 @@ fn mailer() -> SmtpTransport { .timeout(Some(Duration::from_secs(CONFIG.smtp_timeout()))); // Determine security - let smtp_client = if CONFIG.smtp_ssl() { + let smtp_client = if CONFIG.smtp_ssl() || CONFIG.smtp_explicit_tls() { let mut tls_parameters = TlsParameters::builder(host); if CONFIG.smtp_accept_invalid_hostnames() { tls_parameters = tls_parameters.dangerous_accept_invalid_hostnames(true); diff --git a/src/static/images/hibp.png b/src/static/images/hibp.png index 99d485a5..568b99b7 100644 Binary files a/src/static/images/hibp.png and b/src/static/images/hibp.png differ diff --git a/src/static/images/logo-gray.png b/src/static/images/logo-gray.png index 57b2949e..21caaf52 100644 Binary files a/src/static/images/logo-gray.png and b/src/static/images/logo-gray.png differ diff --git a/src/static/images/shield-white.png b/src/static/images/shield-white.png deleted file mode 100644 index ae5db28a..00000000 Binary files a/src/static/images/shield-white.png and /dev/null differ diff --git a/src/static/images/vaultwarden-icon.png b/src/static/images/vaultwarden-icon.png new file mode 100644 index 00000000..36c8c79e Binary files /dev/null and b/src/static/images/vaultwarden-icon.png differ diff --git a/src/static/templates/admin/base.hbs b/src/static/templates/admin/base.hbs index e476309d..d889a524 100644 --- a/src/static/templates/admin/base.hbs +++ b/src/static/templates/admin/base.hbs @@ -4,7 +4,7 @@ - + Vaultwarden Admin Panel @@ -83,7 +84,7 @@