From 05e315f40133daea6aa69dd48c8003e634b93988 Mon Sep 17 00:00:00 2001 From: Mayank Date: Sun, 20 Dec 2020 18:07:55 +0530 Subject: [PATCH 1/2] Modified homepage --- iqps/static/assets/main.css | 15 ++++++++------- iqps/static/assets/navstyle.css | 6 +++++- iqps/templates/navbar.html | 1 + 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/iqps/static/assets/main.css b/iqps/static/assets/main.css index 29666d5..d1a2517 100644 --- a/iqps/static/assets/main.css +++ b/iqps/static/assets/main.css @@ -30,15 +30,16 @@ body{ } #filter-box{ - width: 80%; + width: 59%; margin: auto; display: flex; justify-content: space-evenly; - padding: 10px; + padding: 64px; /*column-gap: 3px;*/ overflow-x: auto; - color: rgb(98, 101, 134); + color: rgb(0, 0, 0); font-family: monospace; + font-size: 15px; } #filter-box .select2-container{ @@ -51,13 +52,13 @@ body{ list-style: none; } #searchbar{ - height: 40px; - width: 80%; + height: 30px; + width: 70%; margin: auto; - border-width: 5px; + border-width: 2px; border-style: solid; border-color: rgb(8, 5, 37); - font-size: 35px; + font-size: 22px; padding: 8px; overflow: hidden; outline: 0; diff --git a/iqps/static/assets/navstyle.css b/iqps/static/assets/navstyle.css index 18f903c..f90dd81 100644 --- a/iqps/static/assets/navstyle.css +++ b/iqps/static/assets/navstyle.css @@ -18,15 +18,18 @@ flex-direction: row-reverse; padding-right: 20px; list-style-type: none; + } .nav-item{ - display: block; + display: flow-root; padding: 5px 5px 5px 5px; color: white; text-decoration: none; transition: background-color 1s; margin-top: 0px; margin-bottom: 0px; + background-color: crimson; + margin: -3px 5px 2px 4px; } .nav-item:hover{ background-color: rgb(105, 97, 96); @@ -41,4 +44,5 @@ display: flex; justify-content: center; flex-direction: column; + background-color: crimson; } \ No newline at end of file diff --git a/iqps/templates/navbar.html b/iqps/templates/navbar.html index 2b4486a..0a139fd 100644 --- a/iqps/templates/navbar.html +++ b/iqps/templates/navbar.html @@ -10,6 +10,7 @@

MFQP

{% if login_req %} {% if not user.is_authenticated %}
  • Login
    • +
  • Register
    • {% else %}
  • Logout
  • Hello, {{ user.username }}
    • From 44c1b9174801836326d74c145c2f99ffb8ef1130 Mon Sep 17 00:00:00 2001 From: Mayank Date: Thu, 31 Dec 2020 00:26:12 +0530 Subject: [PATCH 2/2] modified register and login pages --- iqps/static/assets/formpage.css | 41 +++++++++++++++++++-------------- iqps/static/assets/main.css | 4 +--- iqps/templates/base.html | 2 +- iqps/templates/login.html | 4 ++-- iqps/templates/register.html | 4 ++-- 5 files changed, 30 insertions(+), 25 deletions(-) diff --git a/iqps/static/assets/formpage.css b/iqps/static/assets/formpage.css index f6e94e3..9de5b2e 100644 --- a/iqps/static/assets/formpage.css +++ b/iqps/static/assets/formpage.css @@ -21,24 +21,24 @@ html, body{ flex-direction: column; justify-content: center; - background-color: white; + background-color:#5eff9d; - border-color: black; - border-width: 2px; + border-color: #d9d8d8; + border-width: 0px; border-style: solid; - padding-left: 30px; - padding-right: 30px; - padding-top: 20px; - padding-bottom: 20px; + padding-left: 14px; + padding-right: 14px; + padding-top: 36px; + padding-bottom: 35px; } .submit-btn{ - margin-top: 5px; - margin-top: 5px; - background-color: rgb(16, 165, 224); - color: rgb(210, 224, 16); + margin-top: 20px; + margin-bottom: 17px; + background-color: #0062cc; + color: rgb(255, 255, 255); font-weight: bold; display: block; padding-top: 5px; @@ -46,16 +46,16 @@ html, body{ width: max-content; margin-left: auto; margin-right: auto; - border-width: 1px; - border-color: rgb(36, 7, 250); + border-width: 0px; + border-color: #0062cc; outline: 0; } label, small, .errorlist{ font-family: Monospace; - color: red; - padding-top: 5px; - padding-bottom: 5px; + color: black; + padding-top: 12px; + padding-bottom: 18px; list-style-type: none; } @@ -69,7 +69,7 @@ input{ border-width: 1px; border-style: solid; border-color: black; - padding-bottom: 5px; + padding-bottom: 12px; } .helptext{ @@ -81,3 +81,10 @@ input{ width: max-content; margin: auto; } + +.header { + text-align: center; + } +.stext { + text-align: center; +} \ No newline at end of file diff --git a/iqps/static/assets/main.css b/iqps/static/assets/main.css index d1a2517..f6cc25a 100644 --- a/iqps/static/assets/main.css +++ b/iqps/static/assets/main.css @@ -57,7 +57,7 @@ body{ margin: auto; border-width: 2px; border-style: solid; - border-color: rgb(8, 5, 37); + border-color: rgb(200, 200, 200); font-size: 22px; padding: 8px; overflow: hidden; @@ -109,5 +109,3 @@ body{ font-family: monospace; color: navy; } - - diff --git a/iqps/templates/base.html b/iqps/templates/base.html index 01269fc..fdf1b28 100644 --- a/iqps/templates/base.html +++ b/iqps/templates/base.html @@ -7,7 +7,7 @@ - {% block content %}{% endblock %} + {% block content %}{% endblock %} diff --git a/iqps/templates/login.html b/iqps/templates/login.html index 8d4ec8b..5bc839a 100644 --- a/iqps/templates/login.html +++ b/iqps/templates/login.html @@ -8,12 +8,12 @@ {% block content %} {% include 'navbar.html' %}
    -

    Login to iQPS

    +

    Login to iQPS

    {% csrf_token %} {{ form }} - Don't have an account? Register! + Don't have an account? Register!
    {% endblock %} diff --git a/iqps/templates/register.html b/iqps/templates/register.html index 4378f98..4d3b2cc 100644 --- a/iqps/templates/register.html +++ b/iqps/templates/register.html @@ -8,13 +8,13 @@ {% block content %} {% include 'navbar.html' %}
    -

    Register in iQPS

    +

    Register in iQPS

    {% csrf_token %} {{ form }} - Already have an account? Login + Already have an account? Login
    {% endblock %}