Merge lp:~nataliabidart/locolander/sign-in-with-buttons into lp:locolander

Proposed by Natalia Bidart
Status: Merged
Merged at revision: 26
Proposed branch: lp:~nataliabidart/locolander/sign-in-with-buttons
Merge into: lp:locolander
Diff against target: 48 lines (+28/-0)
2 files modified
locolander/locolanderweb/static/css/style.css (+9/-0)
locolander/locolanderweb/templates/socialaccount/snippets/provider_list.html (+19/-0)
To merge this branch: bzr merge lp:~nataliabidart/locolander/sign-in-with-buttons
Reviewer Review Type Date Requested Status
Matias Bordese Approve
Review via email: mp+176098@code.launchpad.net

Commit message

- Added logos for social sign in.

To post a comment you must log in.
26. By Natalia Bidart

Merged trunk into sign-in-with-buttons.

27. By Natalia Bidart

Fixed use of static prefix.

Revision history for this message
Matias Bordese (matiasb) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'locolander/locolanderweb/static/css/style.css'
--- locolander/locolanderweb/static/css/style.css 2013-07-20 19:07:02 +0000
+++ locolander/locolanderweb/static/css/style.css 2013-07-22 01:35:30 +0000
@@ -63,3 +63,12 @@
63 margin-top: 10px;63 margin-top: 10px;
64 border-top: dotted grey 1px;64 border-top: dotted grey 1px;
65}65}
66
67.socialaccount_providers li {
68 padding: 5px;
69}
70
71.socialaccount_logo {
72 vertical-align: middle;
73 padding-right: 5px;
74}
6675
=== added file 'locolander/locolanderweb/static/images/github.png'
67Binary files locolander/locolanderweb/static/images/github.png 1970-01-01 00:00:00 +0000 and locolander/locolanderweb/static/images/github.png 2013-07-22 01:35:30 +0000 differ76Binary files locolander/locolanderweb/static/images/github.png 1970-01-01 00:00:00 +0000 and locolander/locolanderweb/static/images/github.png 2013-07-22 01:35:30 +0000 differ
=== added file 'locolander/locolanderweb/static/images/google.png'
68Binary files locolander/locolanderweb/static/images/google.png 1970-01-01 00:00:00 +0000 and locolander/locolanderweb/static/images/google.png 2013-07-22 01:35:30 +0000 differ77Binary files locolander/locolanderweb/static/images/google.png 1970-01-01 00:00:00 +0000 and locolander/locolanderweb/static/images/google.png 2013-07-22 01:35:30 +0000 differ
=== added file 'locolander/locolanderweb/static/images/twitter.png'
69Binary files locolander/locolanderweb/static/images/twitter.png 1970-01-01 00:00:00 +0000 and locolander/locolanderweb/static/images/twitter.png 2013-07-22 01:35:30 +0000 differ78Binary files locolander/locolanderweb/static/images/twitter.png 1970-01-01 00:00:00 +0000 and locolander/locolanderweb/static/images/twitter.png 2013-07-22 01:35:30 +0000 differ
=== added directory 'locolander/locolanderweb/templates/socialaccount'
=== added directory 'locolander/locolanderweb/templates/socialaccount/snippets'
=== added file 'locolander/locolanderweb/templates/socialaccount/snippets/provider_list.html'
--- locolander/locolanderweb/templates/socialaccount/snippets/provider_list.html 1970-01-01 00:00:00 +0000
+++ locolander/locolanderweb/templates/socialaccount/snippets/provider_list.html 2013-07-22 01:35:30 +0000
@@ -0,0 +1,19 @@
1{% load i18n %}
2{% load static %}
3{% load socialaccount %}
4
5{% get_static_prefix as static_prefix %}
6
7{% for provider in socialaccount.providers %}
8<li>
9 <a title="{{ provider.name }}"
10 class="socialaccount_provider {{ provider.id }}"
11 href="{% provider_login_url provider.id process=process %}">
12 <img class="socialaccount_logo {{ provider.id }}"
13 src="{{ static_prefix }}/images/{{ provider.id }}.png" width="32"/>
14 <span class="socialaccount_label {{ provider.id }}">
15 {% trans "Sign in with" %} {{ provider.name }}
16 </span>
17 </a>
18</li>
19{% endfor %}

Subscribers

People subscribed via source and target branches

to all changes: