From bbea7758b2f8a4b4de0d7d020d0d87380add6009 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey Date: Sun, 9 Aug 2020 13:32:13 +0530 Subject: [PATCH 01/15] Add styling to static --- .../core/widgets/newest_listings.html | 14 +++++++------- .../core/templates/widgets/searchbar.html | 2 +- glossy-gorillas/static/style.css | 18 ++++++++++++++++++ 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/glossy-gorillas/core/templates/core/widgets/newest_listings.html b/glossy-gorillas/core/templates/core/widgets/newest_listings.html index 0fcb6bf83..4abeeda59 100644 --- a/glossy-gorillas/core/templates/core/widgets/newest_listings.html +++ b/glossy-gorillas/core/templates/core/widgets/newest_listings.html @@ -1,17 +1,17 @@

Newest Listings

- - - - + + + + {% for ls in listings %} {% with item=ls.item %} - - - + +
OwnerItemQuantityCost (per unit)OwnerItemQuantityCost (per unit)
{{ item.owner.user.get_username }}{{ item.product.name }} + {{ item.owner.user.get_username }}{{ item.product.name }} {{ item.quantity }} {% if item.quantity_type == "G" %} grams diff --git a/glossy-gorillas/core/templates/widgets/searchbar.html b/glossy-gorillas/core/templates/widgets/searchbar.html index 5d1d4db39..29b68c0a2 100644 --- a/glossy-gorillas/core/templates/widgets/searchbar.html +++ b/glossy-gorillas/core/templates/widgets/searchbar.html @@ -6,7 +6,7 @@ } -
+ Date: Sun, 9 Aug 2020 14:39:58 +0530 Subject: [PATCH 02/15] Add styling to dashboard --- .../core/templates/core/dashboard.html | 140 +++++++++++++++--- 1 file changed, 119 insertions(+), 21 deletions(-) diff --git a/glossy-gorillas/core/templates/core/dashboard.html b/glossy-gorillas/core/templates/core/dashboard.html index 699962686..02dd7e6cb 100644 --- a/glossy-gorillas/core/templates/core/dashboard.html +++ b/glossy-gorillas/core/templates/core/dashboard.html @@ -1,28 +1,126 @@ {% extends 'core/base.html' %} {% block content %} -{{ object.user }} +

{{ object.user }}


-{{ object.description }} +

{{ object.description }}

-

Inventory

-{% for record in inventory %} -
  • -{% if record.listing__id %} - {{ record }} -{% else %} - {{ record }} - List Item -{% endif %} -
    • -{% endfor %} +

    Inventory

    + + + + + + + + {% for product in inventory %} + + + + + + + {% endfor %} +
    + Product Name + + Quantity + + Type Of Quantity + + List +
    + {{ product.product__name }} + + {{ product.quantity }} + + {{ product.quantity_type }} + + {% if record.listing__id %} + Listed + {% else %} + List Item + {% endif %} +
    -

    Listing

    -{% for listing in listings %} -
  • {{ listing }}
    • -{% endfor %} +

    Listing

    + + + + + + + + + + + {% for listing in listings %} + + + + + + + + + + {% endfor %} +
    + Product Name + + Quantity + + Type Of Quantity + + Silver Per Unit + + Barter Product + + Barter Per Unit + + Offers Allowed +
    + {{ listing.item__product__name }} + + {{ listing.item__quantity }} + + {{ listing.item__quantity_type }} + + {{ listing.silver_per_unit }} + + {{ listing.barter_product }} + + {{ listing.barter_qty_per_unit }} + + {{ listing.allow_offers }} +
    + + +

    Review

    + + + + + + + {% for review in reviews %} + + + + + + {% endfor %} +
    + Trade + + Rating + + Description +
    + {{ review.trade }} + + {{ review.rating }} + + {{ review.description }} +
    -

    Reviews

    -{% for review in reviews %} -
  • {{ review }}
    • -{% endfor %} {% endblock %} \ No newline at end of file From e1e33a9d28a9a36049c65ca25afc6c3d0efd2d7e Mon Sep 17 00:00:00 2001 From: Gaurav Pandey Date: Sun, 9 Aug 2020 14:40:41 +0530 Subject: [PATCH 03/15] Add styling to home --- glossy-gorillas/core/templates/core/pages/home.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glossy-gorillas/core/templates/core/pages/home.html b/glossy-gorillas/core/templates/core/pages/home.html index 93b1518fe..c0e3a9e16 100644 --- a/glossy-gorillas/core/templates/core/pages/home.html +++ b/glossy-gorillas/core/templates/core/pages/home.html @@ -1,7 +1,9 @@ {% extends "core/base.html" %} {% block content %}
    -

    Home

    +
    +

    Home

    +

    The most popular product(s):

    From 88f9c9c229143037aaff3317419f9826aed7afc1 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey Date: Sun, 9 Aug 2020 14:42:59 +0530 Subject: [PATCH 04/15] Add styling to newest listing --- .../core/templates/core/widgets/newest_listings.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/glossy-gorillas/core/templates/core/widgets/newest_listings.html b/glossy-gorillas/core/templates/core/widgets/newest_listings.html index 4abeeda59..f092857c2 100644 --- a/glossy-gorillas/core/templates/core/widgets/newest_listings.html +++ b/glossy-gorillas/core/templates/core/widgets/newest_listings.html @@ -1,6 +1,6 @@ -

    Newest Listings

    +

    Newest Listings

    - + @@ -8,10 +8,10 @@

    Newest Listings

    {% for ls in listings %} {% with item=ls.item %} - - - - + + +
    Owner Item Quantity
    {{ item.owner.user.get_username }}{{ item.product.name }} +
    {{ item.owner.user.get_username }}{{ item.product.name }} {{ item.quantity }} {% if item.quantity_type == "G" %} grams From d2a049d1aefbd9c6bef1e1cd29a1bb5e8beb2f15 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey Date: Sun, 9 Aug 2020 14:44:00 +0530 Subject: [PATCH 05/15] Add styling to newest trade template --- .../templates/core/widgets/newest_trades.html | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/glossy-gorillas/core/templates/core/widgets/newest_trades.html b/glossy-gorillas/core/templates/core/widgets/newest_trades.html index a881e2d92..fc57d7c81 100644 --- a/glossy-gorillas/core/templates/core/widgets/newest_trades.html +++ b/glossy-gorillas/core/templates/core/widgets/newest_trades.html @@ -1,18 +1,18 @@ -

    Newest Trades

    +

    Newest Trades

    - - - - - + + + + + {% for t in trades %} {% with item=t.listing.item %} - - - - - + + + +
    FromToItemQuantity
    FromToItemQuantity
    {{ item.owner.user.get_username }}{{ t.buyer.user.get_username }}{{ item.product.name }} +
    {{ item.owner.user.get_username }}{{ t.buyer.user.get_username }}{{ item.product.name }} {{ item.quantity }} {% if item.quantity_type == "G" %} grams From 1548aaaa11d1f128eb4570769d2a8d52a4e983e2 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey Date: Sun, 9 Aug 2020 14:44:43 +0530 Subject: [PATCH 06/15] Add styling to header --- glossy-gorillas/core/templates/partials/header.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/glossy-gorillas/core/templates/partials/header.html b/glossy-gorillas/core/templates/partials/header.html index e2bfe29ce..30bc68e53 100644 --- a/glossy-gorillas/core/templates/partials/header.html +++ b/glossy-gorillas/core/templates/partials/header.html @@ -16,10 +16,11 @@
    {% if request.user.is_authenticated %} - -

    Hello {{request.user.first_name }}

    -     - Sign Out +

    Hello {{request.user.first_name }}

    + + {% csrf_token %} + + {% else %}

    Sign In or Register From ea970b79d7280d5f110cd87f4d5c05ec0766699d Mon Sep 17 00:00:00 2001 From: Gaurav Pandey Date: Sun, 9 Aug 2020 14:45:33 +0530 Subject: [PATCH 07/15] Add styling to searchbar --- glossy-gorillas/core/templates/widgets/searchbar.html | 1 + 1 file changed, 1 insertion(+) diff --git a/glossy-gorillas/core/templates/widgets/searchbar.html b/glossy-gorillas/core/templates/widgets/searchbar.html index 29b68c0a2..7fd65d93e 100644 --- a/glossy-gorillas/core/templates/widgets/searchbar.html +++ b/glossy-gorillas/core/templates/widgets/searchbar.html @@ -3,6 +3,7 @@ width: 95%; display: flex; margin: auto; + border: 1px sollid #101010; } From 65757b907fbf804e693a0898cd91ea70322745be Mon Sep 17 00:00:00 2001 From: Gaurav Pandey Date: Sun, 9 Aug 2020 14:46:08 +0530 Subject: [PATCH 08/15] Add styling to the classes --- glossy-gorillas/static/style.css | 57 +++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/glossy-gorillas/static/style.css b/glossy-gorillas/static/style.css index 00ad681ec..5f4db0519 100644 --- a/glossy-gorillas/static/style.css +++ b/glossy-gorillas/static/style.css @@ -10,16 +10,23 @@ h1, h2, h3, h4, h5, h6, p { font-family: Tangerine; } +.navbar{ + position: sticky; + top: 0; + opacity: 0.8; + background-color: #3d6647; +} + .body-content { - background-color: aqua; + background-color: #7acc8f; font-size: large; padding: 10px; width: 100%; - margin: auto; + border-radius: 10px; } .search{ padding: 2px; - margin-top: 5px; + margin-top: 6px; width: 250px; } @@ -28,6 +35,46 @@ h1, h2, h3, h4, h5, h6, p { font-weight: 600; } -mr-5{ - margin-right: 5px; +.mr-5{ + padding: 15px; +} + +.row{ + margin: 5px; +} +.item{ + font-size: larger; + font-weight: 400; +} + +.title{ + font-size: x-large; + margin-top: 20px; + margin-left: 20px; +} + +.navbar-item{ + color: #FEFAE0; +} + +.name{ + font-size: large; + margin-right: 10px; + font-weight: 800; +} + +a{ + text-emphasis: none; + text-decoration: none; + outline: none; +} + +a:hover{ + text-emphasis: none; + text-decoration: none; + outline: none; +} + +.navbar-end:hover{ + background-color: #3d6647; } \ No newline at end of file From 796848e3be9260f639f9f324fd78a2c3c1d4e35a Mon Sep 17 00:00:00 2001 From: Gaurav Pandey Date: Sun, 9 Aug 2020 15:27:22 +0530 Subject: [PATCH 09/15] Add crispy-forms to apps --- glossy-gorillas/glossy_gorillas/settings.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/glossy-gorillas/glossy_gorillas/settings.py b/glossy-gorillas/glossy_gorillas/settings.py index 1ae6f3d41..f1d0f3d12 100644 --- a/glossy-gorillas/glossy_gorillas/settings.py +++ b/glossy-gorillas/glossy_gorillas/settings.py @@ -38,6 +38,7 @@ "django.contrib.messages", "django.contrib.staticfiles", "django_simple_bulma", + "crispy_forms", "core", ] @@ -125,3 +126,6 @@ # Login urls LOGIN_REDIRECT_URL = "dashboard" LOGIN_URL = "login" + +# Crispy settings +CRISPY_TEMPLATE_PACK = "bootstrap4" From eaf5c00b67f26bf701b028e43f14a8c7fe6898a7 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey Date: Sun, 9 Aug 2020 15:31:51 +0530 Subject: [PATCH 10/15] Add crispy tags --- glossy-gorillas/core/templates/core/inventory_form.html | 3 ++- glossy-gorillas/core/templates/core/login.html | 3 ++- glossy-gorillas/core/templates/core/register.html | 3 ++- glossy-gorillas/core/templates/core/review_create_form.html | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/glossy-gorillas/core/templates/core/inventory_form.html b/glossy-gorillas/core/templates/core/inventory_form.html index a667a0474..ba382fbee 100644 --- a/glossy-gorillas/core/templates/core/inventory_form.html +++ b/glossy-gorillas/core/templates/core/inventory_form.html @@ -1,11 +1,12 @@ {% extends 'core/base.html' %} +{% load crispy_forms_tags %} {% block content %}

    {% csrf_token %}
    Product Inventory - {{ form }} + {{ form | crispy}}
    diff --git a/glossy-gorillas/core/templates/core/login.html b/glossy-gorillas/core/templates/core/login.html index 94adaba08..08620a8eb 100644 --- a/glossy-gorillas/core/templates/core/login.html +++ b/glossy-gorillas/core/templates/core/login.html @@ -1,8 +1,9 @@ {% extends "core/base.html" %} +{% load crispy_forms_tags %} {% block content%} {% csrf_token %} - {{ form.as_p }} + {{ form | crispy }} {% endblock %} \ No newline at end of file diff --git a/glossy-gorillas/core/templates/core/register.html b/glossy-gorillas/core/templates/core/register.html index 924a23eb5..faf18fc25 100644 --- a/glossy-gorillas/core/templates/core/register.html +++ b/glossy-gorillas/core/templates/core/register.html @@ -1,9 +1,10 @@ {% extends "core/base.html" %} +{% load crispy_forms_tags %} {% block content%}
    {% csrf_token %} - {{ form.as_p }} + {{ form | crispy }}
    diff --git a/glossy-gorillas/core/templates/core/review_create_form.html b/glossy-gorillas/core/templates/core/review_create_form.html index ed85d3352..371e06e7a 100644 --- a/glossy-gorillas/core/templates/core/review_create_form.html +++ b/glossy-gorillas/core/templates/core/review_create_form.html @@ -1,8 +1,9 @@ {% extends "core/base.html" %} +{% load crispy_forms_tags %} {% block content%}
    {% csrf_token %} - {{ form.as_p }} + {{ form | crispy }}
    {% endblock %} From 9a8b19f46bf297cdedf6e2790d902e2c60042c53 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey Date: Sun, 9 Aug 2020 15:32:20 +0530 Subject: [PATCH 11/15] Change classes --- glossy-gorillas/core/templates/core/base.html | 4 ++ .../core/templates/core/dashboard.html | 64 +++++++++---------- .../templates/core/pages/listing_list.html | 4 +- .../core/widgets/newest_listings.html | 18 +++--- .../templates/core/widgets/newest_trades.html | 20 +++--- glossy-gorillas/static/style.css | 6 +- 6 files changed, 60 insertions(+), 56 deletions(-) diff --git a/glossy-gorillas/core/templates/core/base.html b/glossy-gorillas/core/templates/core/base.html index f7dbec769..c6bcc96c1 100644 --- a/glossy-gorillas/core/templates/core/base.html +++ b/glossy-gorillas/core/templates/core/base.html @@ -10,6 +10,7 @@ {% bulma %} {% font_awesome %} + @@ -29,6 +30,9 @@
    + + + diff --git a/glossy-gorillas/core/templates/core/dashboard.html b/glossy-gorillas/core/templates/core/dashboard.html index 02dd7e6cb..f8544c49b 100644 --- a/glossy-gorillas/core/templates/core/dashboard.html +++ b/glossy-gorillas/core/templates/core/dashboard.html @@ -6,14 +6,14 @@

    {{ object.description }}

    Inventory

    - - + - - {% for product in inventory %} - - + - -
    +
    Product Name + Quantity + Type Of Quantity @@ -21,14 +21,14 @@

    Inventory
    +
    {{ product.product__name }} + {{ product.quantity }} + {{ product.quantity_type }} @@ -44,50 +44,50 @@

    Inventory

    Listing

    - - + - - - - - - {% for listing in listings %} - - + - - - - - - @@ -97,26 +97,26 @@

    Listing

    Review

    +
    Product Name + Quantity + Type Of Quantity + Silver Per Unit + Barter Product + Barter Per Unit + Offers Allowed
    +
    {{ listing.item__product__name }} + {{ listing.item__quantity }} + {{ listing.item__quantity_type }} + {{ listing.silver_per_unit }} + {{ listing.barter_product }} + {{ listing.barter_qty_per_unit }} + {{ listing.allow_offers }}
    - - + - - {% for review in reviews %} - - + - - diff --git a/glossy-gorillas/core/templates/core/pages/listing_list.html b/glossy-gorillas/core/templates/core/pages/listing_list.html index e8d32e8fe..cd45fd6c0 100644 --- a/glossy-gorillas/core/templates/core/pages/listing_list.html +++ b/glossy-gorillas/core/templates/core/pages/listing_list.html @@ -2,7 +2,7 @@ {% block content %}
      {% for listing in page_obj %} -
    • {{ listing }}
      • +
    • {{ listing }}
      • {% endfor %}
    +
    Trade + Rating + Description
    +
    {{ review.trade }} + {{ review.rating }} + {{ review.description }}
    - - - - - + + + + + {% for ls in listings %} {% with item=ls.item %} - - - - + + +
    OwnerItemQuantityCost (per unit)
    OwnerItemQuantityCost (per unit)
    {{ item.owner.user.get_username }}{{ item.product.name }} +
    {{ item.owner.user.get_username }}{{ item.product.name }} {{ item.quantity }} {% if item.quantity_type == "G" %} grams diff --git a/glossy-gorillas/core/templates/core/widgets/newest_trades.html b/glossy-gorillas/core/templates/core/widgets/newest_trades.html index fc57d7c81..ef7881ddc 100644 --- a/glossy-gorillas/core/templates/core/widgets/newest_trades.html +++ b/glossy-gorillas/core/templates/core/widgets/newest_trades.html @@ -1,18 +1,18 @@

    Newest Trades

    - - - - - + + + + + {% for t in trades %} {% with item=t.listing.item %} - - - - - + + + +
    FromToItemQuantity
    FromToItemQuantity
    {{ item.owner.user.get_username }}{{ t.buyer.user.get_username }}{{ item.product.name }} +
    {{ item.owner.user.get_username }}{{ t.buyer.user.get_username }}{{ item.product.name }} {{ item.quantity }} {% if item.quantity_type == "G" %} grams diff --git a/glossy-gorillas/static/style.css b/glossy-gorillas/static/style.css index 5f4db0519..c1bf7cf7a 100644 --- a/glossy-gorillas/static/style.css +++ b/glossy-gorillas/static/style.css @@ -10,7 +10,7 @@ h1, h2, h3, h4, h5, h6, p { font-family: Tangerine; } -.navbar{ +.sticky{ position: sticky; top: 0; opacity: 0.8; @@ -35,11 +35,11 @@ h1, h2, h3, h4, h5, h6, p { font-weight: 600; } -.mr-5{ +.m{ padding: 15px; } -.row{ +.rows{ margin: 5px; } .item{ From 94a9f96fa455bc4bba1322390e11db41c4b9a8fe Mon Sep 17 00:00:00 2001 From: Gaurav Pandey Date: Sun, 9 Aug 2020 15:45:23 +0530 Subject: [PATCH 12/15] Add django-crispy-forms to poetry --- glossy-gorillas/poetry.lock | 14 +++++++++++++- glossy-gorillas/pyproject.toml | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/glossy-gorillas/poetry.lock b/glossy-gorillas/poetry.lock index ba17dfcce..99530cb91 100644 --- a/glossy-gorillas/poetry.lock +++ b/glossy-gorillas/poetry.lock @@ -94,6 +94,14 @@ sqlparse = ">=0.2.2" argon2 = ["argon2-cffi (>=16.1.0)"] bcrypt = ["bcrypt"] +[[package]] +category = "main" +description = "Best way to have Django DRY forms" +name = "django-crispy-forms" +optional = false +python-versions = ">=3.5" +version = "1.9.2" + [[package]] category = "main" description = "Django application to add the Bulma CSS framework and its extensions" @@ -370,7 +378,7 @@ python-versions = "*" version = "0.2.5" [metadata] -content-hash = "847a1aed72cd28149eb4dec1e3d93a22afc51bbe8b2342eb4efda14bb5bdbfe6" +content-hash = "003af7cff131492f2297021ec30d23d481a448b4bef32b0aa6f2bc3349386377" lock-version = "1.0" python-versions = "^3.8" @@ -407,6 +415,10 @@ django = [ {file = "Django-3.0.8-py3-none-any.whl", hash = "sha256:5457fc953ec560c5521b41fad9e6734a4668b7ba205832191bbdff40ec61073c"}, {file = "Django-3.0.8.tar.gz", hash = "sha256:31a5fbbea5fc71c99e288ec0b2f00302a0a92c44b13ede80b73a6a4d6d205582"}, ] +django-crispy-forms = [ + {file = "django-crispy-forms-1.9.2.tar.gz", hash = "sha256:f2f1e0fbb458851636447cfb6be1a611b40c8ac9e41a74ba923011378670b43b"}, + {file = "django_crispy_forms-1.9.2-py3-none-any.whl", hash = "sha256:888bb316db89b60050a42ec35080facb361d823eec38010ccb0702f45642d3b8"}, +] django-simple-bulma = [ {file = "django-simple-bulma-1.3.2.tar.gz", hash = "sha256:e5cff3fc5f0d45558362ab8d0e11f92887c4fc85616f77daa6174940f94b12c7"}, {file = "django_simple_bulma-1.3.2-py3-none-any.whl", hash = "sha256:79928fa983151947c635acf65fa5177ca775db98c8d53ddf1c785fe48c727466"}, diff --git a/glossy-gorillas/pyproject.toml b/glossy-gorillas/pyproject.toml index 0299e3d0e..d4441e309 100644 --- a/glossy-gorillas/pyproject.toml +++ b/glossy-gorillas/pyproject.toml @@ -10,6 +10,7 @@ django = "^3.0.8" factory-boy = "^2.12.0" asgiref = "^3.2.10" django-simple-bulma = "^1.3.2" +django-crispy-forms = "^1.9.2" [tool.poetry.dev-dependencies] pytest = "^5.2" From 34b7bb5b55b0011fe0bf9abf3805fb640bc69066 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey Date: Sun, 9 Aug 2020 15:52:04 +0530 Subject: [PATCH 13/15] Modify base.html --- glossy-gorillas/core/templates/core/base.html | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/glossy-gorillas/core/templates/core/base.html b/glossy-gorillas/core/templates/core/base.html index c6bcc96c1..1d85c7b29 100644 --- a/glossy-gorillas/core/templates/core/base.html +++ b/glossy-gorillas/core/templates/core/base.html @@ -10,7 +10,8 @@ {% bulma %} {% font_awesome %} - + @@ -30,9 +31,15 @@ - - - + + + - + \ No newline at end of file From a0eac030721fdc3fbc1caaeebb07fe34599f1943 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey Date: Sun, 9 Aug 2020 16:00:37 +0530 Subject: [PATCH 14/15] modify style.css --- glossy-gorillas/static/style.css | 106 ++++++++++++++++--------------- 1 file changed, 56 insertions(+), 50 deletions(-) diff --git a/glossy-gorillas/static/style.css b/glossy-gorillas/static/style.css index c1bf7cf7a..d1b034d1e 100644 --- a/glossy-gorillas/static/style.css +++ b/glossy-gorillas/static/style.css @@ -1,80 +1,86 @@ /* Core CSS */ @font-face { - font-family: 'Tangerine'; - src: local('Tangerine'), - url('../static/Tangerine-Regular.ttf') format("truetype"); + font-family: "Tangerine"; + src: local("Tangerine"), + url("../static/Tangerine-Regular.ttf") format("truetype"); } -h1, h2, h3, h4, h5, h6, p { - font-family: Tangerine; +h1, +h2, +h3, +h4, +h5, +h6, +p { + font-family: Tangerine; } -.sticky{ - position: sticky; - top: 0; - opacity: 0.8; - background-color: #3d6647; +.sticky { + position: sticky; + top: 0; + opacity: 0.8; + background-color: #3d6647; } .body-content { - background-color: #7acc8f; - font-size: large; - padding: 10px; - width: 100%; - border-radius: 10px; + background-color: #7acc8f; + font-size: large; + padding: 10px; + width: 100%; + border-radius: 10px; } -.search{ - padding: 2px; - margin-top: 6px; - width: 250px; +.search { + padding: 2px; + margin-top: 6px; + width: 250px; } -.head{ - font-size: larger; - font-weight: 600; +.head { + font-size: larger; + font-weight: 600; } -.m{ - padding: 15px; +.m { + padding: 15px; } -.rows{ - margin: 5px; +.rows { + margin: 5px; } -.item{ - font-size: larger; - font-weight: 400; +.item { + font-size: larger; + font-weight: 400; } -.title{ - font-size: x-large; - margin-top: 20px; - margin-left: 20px; +.title { + font-size: x-large; + margin-top: 20px; + margin-left: 20px; } -.navbar-item{ - color: #FEFAE0; +.navbar-item { + color: #fefae0; } -.name{ - font-size: large; - margin-right: 10px; - font-weight: 800; +.name { + font-size: large; + margin-right: 10px; + font-weight: 800; } -a{ - text-emphasis: none; - text-decoration: none; - outline: none; +a { + text-emphasis: none; + text-decoration: none; + outline: none; } -a:hover{ - text-emphasis: none; - text-decoration: none; - outline: none; +a:hover { + text-emphasis: none; + text-decoration: none; + outline: none; } -.navbar-end:hover{ - background-color: #3d6647; -} \ No newline at end of file +.navbar-end:hover { + background-color: #3d6647; +} From a29b344968279823b84861b31d76eb59f61dc90a Mon Sep 17 00:00:00 2001 From: fliepeltje Date: Sun, 9 Aug 2020 19:44:28 +0200 Subject: [PATCH 15/15] Fix template urls --- glossy-gorillas/core/templates/partials/header.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glossy-gorillas/core/templates/partials/header.html b/glossy-gorillas/core/templates/partials/header.html index 30bc68e53..773e040cf 100644 --- a/glossy-gorillas/core/templates/partials/header.html +++ b/glossy-gorillas/core/templates/partials/header.html @@ -1,8 +1,8 @@ {% load static %}