Skip to content

Feature style auth pages #78

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

Merged
NeZanyat merged 4 commits into from
Feb 22, 2019
Merged

Feature style auth pages #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a876d6
Merge pull request #66 from MetaCell/feature_model-instance-creation
NeZanyat Jan 29, 2019
b099f7b
Revert "Merge pull request #65 from MetaCell/master"
NeZanyat Jan 29, 2019
159062e
Merge pull request #67 from MetaCell/revert-66-feature_model-instance…
NeZanyat Jan 29, 2019
3f68664
Style auth pages
jrmartin Feb 21, 2019
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
99 changes: 99 additions & 0 deletions scidash/account/static/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
body {
background: linear-gradient(to top, #ada996, #f2f2f2, #dbdbdb, #eaeaea);
}

#headerLinks {
font-size: 0.9em;
font-weight: 400;
position: fixed;
left: 0px;
right: 0px;
top: 32px;
height: 30px;
text-align: center;
letter-spacing: 1px;
}

#headerLinks .activeImageHeader {
position: relative;
}

#headerLinks a {
margin: 0px 10px;
}

#scidash-logo {
background-image: url('../images/scidash_mini_logo.png');
background-size: 100% 100%;
height: 56px;
width: 56px;
position: fixed;
top: 15px;
left: 60px;
}

#footer-scidash {
color: #304549;
font-weight: 500;
clear: both;
position: absolute;
bottom: 0px;
width: 100%;
z-index: 10;
height: 60px;
margin-top: -60px;
font-size: 0.75em;
}

#footerLinks {
border-bottom: 1px solid;
border-top: 1px solid;
padding: 4px;
text-align: center;
}

#footerLinks a {
color: #304549;
margin: 0px 10px;
}

#footerLinks a:hover {
color: #304549;
}

#footerDate {
margin-top: 8px;
text-align: center;
}

.login-container {
position: fixed !important;
top: 50%;
left: 50%;
transform: translate(-50%, -50%) !important;
width: 250px;
}

.password-reset-container {
position: fixed !important;
top: 50%;
left: 50%;
transform: translate(-50%, -50%) !important;
width: 250px;
}

.password-reset-container {
position: fixed !important;
top: 50%;
left: 50%;
transform: translate(-50%, -50%) !important;
width: 250px;
}

.registration-container {
position: fixed !important;
top: 50%;
left: 50%;
transform: translate(-50%, -50%) !important;
width: 250px;
}
Binary file added scidash/account/static/images/scidash_mini_logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions scidash/account/templates/registration/base-template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{% load static %}

<html>
<head>
<link href="{% static 'css/main.css' %}" rel="stylesheet">
</head>
<body>
<div id="header">
<div id="scidash-logo" />
</div>
{% block content %}
{% endblock %}
<!-- footer code -->
<div id="footer-scidash">
<div id="footerLinks">
<a href='/' target='_blank'>Home</a>
<a href='https://github.com/MetaCell/scidash-api/tree/development' target="_blank">SciDash API</a>
<a href='https://github.com/scidash/sciunit' target="_blank">SciUnit</a>
<a href='https://github.com/scidash/neuronunit' target="_blank">NeuronUnit</a>
<a href='https://neuroml-db.org/' target="_blank">NeuroML-DB</a>
</div>
<div id="footerDate">
&copy; 2017-2018 SciDash / Arizona State University<sup>®</sup>
</div>
</div>
</body>
<html>
18 changes: 7 additions & 11 deletions scidash/account/templates/registration/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
{% include 'material/includes/material_css.html' %}
{% include 'material/includes/material_js.html' %}

{% load material_form %}
{% include 'registration/base-template.html' %}

<style>
.login-container{
position: fixed !important;
top: 50%;
left: 50%;
transform: translate(-50%, -50%) !important;
width: 250px;
}
</style>
{% load material_form %}

<div class="login-container">
{% block content %}
<div class="login-container">
<h5>SCIDASH LOGIN</h5>
<a href="{% url 'sign-up' %}">Have no account? Then sign-up!</a>
<a href="{% url 'password-reset' %}">Forgot your password? Let's reset it</a>
Expand All @@ -27,3 +20,6 @@ <h5>SCIDASH LOGIN</h5>
</form>
<a href="{% url 'index' %}">Go home</a>
</div>
{% endblock %}


14 changes: 4 additions & 10 deletions scidash/account/templates/registration/password-reset-done.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
{% include 'material/includes/material_css.html' %}
{% include 'material/includes/material_js.html' %}
{% include 'registration/base-template.html' %}

<style>
.password-reset-container{
position: fixed !important;
top: 50%;
left: 50%;
transform: translate(-50%, -50%) !important;
width: 250px;
}
</style>

{% block content %}
<div class="password-reset-container">
<h5>PASSWORD RESET SENT</h5>
<p>We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly.

If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder.</p>
<a href="{% url 'index' %}">Go home</a>
</div>
{% endblock %}

13 changes: 3 additions & 10 deletions scidash/account/templates/registration/password-reset.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
{% include 'material/includes/material_css.html' %}
{% include 'material/includes/material_js.html' %}
{% include 'registration/base-template.html' %}

{% load material_form %}

<style>
.password-reset-container{
position: fixed !important;
top: 50%;
left: 50%;
transform: translate(-50%, -50%) !important;
width: 250px;
}
</style>

{% block content %}
<div class="password-reset-container">
<h5>SCIDASH RESET PASSWORD</h5>
<form method="POST">
Expand All @@ -22,4 +14,5 @@ <h5>SCIDASH RESET PASSWORD</h5>
</form>
<a href="{% url 'index' %}">Go home</a>
</div>
{% endblock %}

14 changes: 4 additions & 10 deletions scidash/account/templates/registration/signup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
{% include 'material/includes/material_css.html' %}
{% include 'material/includes/material_js.html' %}
{% include 'registration/base-template.html' %}

{% load material_form %}

<style>
.registration-container{
position: fixed !important;
top: 50%;
left: 50%;
transform: translate(-50%, -50%) !important;
width: 250px;
}
</style>

{% block content %}
<div class="registration-container">
<h5>SCIDASH SIGN UP</h5>
<a href="{% url 'login' %}">Already signed up? Then login!</a>
Expand All @@ -23,3 +15,5 @@ <h5>SCIDASH SIGN UP</h5>
</form>
<a href="{% url 'index' %}">Go home</a>
</div>
{% endblock %}