summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Borghino <fmborghino@gmail.com>2015-06-10 23:22:05 -0700
committerMax Borghino <fmborghino@gmail.com>2015-06-10 23:48:06 -0700
commita37ff6de8879ccbd7eec95654753f0458a3f465f (patch)
tree3b88f1fcfab6ba3466cb948b3965ac6a45c42e77
parent190c9e9f39c6d14c2a47083fcd5d64717919d9eb (diff)
downloadgitlab-ce-a37ff6de8879ccbd7eec95654753f0458a3f465f.tar.gz
Update oauth button logos for Twitter and Google
Both new buttons are 64x64 renders of the recommended assets from each company. Refs for those are: - https://about.twitter.com/press/twitter-brand-policy - https://developers.google.com/identity/branding-guidelines Addresses issue #544
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/images/authbuttons/google_64.pngbin3169 -> 5281 bytes
-rw-r--r--app/assets/images/authbuttons/twitter_64.pngbin3054 -> 4835 bytes
3 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c04b8f079af..9d558b15ab9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
v 7.12.0 (unreleased)
+ - Update oauth button logos for Twitter and Google to recommended assets
- Update browser gem to version 0.8.0 for IE11 support (Stan Hu)
- Fix timeout when rendering file with thousands of lines.
- Add "Remember me" checkbox to LDAP signin form.
diff --git a/app/assets/images/authbuttons/google_64.png b/app/assets/images/authbuttons/google_64.png
index 94a0e089c6e..fb64f8bee68 100644
--- a/app/assets/images/authbuttons/google_64.png
+++ b/app/assets/images/authbuttons/google_64.png
Binary files differ
diff --git a/app/assets/images/authbuttons/twitter_64.png b/app/assets/images/authbuttons/twitter_64.png
index 5c9f14cb077..e3bd9169a34 100644
--- a/app/assets/images/authbuttons/twitter_64.png
+++ b/app/assets/images/authbuttons/twitter_64.png
Binary files differ