diff --git a/reValuate/home/__pycache__/admin.cpython-36.pyc b/reValuate/home/__pycache__/admin.cpython-36.pyc index 92e78b5c..543ea201 100644 Binary files a/reValuate/home/__pycache__/admin.cpython-36.pyc and b/reValuate/home/__pycache__/admin.cpython-36.pyc differ diff --git a/reValuate/home/__pycache__/models.cpython-36.pyc b/reValuate/home/__pycache__/models.cpython-36.pyc index 5395fe7e..ce5b0d83 100644 Binary files a/reValuate/home/__pycache__/models.cpython-36.pyc and b/reValuate/home/__pycache__/models.cpython-36.pyc differ diff --git a/reValuate/home/__pycache__/views.cpython-36.pyc b/reValuate/home/__pycache__/views.cpython-36.pyc index 82c09c53..913d4d9c 100644 Binary files a/reValuate/home/__pycache__/views.cpython-36.pyc and b/reValuate/home/__pycache__/views.cpython-36.pyc differ diff --git a/reValuate/home/static/home/css/style.css b/reValuate/home/static/home/css/style.css index 9e00cb41..3d6a2240 100644 --- a/reValuate/home/static/home/css/style.css +++ b/reValuate/home/static/home/css/style.css @@ -5,6 +5,7 @@ --colour-white: #fff; --colour-black: #1a1a1a; } + @viewport { width: device-width ; zoom: 1.0 ; @@ -29,6 +30,9 @@ html { transform: translate(-50%, -50%); top: 50%; } +.dropdown-item{ + font-size:100% +} body{ font-size: 1.2em; font-family: 'Roboto', sans-serif; @@ -36,7 +40,10 @@ body{ } +.navview{ + width:100%; +} #active { background-color: #4CAF50; } diff --git a/reValuate/home/static/home/css/upload.css b/reValuate/home/static/home/css/upload.css index abb81aa3..efff0521 100644 --- a/reValuate/home/static/home/css/upload.css +++ b/reValuate/home/static/home/css/upload.css @@ -1,16 +1,16 @@ @import url('https://fonts.googleapis.com/css2?family=Roboto&display=swap'); .fancyButton { - border: 25% solid green; + border: auto solid green; background-color: transparent; - padding: 50% 25%; + padding: 38% 35%; text-align: center; - border-radius: 100%; + border-radius: 2%; transition-duration: 0.4s; - color: black; + color: rgb(0, 0, 0); outline: none; font-family: 'Roboto', sans-serif !important; - font-size: 10px; + font-size: 30px; box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19); } @@ -24,7 +24,7 @@ button:focus { } button { - margin: 25% 25% 25% 25%; - width: 45%; - height: 45%; + margin: auto; + width: auto; + height: auto; } \ No newline at end of file diff --git a/reValuate/templates/base.html b/reValuate/templates/base.html index 0fb95750..688bcc17 100644 --- a/reValuate/templates/base.html +++ b/reValuate/templates/base.html @@ -20,37 +20,36 @@ +
-
+
{% block content %} {% endblock %} -
-
diff --git a/reValuate/templates/uploadChoice.html b/reValuate/templates/uploadChoice.html index e18b1003..d5ea8c4b 100644 --- a/reValuate/templates/uploadChoice.html +++ b/reValuate/templates/uploadChoice.html @@ -7,7 +7,7 @@ {% block content %} {% if user.is_authenticated %} - Hi {{ user.username }}!
+

Hi {{ user.username }}!

diff --git a/reValuate/templates/uploadImage.html b/reValuate/templates/uploadImage.html index 44e97ee0..700a8e79 100644 --- a/reValuate/templates/uploadImage.html +++ b/reValuate/templates/uploadImage.html @@ -1,8 +1,9 @@ {% extends 'base.html' %} -{% block title %} Home {% endblock %} +{% block title %} Image Upload {% endblock %} {% block content %} +
{% if user.is_authenticated %} Hi {{ user.username }} {{ user.id }}!
@@ -19,4 +20,5 @@

You are not logged in

Log In {% endif %} +
{% endblock %} diff --git a/reValuate/templates/uploadVideo.html b/reValuate/templates/uploadVideo.html index f3aefc41..57b17a4f 100644 --- a/reValuate/templates/uploadVideo.html +++ b/reValuate/templates/uploadVideo.html @@ -1,8 +1,9 @@ {% extends 'base.html' %} -{% block title %} Home {% endblock %} +{% block title %} Upload Video {% endblock %} {% block content %} +
{% if user.is_authenticated %} Hi {{ user.username }}!
@@ -19,4 +20,5 @@

You are not logged in

Log In {% endif %} +
{% endblock %} diff --git a/reValuate/upload/__pycache__/__init__.cpython-36.pyc b/reValuate/upload/__pycache__/__init__.cpython-36.pyc index 3543a82d..92f5b5f8 100644 Binary files a/reValuate/upload/__pycache__/__init__.cpython-36.pyc and b/reValuate/upload/__pycache__/__init__.cpython-36.pyc differ diff --git a/reValuate/upload/__pycache__/admin.cpython-36.pyc b/reValuate/upload/__pycache__/admin.cpython-36.pyc index 55034b1a..f6ca3d1a 100644 Binary files a/reValuate/upload/__pycache__/admin.cpython-36.pyc and b/reValuate/upload/__pycache__/admin.cpython-36.pyc differ diff --git a/reValuate/upload/__pycache__/forms.cpython-36.pyc b/reValuate/upload/__pycache__/forms.cpython-36.pyc index 68eb5862..1ede93eb 100644 Binary files a/reValuate/upload/__pycache__/forms.cpython-36.pyc and b/reValuate/upload/__pycache__/forms.cpython-36.pyc differ diff --git a/reValuate/upload/__pycache__/models.cpython-36.pyc b/reValuate/upload/__pycache__/models.cpython-36.pyc index 1a3d75fd..a74a77ee 100644 Binary files a/reValuate/upload/__pycache__/models.cpython-36.pyc and b/reValuate/upload/__pycache__/models.cpython-36.pyc differ diff --git a/reValuate/upload/__pycache__/validators.cpython-36.pyc b/reValuate/upload/__pycache__/validators.cpython-36.pyc index fa5da47a..7a61ef8d 100644 Binary files a/reValuate/upload/__pycache__/validators.cpython-36.pyc and b/reValuate/upload/__pycache__/validators.cpython-36.pyc differ diff --git a/reValuate/upload/__pycache__/views.cpython-36.pyc b/reValuate/upload/__pycache__/views.cpython-36.pyc index d3ea2073..da565800 100644 Binary files a/reValuate/upload/__pycache__/views.cpython-36.pyc and b/reValuate/upload/__pycache__/views.cpython-36.pyc differ diff --git a/reValuate/users/__pycache__/admin.cpython-36.pyc b/reValuate/users/__pycache__/admin.cpython-36.pyc index 86787e06..dbba83c8 100644 Binary files a/reValuate/users/__pycache__/admin.cpython-36.pyc and b/reValuate/users/__pycache__/admin.cpython-36.pyc differ diff --git a/reValuate/users/__pycache__/models.cpython-36.pyc b/reValuate/users/__pycache__/models.cpython-36.pyc index d7bf4538..5dc38bd4 100644 Binary files a/reValuate/users/__pycache__/models.cpython-36.pyc and b/reValuate/users/__pycache__/models.cpython-36.pyc differ diff --git a/reValuate/users/__pycache__/urls.cpython-36.pyc b/reValuate/users/__pycache__/urls.cpython-36.pyc index 3cec742c..28c03dae 100644 Binary files a/reValuate/users/__pycache__/urls.cpython-36.pyc and b/reValuate/users/__pycache__/urls.cpython-36.pyc differ diff --git a/reValuate/users/__pycache__/views.cpython-36.pyc b/reValuate/users/__pycache__/views.cpython-36.pyc index c3505c96..cef755f8 100644 Binary files a/reValuate/users/__pycache__/views.cpython-36.pyc and b/reValuate/users/__pycache__/views.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0001_initial.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0001_initial.cpython-36.pyc index 14e5485a..5a4aacdd 100644 Binary files a/reValuate/users/migrations/__pycache__/0001_initial.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0001_initial.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-36.pyc index 37e81201..20455094 100644 Binary files a/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-36.pyc index c587c758..3d2f9fcb 100644 Binary files a/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-36.pyc index 8a5ce823..cd3f6ee2 100644 Binary files a/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/__init__.cpython-36.pyc b/reValuate/users/migrations/__pycache__/__init__.cpython-36.pyc index e2312c98..29f77ed5 100644 Binary files a/reValuate/users/migrations/__pycache__/__init__.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/__init__.cpython-36.pyc differ diff --git a/reValuate/website/__pycache__/settings.cpython-36.pyc b/reValuate/website/__pycache__/settings.cpython-36.pyc index 058b8cfe..57c946f7 100644 Binary files a/reValuate/website/__pycache__/settings.cpython-36.pyc and b/reValuate/website/__pycache__/settings.cpython-36.pyc differ diff --git a/reValuate/website/__pycache__/urls.cpython-36.pyc b/reValuate/website/__pycache__/urls.cpython-36.pyc index 304d845a..f049c1fd 100644 Binary files a/reValuate/website/__pycache__/urls.cpython-36.pyc and b/reValuate/website/__pycache__/urls.cpython-36.pyc differ diff --git a/reValuate/website/__pycache__/wsgi.cpython-36.pyc b/reValuate/website/__pycache__/wsgi.cpython-36.pyc index 3ba0f1e3..d175086e 100644 Binary files a/reValuate/website/__pycache__/wsgi.cpython-36.pyc and b/reValuate/website/__pycache__/wsgi.cpython-36.pyc differ