Merge pull request #4702 from goobertron/new_logos

Updated image branding (issue #4444)
2014-02-09 14:46:41 +01:00 · 2014-02-09 14:46:41 +01:00 · 976b21ab05
commit 976b21ab05
parent ecd8a8200b 19c9c0f394
12 changed files with 3 additions and 1 deletions
--- 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)
--- a/app/assets/images/branding/logo.png
+++ b/app/assets/images/branding/logo.png
--- a/app/assets/images/branding/logo_caps.png
+++ b/app/assets/images/branding/logo_caps.png
--- a/app/assets/images/branding/logo_small.png
+++ b/app/assets/images/branding/logo_small.png
--- a/app/assets/images/branding/logo_white.png
+++ b/app/assets/images/branding/logo_white.png
--- a/app/assets/images/branding/logo_white2x.png
+++ b/app/assets/images/branding/logo_white2x.png
--- a/app/assets/images/branding/logo_white4x.png
+++ b/app/assets/images/branding/logo_white4x.png
--- a/app/assets/images/branding/powered_by_diaspora.png
+++ b/app/assets/images/branding/powered_by_diaspora.png
--- a/app/assets/images/branding/white.png
+++ b/app/assets/images/branding/white.png
--- a/app/assets/images/branding/white2x.png
+++ b/app/assets/images/branding/white2x.png
--- a/app/assets/images/branding/white_on_grey.png
+++ b/app/assets/images/branding/white_on_grey.png
--- 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>