minor changes

zmunk · Dec 18, 2019 · 842f980 · 842f980
1 parent 4fbf375
commit 842f980
Show file tree

Hide file tree

Showing 12 changed files with 69 additions and 102 deletions.
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/planner/static/css/landing.css b/planner/static/css/landing.css
@@ -3,7 +3,7 @@
 :root {
     --main-bg-color: white; /* #77ab59;  #3AAFA9 */
     --main-fg-color: black; /* #36802d;  var(--main-fg-color); #2B7A78 */
-    --second-bg-color: #36802d; /* #f0f7da;  white */
+    --second-bg-color: #1c431e; /* #36802d; #f0f7da;  white */
     --second-fg-color: white;
     --emphasis-color: #234d20; /* #17252A */
     --button-color: #45b648;

diff --git a/planner/static/css/style.css b/planner/static/css/style.css
@@ -156,6 +156,9 @@ body {
     color: red;
 }
 
+.add-project-btn {
+}
+
 #add-project-form {
     margin-bottom: 0;
     padding: 0;

diff --git a/planner/templates/planner/base.html b/planner/templates/planner/base.html
@@ -75,11 +75,11 @@
 
             {% if user.is_authenticated %}
                 <ul class="navbar-nav ml-auto ">
-                    <li class="nav-item pt-1">
-                        <a class="nav-link ">
-                            <i class="fa fa-envelope"></i>
-                        </a>
-                    </li>
+{#                    <li class="nav-item pt-1">#}
+{#                        <a class="nav-link ">#}
+{#                            <i class="fa fa-envelope"></i>#}
+{#                        </a>#}
+{#                    </li>#}
                     <li class="nav-item avatar dropdown">
                         <a class="nav-link dropdown-toggle" id="navbarDropdownMenuLink-55" data-toggle="dropdown"
                            aria-haspopup="true" aria-expanded="false">

diff --git a/planner/templates/planner/projects_listed.html b/planner/templates/planner/projects_listed.html
@@ -64,7 +64,7 @@ <h4 class="project-list-header">You have no projects</h4>
         </div>
 
         <div class="container mt-3" style="height: 3rem;">
-            <button id="add-project-btn" type="button" class="btn btn-primary btn-style-one">Add Project</button>
+            <button id="add-project-btn" type="button" class="btn btn-primary btn-style-one add-project-btn">Add Project</button>
             <form id="add-project-form" method="post" action="#">
                 {% csrf_token %}
                 <div class="form-group row">

diff --git a/registration/static/css/registration.css b/registration/static/css/registration.css
@@ -1,21 +1,34 @@
-* {
-    color: #1c431e;
+:root {
+    --emphasis-color: #1c431e;
 }
 
-.btn {
+* {
+    color: var(--emphasis-color);
+}
 
+.main-btn {
     border: 1px solid #1c431e;
-    color: #1c431e;
+    color: var(--emphasis-color);
     background: none;
 }
 
-.btn:hover {
-
-    background-color: #1c431e;
+.main-btn:hover {
+    background-color: var(--emphasis-color);
     color: white;
     text-decoration: none;
 }
 
+.back-btn {
+    border: none;
+    color: gray;
+    background: none;
+    margin-right: 2rem;
+}
+
+.back-btn:hover {
+    color: black;
+}
+
 .alert-danger * {
     color: red;
 }
diff --git a/registration/templates/registration/base.html b/registration/templates/registration/base.html
@@ -27,23 +27,35 @@ <h3 class="text-center pt-5">
 
 
 <style>
-    * {
-    color: #1c431e;
-}
-
-.btn {
-
-    border: 1px solid #1c431e;
-    color: #1c431e;
-    background: none;
-}
-
-.btn:hover {
-
-    background-color: #1c431e;
-    color: white;
-    text-decoration: none;
-}
+{#* {#}
+{#    color: #1c431e;#}
+{#}#}
+{##}
+{#.main-btn {#}
+{#    border: 1px solid #1c431e;#}
+{#    color: #1c431e;#}
+{#    background: none;#}
+{#}#}
+{##}
+{#.main-btn:hover {#}
+{#    background-color: #1c431e;#}
+{#    color: white;#}
+{#    text-decoration: none;#}
+{#}#}
+{##}
+{#.back-btn {#}
+{#    border: none;#}
+{#    color: gray;#}
+{#    background: none;#}
+{#}#}
+{##}
+{#.back-btn:hover {#}
+{#    color: black;#}
+{#}#}
+{##}
+{#.alert-danger * {#}
+{#    color: red;#}
+{#}#}
 </style>
 </body>
 </html>
diff --git a/registration/templates/registration/password_reset.html b/registration/templates/registration/password_reset.html
@@ -45,7 +45,7 @@
                             <!-- Errors -->
 
                             <div class="form-group">
-                                <button class="btn signup-btn" type="submit">Recover password</button>
+                                <button class="btn main-btn" type="submit">Recover password</button>
                             </div>
                         </form>
                     </div>

diff --git a/registration/templates/registration/password_reset_complete.html b/registration/templates/registration/password_reset_complete.html
@@ -1,40 +1,8 @@
-{#{% extends "planner/base.html" %}#}
-{##}
-{##}
-{##}
-{##}
-{#{% block body %}#}
-{##}
-{#<div class = "container w-50 pt-lg-5">#}
-{#    <h5>Your password has been reset successfully!</h5><br>#}
-{#    <a class ="btn btn-primary" href="{% url 'planner:landing_page' %}">Back to Login</a>#}
-{#</div>#}
-{##}
-{#{% endblock %}#}
+{% extends "registration/base.html" %}
 
-{% load static %}
+{% block title %}Success{% endblock %}
 
-
-<!------ Include the above in your HEAD tag ---------->
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <title>Create an account</title>
-    <!-- Icons -->
-    <link rel="shortcut icon" href="{% static 'planner/images/favicon-32x32.png' %}">
-    <link rel="apple-touch-icon" href="{% static 'planner/images/apple-touch-icon.png' %}">
-
-    <link href="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-    <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
-</head>
-
-<body id="signup">
-<h3 class="text-center pt-5">
-    <img src="{% static "planner/images/planda.png" %}" style="height: 3rem">
-</h3>
+{% block body %}
 <div class="container">
     <div id="login-row" class="row justify-content-center align-items-center">
         <div id="login-column" class="col-md-6">
@@ -62,42 +30,12 @@ <h3 class="text-center pt-5">
                     <!-- Errors -->
 
                     <div class="form-group">
-                        <a class="btn signup-btn" href="{% url 'planner:landing_page' %}">Back to login</a>
+                        <a class="btn main-btn" href="{% url 'planner:landing_page' %}">Back to login</a>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
 
-<style>
-
-    * {
-        color: #1c431e;
-    }
-
-    .signup-btn {
-
-        border: 1px solid #1c431e;
-        color: #1c431e;
-        background: none;
-        /*background: red;*/
-        /*border-style: none;*/
-        /*background: var(--button-color);*/
-        /*outline: none;*/
-    }
-
-    .signup-btn:hover {
-
-        background-color: #1c431e;
-        color: white;
-        text-decoration: none;
-
-        /*color: #fff;*/
-        /*background-color: var(--main-fg-color);*/
-        /*text-decoration: none;*/
-    }
-</style>
-
-</body>
-</html>
+{% endblock %}
diff --git a/registration/templates/registration/password_reset_confirm.html b/registration/templates/registration/password_reset_confirm.html
@@ -99,7 +99,7 @@ <h3 class="text-center pt-5">
                     {% else %}
                         <legend class="border-top mb-4 ">The password reset link was invalid.</legend>
                         <p>Please request a new one.</p>
-                        <a class="btn signup-btn" href="{% url 'planner:landing_page' %}">Back to login</a>
+                        <a class="btn main-btn" href="{% url 'planner:landing_page' %}">Back to login</a>
                     {% endif %}
                 </div>
             </div>

diff --git a/registration/templates/registration/password_reset_done.html b/registration/templates/registration/password_reset_done.html
@@ -30,7 +30,7 @@
                         <!-- Errors -->
 
                         <div class="form-group">
-                            <a class="btn signup-btn" href="{% url 'planner:landing_page' %}">Back to login</a>
+                            <a class="btn main-btn" href="{% url 'planner:landing_page' %}">Back to login</a>
                         </div>
                     </div>
                 </div>

diff --git a/registration/templates/registration/register.html b/registration/templates/registration/register.html
@@ -44,7 +44,8 @@
                         <!-- Errors -->
 
                             <div class="form-group">
-                                <button class="btn signup-btn" type="submit">Sign Up</button>
+                                <a class="btn back-btn" href="{% url 'planner:landing_page' %}">Back to login</a>
+                                <button class="btn main-btn" type="submit">Sign Up</button>
                             </div>
                         </form>
                     </div>