From da62e01677daba9b0a155945fd5cceba64c425c3 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 10 Jun 2023 23:13:14 -0400 Subject: [PATCH] fix footer font size --- catalog/common/models.py | 6 +++++- catalog/views.py | 4 ++-- common/static/scss/_footer.scss | 7 ++++--- common/templates/_footer.html | 1 + journal/models.py | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/catalog/common/models.py b/catalog/common/models.py index 2528a120..e2ff9c6f 100644 --- a/catalog/common/models.py +++ b/catalog/common/models.py @@ -310,7 +310,11 @@ class Item(SoftDeleteMixin, PolymorphicModel): @property def child_items(self): - return [] + return Item.objects.none() + + @property + def child_item_ids(self): + return list(self.child_items.values_list("id", flat=True)) def set_parent_item(self, value): raise ValueError("cannot set parent item") diff --git a/catalog/views.py b/catalog/views.py index a88335d4..c3b220bb 100644 --- a/catalog/views.py +++ b/catalog/views.py @@ -387,7 +387,7 @@ def comments(request, item_path, item_uuid): item = get_object_or_404(Item, uid=get_uuid_or_404(item_uuid)) if not item: raise Http404() - ids = [i.id for i in item.child_items] + [item.id] + ids = list(item.child_item_ids) + [item.id] queryset = Comment.objects.filter(item_id__in=ids).order_by("-created_time") queryset = queryset.filter(query_visible(request.user)) before_time = request.GET.get("last") @@ -408,7 +408,7 @@ def reviews(request, item_path, item_uuid): item = get_object_or_404(Item, uid=get_uuid_or_404(item_uuid)) if not item: raise Http404() - ids = [i.id for i in item.child_items] + [item.id] + ids = list(item.child_item_ids) + [item.id] queryset = Review.objects.filter(item_id__in=ids).order_by("-created_time") queryset = queryset.filter(query_visible(request.user)) before_time = request.GET.get("last") diff --git a/common/static/scss/_footer.scss b/common/static/scss/_footer.scss index 21ff4030..5d37deb7 100644 --- a/common/static/scss/_footer.scss +++ b/common/static/scss/_footer.scss @@ -1,10 +1,10 @@ body>footer { + font-size: 80%; text-align: center; margin-bottom: 4px; - width: 80%; + width: 60%; transform: translateX(-50%); position: absolute; - width: 60%; clear: both; left: 50%; @@ -14,9 +14,10 @@ body>footer { >div.grid { padding-top: 4px; + padding-left: 15%; + padding-right: 15%; @media (max-width: 768px) { - grid-row-gap: unset; grid-template-columns: 1fr 1fr 1fr; } diff --git a/common/templates/_footer.html b/common/templates/_footer.html index ce48839e..994b4f31 100644 --- a/common/templates/_footer.html +++ b/common/templates/_footer.html @@ -1,4 +1,5 @@