Skip to content

Bad quotes and recent activity page fix. #51

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

Open
bluestero wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bad quotes and recent activity page fix. #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 29 additions & 22 deletions base/templates/base/login_register.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{% extends 'main.html' %}

{% block content %}
{% extends 'main.html' %} {% block content %}
<main class="auth layout">

{% if page == 'login' %}
<div class="container">
<div class="layout__box">
Expand All @@ -18,23 +15,33 @@ <h2 class="auth__tagline">Find your study partner</h2>
{% csrf_token %}
<div class="form__group form__group">
<label for="room_name">Email</label>
<input id="username" name="email" type="email" placeholder="e.g. dennis_ivy@email.com />
<input
id="username"
name="email"
type="email"
placeholder="e.g. dennis_ivy@email.com" />
</div>
<div class=" form__group">
<div class="form__group">
<label for="password">Password</label>
<input id="password" name="password" type="password"
<input
id="password"
name="password"
type="password"
placeholder="&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;" />
</div>

<button class="btn btn--main" type="submit">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
<svg
version="1.1"
xmlns="http://www.w3.org/2000/svg"
width="32"
height="32"
viewBox="0 0 32 32">
<title>lock</title>
<path
d="M27 12h-1v-2c0-5.514-4.486-10-10-10s-10 4.486-10 10v2h-1c-0.553 0-1 0.447-1 1v18c0 0.553 0.447 1 1 1h22c0.553 0 1-0.447 1-1v-18c0-0.553-0.447-1-1-1zM8 10c0-4.411 3.589-8 8-8s8 3.589 8 8v2h-16v-2zM26 30h-20v-16h20v16z">
</path>
d="M27 12h-1v-2c0-5.514-4.486-10-10-10s-10 4.486-10 10v2h-1c-0.553 0-1 0.447-1 1v18c0 0.553 0.447 1 1 1h22c0.553 0 1-0.447 1-1v-18c0-0.553-0.447-1-1-1zM8 10c0-4.411 3.589-8 8-8s8 3.589 8 8v2h-16v-2zM26 30h-20v-16h20v16z"></path>
<path
d="M15 21.694v4.306h2v-4.306c0.587-0.348 1-0.961 1-1.694 0-1.105-0.895-2-2-2s-2 0.895-2 2c0 0.732 0.413 1.345 1 1.694z">
</path>
d="M15 21.694v4.306h2v-4.306c0.587-0.348 1-0.961 1-1.694 0-1.105-0.895-2-2-2s-2 0.895-2 2c0 0.732 0.413 1.345 1 1.694z"></path>
</svg>

Login
Expand All @@ -60,25 +67,25 @@ <h3>Register</h3>
<h2 class="auth__tagline">Find your study partner</h2>

<form class="form" action="" method="POST">
{% csrf_token %}

{% for field in form %}
{% csrf_token %} {% for field in form %}
<div class="form__group form__group">
<label for="room_name">{{field.label}}</label>
{{field}}
</div>
{% endfor %}


<button class="btn btn--main" type="submit">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
<svg
version="1.1"
xmlns="http://www.w3.org/2000/svg"
width="32"
height="32"
viewBox="0 0 32 32">
<title>lock</title>
<path
d="M27 12h-1v-2c0-5.514-4.486-10-10-10s-10 4.486-10 10v2h-1c-0.553 0-1 0.447-1 1v18c0 0.553 0.447 1 1 1h22c0.553 0 1-0.447 1-1v-18c0-0.553-0.447-1-1-1zM8 10c0-4.411 3.589-8 8-8s8 3.589 8 8v2h-16v-2zM26 30h-20v-16h20v16z">
</path>
d="M27 12h-1v-2c0-5.514-4.486-10-10-10s-10 4.486-10 10v2h-1c-0.553 0-1 0.447-1 1v18c0 0.553 0.447 1 1 1h22c0.553 0 1-0.447 1-1v-18c0-0.553-0.447-1-1-1zM8 10c0-4.411 3.589-8 8-8s8 3.589 8 8v2h-16v-2zM26 30h-20v-16h20v16z"></path>
<path
d="M15 21.694v4.306h2v-4.306c0.587-0.348 1-0.961 1-1.694 0-1.105-0.895-2-2-2s-2 0.895-2 2c0 0.732 0.413 1.345 1 1.694z">
</path>
d="M15 21.694v4.306h2v-4.306c0.587-0.348 1-0.961 1-1.694 0-1.105-0.895-2-2-2s-2 0.895-2 2c0 0.732 0.413 1.345 1 1.694z"></path>
</svg>

Register
Expand All @@ -94,4 +101,4 @@ <h2 class="auth__tagline">Find your study partner</h2>
</div>
{% endif %}
</main>
{% endblock content %}
{% endblock content %}
6 changes: 2 additions & 4 deletions static/styles/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,10 +425,8 @@ a {
width: 90%;
max-width: 48rem;
min-height: 40rem;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -46%);
position: relative;
margin: 5rem auto;
background-color: var(--color-dark);
border-radius: 1rem;
box-shadow: 1px 1px 6px 3px rgba(0, 0, 0, 0.1);
Expand Down