diff --git a/Changelog.md b/Changelog.md index 5db984156..faac7f05a 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 000000000..6c091532c 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 64075dd2b..000000000 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 000000000..4955f926e 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 000000000..17b10633a 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 000000000..fa0aafb95 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 000000000..2f559c1ba 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 1266901ef..3979f5be7 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 fdbb27091..000000000 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 abd33d8ce..fa0aafb95 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 0f6294fef..ea342d12a 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 cabab16b6..2019125a0 100644 --- a/app/views/layouts/notifier.html.erb +++ b/app/views/layouts/notifier.html.erb @@ -28,7 +28,7 @@
- diaspora* + diaspora*