From a79334ea4c1b18e534bc5d66e1a2746c83a567c7 Mon Sep 17 00:00:00 2001
From: TheMardy <martijnhanegraaf@hotmail.nl>
Date: Sat, 16 Feb 2019 03:44:30 +0100
Subject: [PATCH 1/4] Added static email image routes

---
 src/api/web.rs                    |  13 ++++++++++++-
 src/static/images/logo-gray.png   | Bin 0 -> 5431 bytes
 src/static/images/mail-github.png | Bin 0 -> 1349 bytes
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 src/static/images/logo-gray.png
 create mode 100644 src/static/images/mail-github.png

diff --git a/src/api/web.rs b/src/api/web.rs
index 9b08a723..5c341cc6 100644
--- a/src/api/web.rs
+++ b/src/api/web.rs
@@ -9,11 +9,12 @@ use rocket_contrib::json::Json;
 use serde_json::Value;
 
 use crate::util::Cached;
+use crate::error::Error;
 use crate::CONFIG;
 
 pub fn routes() -> Vec<Route> {
     if CONFIG.web_vault_enabled() {
-        routes![web_index, app_id, web_files, attachments, alive]
+        routes![web_index, app_id, web_files, attachments, alive, images]
     } else {
         routes![attachments, alive]
     }
@@ -62,3 +63,13 @@ fn alive() -> Json<String> {
 
     Json(format_date(&Utc::now().naive_utc()))
 }
+
+#[get("/images/<filename>")]
+fn images(filename: String) -> Result<Content<Vec<u8>>, Error> {
+    let image_type = ContentType::new("image", "x-icon");
+    match filename.as_ref() {
+        "mail-github.png" => Ok(Content(image_type , include_bytes!("../static/images/mail-github.png").to_vec())),
+        "logo-gray.png" => Ok(Content(image_type, include_bytes!("../static/images/logo-gray.png").to_vec())),
+        _ => err!("Image not found")
+    }
+}
\ No newline at end of file
diff --git a/src/static/images/logo-gray.png b/src/static/images/logo-gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..05c3e5344a5d4df5d06aeb71a364eb11d73b3485
GIT binary patch
literal 5431
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

literal 0
HcmV?d00001

diff --git a/src/static/images/mail-github.png b/src/static/images/mail-github.png
new file mode 100644
index 0000000000000000000000000000000000000000..07935f116fe9b54db3721eb56119ff65bd9c92ad
GIT binary patch
literal 1349
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bYNg$oE_j3;tJ%>90h|i1XBMlo(_zj
zj*=k1U<O7eW)@ZsPHsMa0YM>Q5m7O5Nhujwc?Csf6;(BLEp1&reFH-y6H_w_D{C8D
zJ9`I57k4jjUqAnVz>v_$*tqz_q~w&e%<P=p;*#>py84FZwvNv3p1%HxQ>IRzF?;U3
zMT?iNTD^AthAmrn?mKYw_?dI(FJ8WS{pPJZ_Z~fY_VVrfk6*w4{QdXjk<Ts+3``e2
zT^vIsB-b8nj22FnVgK;H`uM_4u{=3uy1sLpW-MDG(m1V6>gpk$4FT+%iZoA8a58D)
zC@#Nmzx!_4_uG4uZ|}A9pU;0Q_~pZwOHciJ_pT~6v&v#^!WpZ`FDpNGS8}TbZI-+J
zAuZTrQdELFw`NJQ=#9{WPVVh-Mh8#pSnY6R4$g4DyL4h@tL>Zkj1@VHTdRDMQ(5ow
z*Dx1fxbsMQrjt+KLjHSybDCw>)XlO!9Uyk-R?1<vtWB=l3iAa_&)@uT$SI|5q4bL4
zaF6#d=e|x}yg2##dz-H(yx2<P4MH4Fq(0$sa*sW-<G6rSno4UMdr!(lh0`aPUd41B
z_L#8PL$P3b5(lSW@R>!&zG>tsALMbp%2d$h%Rez;qHiUGx5#ZiA&c80t`0v%DpjmJ
zA8PLq$u`*FHt`t8QB{c@E`~kpHTe!W$R7=lSk@rerTXX839+6W<Di3V%Bu}N^-L_?
zlawOt_Ae<#e7)q#LmkIYWdHG9nBWkY^O&DYoGqrybc)8g!v`$8Qbjbx5)$S;lCE)i
zXzh^_s;T!#VYb@D7e=$$5`T*P|EA=4-d<!L>z^~r=8NnKI-R4%xZ}i(-(0aPl#=xr
z3M9Tq%UgM^H#+v-@vJSIT;2YY4e>YHw|zVRqvy9^qvN#-zB${=Bf|d~tX&ZJ?nUyp
z6ARXznU&7|;DNte-TT%X`_Ju_TexsO<9pc@Hi?-IXIQ>haW8x?QE|09I{aq9R)OTu
zo3G52zKJor-uN-C^z?-(H<C`bSsdCW(#9vdzM{tNF8f*EZ5B;4vU$!hTa+@n7v{>F
zJib!PcUFn{z2bys*1Hm>-4|A>ulcCAV6EXX+rW&(^#&i3vQ)0y7p#$=)i1d@DVcxu
zk!Ai1B-4XWI$6gD^*9?l8us$tyPufBG|RKCtZ%V$`ZV6j7h)0*&uPvx>X+ETbT*Xj
z6tl;qnV(M>U+9_euZB(S&E?81C-}cUsQ)H^&_GF|TwuO6FvBr;y85}Sb4q9e0ER}A
APyhe`

literal 0
HcmV?d00001


From 8526055bb77d3ef6bab019cfe8e8f66217f9eb2d Mon Sep 17 00:00:00 2001
From: TheMardy <martijnhanegraaf@hotmail.nl>
Date: Sat, 16 Feb 2019 03:48:23 +0100
Subject: [PATCH 2/4] Added images to email templates

---
 src/static/templates/email/invite_accepted.html.hbs  | 8 ++------
 src/static/templates/email/invite_confirmed.html.hbs | 8 ++------
 src/static/templates/email/pw_hint_none.html.hbs     | 8 ++------
 src/static/templates/email/pw_hint_some.hbs          | 1 +
 src/static/templates/email/pw_hint_some.html.hbs     | 8 ++------
 src/static/templates/email/send_org_invite.html.hbs  | 8 ++------
 6 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/src/static/templates/email/invite_accepted.html.hbs b/src/static/templates/email/invite_accepted.html.hbs
index 71b8d174..cb8e3c79 100644
--- a/src/static/templates/email/invite_accepted.html.hbs
+++ b/src/static/templates/email/invite_accepted.html.hbs
@@ -82,7 +82,7 @@ Invitation accepted
       <table class="body-wrap" cellpadding="0" cellspacing="0" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; width: 100%;" bgcolor="#f6f6f6">
          <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
             <td valign="middle" class="aligncenter middle logo" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; padding: 20px 0 10px;" align="center">
-               <p style="text-align: center"><strong>Bitwarden_rs</strong></p>
+                <img src="{{url}}/images/logo-gray.png" alt="" width="250" height="39" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
             </td>
          </tr>
          <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
@@ -118,11 +118,7 @@ Invitation accepted
                               <td class="aligncenter social-icons" align="center" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 15px 0 0 0;" valign="top">
                                  <table cellpadding="0" cellspacing="0" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0 auto;">
                                     <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
-                                       <td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top">
-                                          <a href="https://github.com/dani-garcia/bitwarden_rs" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;">
-                                             <p style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;">GitHub</p>
-                                          </a>
-                                       </td>
+                                        <td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top"><a href="https://github.com/dani-garcia/bitwarden_rs" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;"><img src="{{url}}/images/mail-github.png" alt="GitHub" width="30" height="30" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" /></a></td>
                                     </tr>
                                  </table>
                               </td>
diff --git a/src/static/templates/email/invite_confirmed.html.hbs b/src/static/templates/email/invite_confirmed.html.hbs
index 746f96ed..81b5fefb 100644
--- a/src/static/templates/email/invite_confirmed.html.hbs
+++ b/src/static/templates/email/invite_confirmed.html.hbs
@@ -82,7 +82,7 @@ Invitation to {{org_name}} confirmed
       <table class="body-wrap" cellpadding="0" cellspacing="0" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; width: 100%;" bgcolor="#f6f6f6">
          <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
             <td valign="middle" class="aligncenter middle logo" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; padding: 20px 0 10px;" align="center">
-               <p style="text-align: center"><strong>Bitwarden_rs</strong></p>
+                <img src="{{url}}/images/logo-gray.png" alt="" width="250" height="39" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
             </td>
          </tr>
          <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
@@ -114,11 +114,7 @@ Invitation to {{org_name}} confirmed
                               <td class="aligncenter social-icons" align="center" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 15px 0 0 0;" valign="top">
                                  <table cellpadding="0" cellspacing="0" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0 auto;">
                                     <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
-                                       <td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top">
-                                          <a href="https://github.com/dani-garcia/bitwarden_rs" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;">
-                                             <p style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;">GitHub</p>
-                                          </a>
-                                       </td>
+                                        <td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top"><a href="https://github.com/dani-garcia/bitwarden_rs" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;"><img src="{{url}}/images/mail-github.png" alt="GitHub" width="30" height="30" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" /></a></td>
                                     </tr>
                                  </table>
                               </td>
diff --git a/src/static/templates/email/pw_hint_none.html.hbs b/src/static/templates/email/pw_hint_none.html.hbs
index 4b97e57f..ef13b15d 100644
--- a/src/static/templates/email/pw_hint_none.html.hbs
+++ b/src/static/templates/email/pw_hint_none.html.hbs
@@ -82,7 +82,7 @@ Sorry, you have no password hint...
       <table class="body-wrap" cellpadding="0" cellspacing="0" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; width: 100%;" bgcolor="#f6f6f6">
          <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
             <td valign="middle" class="aligncenter middle logo" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; padding: 20px 0 10px;" align="center">
-               <p style="text-align: center"><strong>Bitwarden_rs</strong></p>
+                <img src="{{url}}/images/logo-gray.png" alt="" width="250" height="39" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
             </td>
          </tr>
          <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
@@ -113,11 +113,7 @@ Sorry, you have no password hint...
                               <td class="aligncenter social-icons" align="center" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 15px 0 0 0;" valign="top">
                                  <table cellpadding="0" cellspacing="0" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0 auto;">
                                     <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
-                                       <td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top">
-                                          <a href="https://github.com/dani-garcia/bitwarden_rs" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;">
-                                             <p style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;">GitHub</p>
-                                          </a>
-                                       </td>
+                                        <td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top"><a href="https://github.com/dani-garcia/bitwarden_rs" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;"><img src="{{url}}/images/mail-github.png" alt="GitHub" width="30" height="30" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" /></a></td>
                                     </tr>
                                  </table>
                               </td>
diff --git a/src/static/templates/email/pw_hint_some.hbs b/src/static/templates/email/pw_hint_some.hbs
index a2917a3d..f16dc2b1 100644
--- a/src/static/templates/email/pw_hint_some.hbs
+++ b/src/static/templates/email/pw_hint_some.hbs
@@ -3,5 +3,6 @@ Your master password hint
 You (or someone) recently requested your master password hint.
 
 Your hint is: "{{hint}}"
+Log in: <a href="{{url}}">Web Vault</a>
 
 If you did not request your master password hint you can safely ignore this email.
diff --git a/src/static/templates/email/pw_hint_some.html.hbs b/src/static/templates/email/pw_hint_some.html.hbs
index 44cb3856..99220718 100644
--- a/src/static/templates/email/pw_hint_some.html.hbs
+++ b/src/static/templates/email/pw_hint_some.html.hbs
@@ -82,7 +82,7 @@ Your master password hint
       <table class="body-wrap" cellpadding="0" cellspacing="0" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; width: 100%;" bgcolor="#f6f6f6">
          <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
             <td valign="middle" class="aligncenter middle logo" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; padding: 20px 0 10px;" align="center">
-               <p style="text-align: center"><strong>Bitwarden_rs</strong></p>
+                <img src="{{url}}/images/logo-gray.png" alt="" width="250" height="39" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
             </td>
          </tr>
          <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
@@ -119,11 +119,7 @@ Your master password hint
                               <td class="aligncenter social-icons" align="center" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 15px 0 0 0;" valign="top">
                                  <table cellpadding="0" cellspacing="0" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0 auto;">
                                     <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
-                                       <td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top">
-                                          <a href="https://github.com/dani-garcia/bitwarden_rs" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;">
-                                             <p style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;">GitHub</p>
-                                          </a>
-                                       </td>
+                                        <td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top"><a href="https://github.com/dani-garcia/bitwarden_rs" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;"><img src="{{url}}/images/mail-github.png" alt="GitHub" width="30" height="30" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" /></a></td>
                                     </tr>
                                  </table>
                               </td>
diff --git a/src/static/templates/email/send_org_invite.html.hbs b/src/static/templates/email/send_org_invite.html.hbs
index 0d8f32a1..e32dd6f7 100644
--- a/src/static/templates/email/send_org_invite.html.hbs
+++ b/src/static/templates/email/send_org_invite.html.hbs
@@ -82,7 +82,7 @@ Join {{org_name}}
       <table class="body-wrap" cellpadding="0" cellspacing="0" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; width: 100%;" bgcolor="#f6f6f6">
          <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
             <td valign="middle" class="aligncenter middle logo" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; padding: 20px 0 10px;" align="center">
-               <p style="text-align: center"><strong>Bitwarden_rs</strong></p>
+                <img src="{{url}}/images/logo-gray.png" alt="" width="250" height="39" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
             </td>
          </tr>
          <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
@@ -120,11 +120,7 @@ Join {{org_name}}
                               <td class="aligncenter social-icons" align="center" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 15px 0 0 0;" valign="top">
                                  <table cellpadding="0" cellspacing="0" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0 auto;">
                                     <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
-                                       <td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top">
-                                          <a href="https://github.com/dani-garcia/bitwarden_rs" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;">
-                                             <p style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;">GitHub</p>
-                                          </a>
-                                       </td>
+                                        <td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top"><a href="https://github.com/dani-garcia/bitwarden_rs" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;"><img src="{{url}}/images/mail-github.png" alt="GitHub" width="30" height="30" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" /></a></td>
                                     </tr>
                                  </table>
                               </td>

From 84fb6aaddbb4665e481f1e7f3d5dd393dc88a34a Mon Sep 17 00:00:00 2001
From: TheMardy <martijnhanegraaf@hotmail.nl>
Date: Sun, 17 Feb 2019 01:08:24 +0100
Subject: [PATCH 3/4] Set correct MIME type

---
 src/api/web.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/web.rs b/src/api/web.rs
index 5c341cc6..0c60a352 100644
--- a/src/api/web.rs
+++ b/src/api/web.rs
@@ -66,7 +66,7 @@ fn alive() -> Json<String> {
 
 #[get("/images/<filename>")]
 fn images(filename: String) -> Result<Content<Vec<u8>>, Error> {
-    let image_type = ContentType::new("image", "x-icon");
+    let image_type = ContentType::new("image", "png");
     match filename.as_ref() {
         "mail-github.png" => Ok(Content(image_type , include_bytes!("../static/images/mail-github.png").to_vec())),
         "logo-gray.png" => Ok(Content(image_type, include_bytes!("../static/images/logo-gray.png").to_vec())),

From f0701657a9d225a169ba07fe7566cfaef18e42a2 Mon Sep 17 00:00:00 2001
From: TheMardy <m.hanegraaf@hotmail.nl>
Date: Tue, 30 Apr 2019 16:08:53 +0200
Subject: [PATCH 4/4] Changed to Bitwarden_RS Logo

---
 src/static/images/logo-gray.png | Bin 5431 -> 7580 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/static/images/logo-gray.png b/src/static/images/logo-gray.png
index 05c3e5344a5d4df5d06aeb71a364eb11d73b3485..b045df54c0c95f2e18ff48a75a8369565bc4142a 100644
GIT binary patch
literal 7580
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
BSswrZ

literal 5431
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