Skip to content

Login page overflow #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Login page overflow #272

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6dd4fc2
imported sample data files
Feb 24, 2020
5512345
reformatted login form
Feb 24, 2020
a9eefe3
applied super hacky inline negative margins to signup form
Feb 24, 2020
98a836f
aligned login form elelements to center to match current version
Feb 24, 2020
b206a46
Merge pull request #1 from mariocontext/login-page-overflow
mariocontext Feb 26, 2020
9d28f99
removed ref imports
Feb 26, 2020
f55cb1a
Merge pull request #2 from mariocontext/login-page-overflow
mariocontext Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions get_together/templates/get_together/users/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,16 @@
{% endblock %}

{% block content %}
<center>
<h3>{% trans "Login to your account" %}</h3>
<div class="container container-secondary box-shadow mt-4 mb-4 pt-4 pb-4" style="width: 400px">
<div >
<div >
<center>
<h3 class="text-center">{% trans "Login to your account" %}</h3>
<div class="container container-secondary box-shadow mt-4 mb-4 pt-4 pb-4" style="max-width: 400px">
<div class="d-flex flex-column align-items-center">
{% if settings.SOCIAL_AUTH_GOOGLE_OAUTH2_KEY %}<a class="btn btn-googleplus mb-1 col-8" href="{% url 'social:begin' 'google-oauth2' %}?{{ request.META.QUERY_STRING }}"><i class="fab fa-google"></i> Google</a></br>{% endif %}
{% if settings.SOCIAL_AUTH_FACEBOOK_KEY %}<a class="btn btn-facebook mb-1 col-8" href="{% url 'social:begin' 'facebook' %}?{{ request.META.QUERY_STRING }}"><i class="fab fa-facebook"></i> Facebook</a></br>{% endif %}
{% if settings.SOCIAL_AUTH_TWITTER_KEY %}<a class="btn btn-twitter mb-1 col-8" href="{% url 'social:begin' 'twitter' %}?{{ request.META.QUERY_STRING }}"><i class="fab fa-twitter"></i> Twitter</a></br>{% endif %}
{% comment %}{% if settings.SOCIAL_AUTH_LINKEDIN_KEY %}<a class="btn btn-linkedin mb-1 col-8" href="{% url 'social:begin' 'linkedin' %}?{{ request.META.QUERY_STRING }}"><i class="fab fa-linkedin"></i> LinkedIn</a></br>{% endif %}{% endcomment %}
{% if settings.SOCIAL_AUTH_GITHUB_KEY %}<a class="btn btn-github mb-1 col-8" href="{% url 'social:begin' 'github' %}?{{ request.META.QUERY_STRING }}"><i class="fab fa-github"></i> GitHub</a></br>{% endif %}
<p class="text-muted small mt-2">{% trans "OR" %}</p>
<p class="text-center text-muted small mt-2">{% trans "OR" %}</p>
</div>
<div>
<ul class="nav nav-tabs justify-content-center mb-2" id="localTab" role="tablist">
<li class="nav-item">
Expand All @@ -29,31 +27,28 @@ <h3>{% trans "Login to your account" %}</h3>
</ul>
<div class="tab-content" id="localFormContent">
<div class="tab-pane fade {% if action != 'signup' %}show active{% endif %}" id="login" role="tabpanel" aria-labelledby="login-tab">
<form action="#" method="POST">
<form action="#" method="POST" class="d-flex flex-column align-items-center">
{% csrf_token %}
<table>
{{ login_form }}
</table>
<button class="btn btn-primary" type="submit" name="action" value="login">{% trans "Login" %}</button>
</form>
<br /><br />
<a href="{% url 'password_reset' %}">{% trans "Forgot my password" %}</a>
<a class=" d-block text-center" href="{% url 'password_reset' %}">{% trans "Forgot my password" %}</a>
</div>
<div class="tab-pane fade {% if action == 'signup' %}show active{% endif %}" id="signup" role="tabpanel" aria-labelledby="signup-tab">
<form action="#" method="POST">
{% csrf_token %}
<table class="table">
<table class="table" style="margin-left: -0.75rem; margin-right: -0.75rem">
{{ signup_form }}
</table>
<button class="btn btn-primary" type="submit" name="action" value="signup">{% trans "Signup" %}</button>
</form>
</div>
</div>
</div>
</center>
</div>
</div>
</div>
</center>
{% endblock %}