diff --git a/store/forms.py b/store/forms.py
index 53b1a578d8eaa5bf34421b8594987707b3016573..a2f835d935733d997a8e30e3aface496171a8487 100644
--- a/store/forms.py
+++ b/store/forms.py
@@ -6,8 +6,8 @@ from wtforms.validators import DataRequired # Basic example.#
class RegistrationForm(FlaskForm):
username = StringField("Username", [validators.Length(min=4, max=25)])
email = StringField("Email Address", [validators.Length(min=6, max=320)])
- securityQ1 = StringField("securityQ1", [validators.Length(min=6, max=35)])
- phone_number = StringField("phone_number", [validators.Length(min=6, max=35)])
+ securityQ1 = StringField("Enter your Favourite Colour", [validators.Length(min=6, max=35)])
+ phone_number = StringField("Phone Number", [validators.Length(min=6, max=35)])
password = PasswordField(
"New Password",
[
diff --git a/store/static/_main.css b/store/static/_main.css
index d57452a8d756bc26efb996f83d7f8b1902c3300c..40a9a35d3a36b7a4f537d1ff06c86835ef9c418e 100644
--- a/store/static/_main.css
+++ b/store/static/_main.css
@@ -59,6 +59,8 @@ footer, header, hgroup, menu, nav, section {
body {
line-height: 1;
+ background-color: black;
+ color: white;
}
ol, ul {
list-style: none;
@@ -79,14 +81,34 @@ table {
/* End of resetting */
+.title {
+ margin-top: 20px;
+ margin-bottom: auto;
+}
-footer {
- background-color: black;
+h1{
color: white;
- position: fixed;
- bottom:0;
- left:0;
- width:100%;
+ font-size: 20px;
+}
+
+a:link {
+ text-decoration: none;
+ color: white;
+}
+
+a:visited {
+ text-decoration: none;
+ color: white;
+}
+
+a:hover {
+ text-decoration: none;
+ color: white;
+}
+
+a:active {
+ text-decoration: none;
+ color: black;
}
div{
@@ -97,28 +119,43 @@ div{
.navbar li a {
color:white;
+ background-color: darkred;
+ display: block;
+ text-align: center;
+ text-decoration: none;
+ padding: 14px 16px;
+}
+
+.search input{
+ float: right;
+ padding: 6px;
+ margin-top: 8px;
+ margin-right: 8px;
+ font-size: 14px;
+ border: none;
+}
+
+.search button {
+ color:white;
+ background-color: darkred;
display: block;
text-align: center;
text-decoration: none;
padding: 14px 16px;
+ float: right;
+ border:none;
+}
+
+.search button:hover {
+ background-color: black;
}
.navbar ul {
list-style-type: none;
+ background-color: darkred;
margin: 0;
padding: 0;
overflow: hidden;
- background-color: black;
-}
-
-
-input[type=text] {
- float: left;
- padding: 6px;
- border: none;
- margin-top: 8px;
- margin-right: 16px;
- font-size: 17px;
}
.navbar li {
@@ -126,8 +163,8 @@ input[type=text] {
}
.navbar li a:hover {
- background-color: white;
- color:black;
+ background-color: black;
+ color:white;
}
*{
@@ -135,35 +172,13 @@ input[type=text] {
font-family: sans-serif;
}
-h1{
- color: black;
- font-size: 30px;
-}
-a:link {
- text-decoration: none;
- color: black;
-}
-
-a:visited {
- text-decoration: none;
- color: black;
-}
-
-a:hover {
- text-decoration: none;
- color: black;
-}
-
-a:active {
- text-decoration: none;
- color: black;
-}
.header{
font-size: 50px;
text-decoration: none;
- color: black;
+ color: white;
+ background-color: black;
}
.error{
@@ -181,5 +196,11 @@ li {
margin-right: auto;
}
-
-
+footer {
+ background-color: darkred;
+ color: white;
+ position: fixed;
+ bottom:0;
+ left:0;
+ width:100%;
+}
diff --git a/store/templates/base.html b/store/templates/base.html
index bc141d101ec83239688aeabc90354e4eff00947d..e91b02e822abc86e5e0841fe898ad17850c0bf9b 100644
--- a/store/templates/base.html
+++ b/store/templates/base.html
@@ -4,7 +4,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>{% block title %}{% endblock%}</title>
- <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='main.css') }}"> <!-- Load the CSS. -->
+ <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='_main.css') }}"> <!-- Load the CSS. -->
</head>
<body>
@@ -27,12 +27,10 @@
<li><a href="{{ url_for('register')}}">Register</a></li>
{% endif %}
- <li class="search">
- <form>
- <button type="submit"><i class="fa fa-search"></i></button>
- <input type="text" placeholder="Search...">
- </form>
- </li>
+ <form class="search">
+ <button type="submit">Search</button>
+ <input type="text" placeholder="Search...">
+ </form>
</ul>
</nav>
diff --git a/store/templates/userContent/login.html b/store/templates/userContent/login.html
index 77241a82029f45277a52d073336676476f48c132..de81a881c1db6910522e34a3e759fb14b301564c 100644
--- a/store/templates/userContent/login.html
+++ b/store/templates/userContent/login.html
@@ -3,7 +3,6 @@
{% block content %}
<form method="POST" action="{{ url_for('login') }}" style="float: center; text-align: center;">
<div class="container">
- <h1>Login</h1>
<table class="loginTable">
<tr>
<td><label for="username">Username</label></td>
diff --git a/store/templates/userContent/register.html b/store/templates/userContent/register.html
index 0a88fb90fb701e7dd74dd82ce6d110dd210ee692..4276512b3b3ffbff233ec96521fd0d84ffa404d8 100644
--- a/store/templates/userContent/register.html
+++ b/store/templates/userContent/register.html
@@ -9,9 +9,6 @@
<tr>
<td>{{ render_field(form.username) }} </td>
</tr>
- <tr>
- <td>{{ render_field(form.password) }}</td>
- </tr>
<tr>
<td>{{ render_field(form.email) }} </td>
</tr>
@@ -21,6 +18,9 @@
<tr>
<td> {{ render_field(form.securityQ1) }}</td>
</tr>
+ <tr>
+ <td>{{ render_field(form.password) }}</td>
+ </tr>
<tr>
<td>{{ render_field(form.confirm) }}</td>
</tr>