diff --git a/Changelog.md b/Changelog.md index 5db984156d6004cf1f4f512cf37151aab590ce7f..faac7f05a1111057c1c2e07164edaeae38498577 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,8 @@ * Drop number of followers from tags page [#4717](https://github.com/diaspora/diaspora/issues/4717) * Remove some unused beta code [#4738](https://github.com/diaspora/diaspora/issues/4738) * Style improvements for SPV, use original author's avatar for reshares [#4754](https://github.com/diaspora/diaspora/issue/4754) +* Update image branding to the new decided standard [#4702](https://github.com/diaspora/diaspora/pull/4702) + ## Bug fixes * Improve time agos by updating the plugin [#4280](https://github.com/diaspora/diaspora/issues/4280) diff --git a/app/assets/images/branding/logo.png b/app/assets/images/branding/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..6c091532ca6abcf460dff1bfb3058bffcd3fe982 Binary files /dev/null and b/app/assets/images/branding/logo.png differ diff --git a/app/assets/images/branding/logo_caps.png b/app/assets/images/branding/logo_caps.png deleted file mode 100644 index 64075dd2bc39b84d296c00e933a991ae186c9c64..0000000000000000000000000000000000000000 Binary files a/app/assets/images/branding/logo_caps.png and /dev/null differ diff --git a/app/assets/images/branding/logo_small.png b/app/assets/images/branding/logo_small.png new file mode 100644 index 0000000000000000000000000000000000000000..4955f926e9f25396c60090b61a49ad0f98a4c5df Binary files /dev/null and b/app/assets/images/branding/logo_small.png differ diff --git a/app/assets/images/branding/logo_white.png b/app/assets/images/branding/logo_white.png new file mode 100644 index 0000000000000000000000000000000000000000..17b10633a071998679e57b0f234f8ef4b1b06a0f Binary files /dev/null and b/app/assets/images/branding/logo_white.png differ diff --git a/app/assets/images/branding/logo_white2x.png b/app/assets/images/branding/logo_white2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fa0aafb9561888d358a4795b6fcf08db45ce5112 Binary files /dev/null and b/app/assets/images/branding/logo_white2x.png differ diff --git a/app/assets/images/branding/logo_white4x.png b/app/assets/images/branding/logo_white4x.png new file mode 100644 index 0000000000000000000000000000000000000000..2f559c1baef90b5a156cb41e283bd9042352b4f0 Binary files /dev/null and b/app/assets/images/branding/logo_white4x.png differ diff --git a/app/assets/images/branding/powered_by_diaspora.png b/app/assets/images/branding/powered_by_diaspora.png index 1266901ef8f73e282494905d1dd98b37f952e123..3979f5be721b8a28f7ece55d0a7e3c1648c342cc 100644 Binary files a/app/assets/images/branding/powered_by_diaspora.png and b/app/assets/images/branding/powered_by_diaspora.png differ diff --git a/app/assets/images/branding/white.png b/app/assets/images/branding/white.png deleted file mode 100644 index fdbb27091bfa6f6ceff6584c9d173b8ff58e7a63..0000000000000000000000000000000000000000 Binary files a/app/assets/images/branding/white.png and /dev/null differ diff --git a/app/assets/images/branding/white2x.png b/app/assets/images/branding/white2x.png index abd33d8cea5c9bd74141085ee35d7d35647d7b4f..fa0aafb9561888d358a4795b6fcf08db45ce5112 100644 Binary files a/app/assets/images/branding/white2x.png and b/app/assets/images/branding/white2x.png differ diff --git a/app/assets/images/branding/white_on_grey.png b/app/assets/images/branding/white_on_grey.png index 0f6294fef2b2398caf3a653446135f225bd64475..ea342d12ada05708b90654b20d0d79345ac7e3be 100644 Binary files a/app/assets/images/branding/white_on_grey.png and b/app/assets/images/branding/white_on_grey.png differ diff --git a/app/views/layouts/notifier.html.erb b/app/views/layouts/notifier.html.erb index cabab16b69995350d14e61456db650f5ad0421c5..2019125a02377a243f1c0b7683f258150ec6bd04 100644 --- a/app/views/layouts/notifier.html.erb +++ b/app/views/layouts/notifier.html.erb @@ -28,7 +28,7 @@ <table cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:14px;color:#333;"> <tr> <td style="text-align:center;padding:30px;"> - <img src="<%=AppConfig.pod_uri.to_s %>assets/branding/logo_caps.png" alt="diaspora*" width="95px" height="14px"/> + <img src="<%=AppConfig.pod_uri.to_s %>assets/branding/logo_small.png" alt="diaspora*" width="59px" height="14px"/> </td> </tr> </table>