diff --git a/src/project/static/css/style.css b/src/project/static/css/style.css
index 6ea0811..cbb3da8 100644
--- a/src/project/static/css/style.css
+++ b/src/project/static/css/style.css
@@ -1,4 +1,4 @@
-/* Start reset */
+/* Reset */
*, *::before, *::after {
box-sizing: border-box;
}
@@ -23,16 +23,17 @@ p, h1, h2, h3, h4, h5, h6 {
}
/* Variables */
-
:root {
/* Colors */
--light : #fff;
--light-dust : #fcfcfc;
--dust : #f1f1f1;
--dark-dust : #bfbfbf;
- --twilight : #404040;
+ --fade : #878787;
+ --twilight : #3c3c3c;
--dark : #2a2a2a;
--custard : #f0dcac;
+ --water : #a8f3f4;
--splash : #4b3aba;
/* Sizes */
@@ -49,11 +50,26 @@ p, h1, h2, h3, h4, h5, h6 {
}
}
+html, body {
+ height : 100%;
+}
+
+h1, h2, h3, h4, h5, h6 {
+ font-weight : 600;
+ color : var(--twilight);
+}
+
+a {
+ font-weight : 500;
+}
+
body {
margin : 0;
padding : 0;
background : var(--custard);
- font-family : sans-serif;
+ font-family : Inter;
+ font-weight : 400;
+ line-height : 1.6;
color : var(--dark);
}
@@ -116,7 +132,8 @@ aside > div > dl > dt {
clear : left;
margin : 0 var(--double-space) 0 0;
width : 180px;
- font-weight : bold;
+ font-weight : 600;
+ color : var(--twilight);
}
nav {
@@ -146,6 +163,8 @@ nav > ol > li > a {
text-decoration : none;
color : var(--dark);
cursor : pointer;
+ font-weight : 500;
+ letter-spacing : 0.04em;
}
nav > ol > li:first-child > a {
@@ -172,7 +191,7 @@ article > div {
margin-bottom : var(--double-space);
}
-div.view-list > h2 {
+div.content-view > h2 {
margin : 0 0 var(--double-space) 0;
}
@@ -183,7 +202,8 @@ div.services {
flex-wrap: wrap;
}
-div.services > div {
+div.services > div,
+div.infobox {
background : var(--light);
padding : var(--double-space);
border-radius : 6px;
@@ -205,21 +225,29 @@ div.services > div > div.description {
margin-bottom : var(--double-space);
}
+div.services > div > div.description > p {
+ margin-top : var(--half-space);
+}
+
div.services > div > a,
+a.button,
button {
+ display : block;
color : var(--light);
background : var(--splash);
- padding : 6px 12px;
+ padding : var(--space) var(--double-space);
border-radius : 3px;
opacity : 0.9;
cursor : pointer;
text-align : center;
border : 0;
- font-weight : bold;
+ font-weight : 600;
+ letter-spacing : 0.03em;
+ text-decoration : none;
}
-
div.services > div > a:hover,
+a.button:hover,
button:hover {
opacity : 1.0;
}
@@ -233,7 +261,8 @@ form > div >label {
margin : 0 0 6px;
}
-form > div > input[type="text"] {
+form > div > input[type="text"],
+form > div > input[type="password"] {
border : 1px solid var(--twilight);
border-radius : 3px;
padding : 6px 12px;
@@ -241,6 +270,68 @@ form > div > input[type="text"] {
width : 100%;
}
+#login {
+ height : 100%;
+ display : flex;
+ align-items : center;
+ justify-content : center;
+}
+
+#loginbox {
+ border-radius : var(--space);
+ background : var(--dust);
+ border : 6px solid white;
+ width : 800px;
+ height : 500px;
+
+ display : flex;
+ flex-flow : row;
+ //justify-content : space-between;
+}
+
+#loginbox > div {
+ padding : var(--double-space);
+ flex : 1;
+}
+
+#loginbox label {
+ color : var(--twilight);
+}
+
+#loginbox > div.login {
+ display: flex;
+ flex-flow: column;
+ justify-content: space-between;
+}
+
+#loginbox > div.signup {
+ border-radius : 0 var(--space) var(--space) 0;
+ background : var(--water);
+ display: flex;
+ flex-flow: column;
+ align-items: center;
+}
+
+#loginbox > div:last-child > * {
+ flex : 1;
+}
+
+#loginbox div.new_here {
+ margin-top : var(--double-space);
+}
+
+#loginbox div.new_here h2 {
+ margin: var(--double-space) 0;
+}
+
+#loginbox button {
+ width : 100%;
+}
+
+#loginbox img {
+ padding : 0 var(--double-space);
+}
+
footer {
position : fixed;
bottom : 0;
@@ -254,5 +345,5 @@ footer {
}
span.time_remaining {
- opacity : 0.6;
+ color : var(--fade);
}
diff --git a/src/project/templates/account/login.html b/src/project/templates/account/login.html
index afa7422..cfcac05 100644
--- a/src/project/templates/account/login.html
+++ b/src/project/templates/account/login.html
@@ -4,55 +4,61 @@
{% block non_login_content %}
- {% if form.non_field_errors %}
- {% for error in form.non_field_errors %}
-
- {{ error }}
+
+
+ {% if form.non_field_errors %}
+ {% for error in form.non_field_errors %}
+
+ {{ error }}
+
+ {% endfor %}
+ {% endif %}
+
Log in
+
+
+
- {% endfor %}
- {% endif %}
-
-
-
- {% trans "Forgot password?" %}
-
-
-
- {% trans "Or"|upper %}
+
+
+
+
+
-
- {% trans "Become a member" %}
-
-
{% endblock %}
diff --git a/src/project/templates/account/logout.html b/src/project/templates/account/logout.html
index 2549a90..a936337 100644
--- a/src/project/templates/account/logout.html
+++ b/src/project/templates/account/logout.html
@@ -5,17 +5,18 @@
{% block head_title %}{% trans "Sign Out" %}{% endblock %}
{% block content %}
-
{% trans "Sign Out" %}
+
+
{% trans "Sign Out" %}
{% trans 'Are you sure you want to sign out?' %}
-
+
{% endblock %}
diff --git a/src/project/templates/account/pre_login_base.html b/src/project/templates/account/pre_login_base.html
index 79cb228..114386b 100644
--- a/src/project/templates/account/pre_login_base.html
+++ b/src/project/templates/account/pre_login_base.html
@@ -7,76 +7,13 @@
Login – {{ site.name }}
-
-
-
-
-
-
-
+
+
-
-
-
-
-
- {% block non_login_content %}
- {% endblock %}
-
-
-
+
+
+ {% block non_login_content %}
+ {% endblock %}
+
diff --git a/src/project/templates/base.html b/src/project/templates/base.html
index 0e78a21..7decd50 100644
--- a/src/project/templates/base.html
+++ b/src/project/templates/base.html
@@ -8,12 +8,13 @@
{% block head_title %}{% endblock %} – {{ site.name }}
+