From ac9b3c8ede22017f1086df3105294f71f1f730d1 Mon Sep 17 00:00:00 2001 From: bkfox Date: Tue, 16 Jan 2024 15:37:04 +0100 Subject: [PATCH] rendering styles --- aircox/models/page.py | 7 +++++-- aircox/static/aircox/css/admin.css | 12 ++++++------ aircox/static/aircox/css/public.css | 15 ++++++++------- assets/src/assets/components.scss | 12 ++++++------ assets/src/assets/public.scss | 3 ++- 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/aircox/models/page.py b/aircox/models/page.py index 3cb4e15..b4b76e5 100644 --- a/aircox/models/page.py +++ b/aircox/models/page.py @@ -134,8 +134,11 @@ class BasePage(Renderable, models.Model): if count: self.slug += "-" + str(count) - if self.parent and not self.cover: - self.cover = self.parent.cover + if self.parent: + if self.parent == self: + self.parent = None + if not self.cover: + self.cover = self.parent.cover super().save(*args, **kwargs) def get_absolute_url(self): diff --git a/aircox/static/aircox/css/admin.css b/aircox/static/aircox/css/admin.css index 7b7fcd9..9ce64dc 100644 --- a/aircox/static/aircox/css/admin.css +++ b/aircox/static/aircox/css/admin.css @@ -2,12 +2,12 @@ !*** css ./node_modules/css-loader/dist/cjs.js??clonedRuleSet-24.use[1]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-24.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-24.use[3]!./src/assets/admin.scss ***! \*************************************************************************************************************************************************************************************************************************************/ :root { - --title-1-sz: 2rem; - --title-2-sz: 1.6rem; - --title-3-sz: 1.4rem; - --subtitle-1-sz: 1.8rem; - --subtitle-2-sz: 1.6rem; - --subtitle-3-sz: 1.4rem; + --title-1-sz: 1.6rem; + --title-2-sz: 1.4rem; + --title-3-sz: 1.2rem; + --subtitle-1-sz: 1.6rem; + --subtitle-2-sz: 1.4rem; + --subtitle-3-sz: 1.2rem; --heading-title-bg-color: rgba(255, 255, 0, 1); --heading-bg-color: var(--highlight-color); --heading-bg-highlight-color: var(--highlight-color-2); diff --git a/aircox/static/aircox/css/public.css b/aircox/static/aircox/css/public.css index 610c4af..e47947d 100644 --- a/aircox/static/aircox/css/public.css +++ b/aircox/static/aircox/css/public.css @@ -2,12 +2,12 @@ !*** css ./node_modules/css-loader/dist/cjs.js??clonedRuleSet-24.use[1]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-24.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-24.use[3]!./src/assets/public.scss ***! \**************************************************************************************************************************************************************************************************************************************/ :root { - --title-1-sz: 2rem; - --title-2-sz: 1.6rem; - --title-3-sz: 1.4rem; - --subtitle-1-sz: 1.8rem; - --subtitle-2-sz: 1.6rem; - --subtitle-3-sz: 1.4rem; + --title-1-sz: 1.6rem; + --title-2-sz: 1.4rem; + --title-3-sz: 1.2rem; + --subtitle-1-sz: 1.6rem; + --subtitle-2-sz: 1.4rem; + --subtitle-3-sz: 1.2rem; --heading-title-bg-color: rgba(255, 255, 0, 1); --heading-bg-color: var(--highlight-color); --heading-bg-highlight-color: var(--highlight-color-2); @@ -7518,7 +7518,8 @@ a.tag:hover { .breadcrumbs { text-align: right; padding: 0.6rem 0rem; - margin-bottom: 0.4rem; + padding-bottom: 0; + margin-bottom: 0; } .breadcrumbs:empty { display: none; diff --git a/assets/src/assets/components.scss b/assets/src/assets/components.scss index 14fe0db..e4b8d52 100644 --- a/assets/src/assets/components.scss +++ b/assets/src/assets/components.scss @@ -1,12 +1,12 @@ @use "vars" as v; :root { - --title-1-sz: 2rem; - --title-2-sz: 1.6rem; - --title-3-sz: 1.4rem; - --subtitle-1-sz: 1.8rem; - --subtitle-2-sz: 1.6rem; - --subtitle-3-sz: 1.4rem; + --title-1-sz: 1.6rem; + --title-2-sz: 1.4rem; + --title-3-sz: 1.2rem; + --subtitle-1-sz: 1.6rem; + --subtitle-2-sz: 1.4rem; + --subtitle-3-sz: 1.2rem; --heading-title-bg-color: rgba(255, 255, 0, 1); --heading-bg-color: var(--highlight-color); diff --git a/assets/src/assets/public.scss b/assets/src/assets/public.scss index d162a4f..56d7800 100644 --- a/assets/src/assets/public.scss +++ b/assets/src/assets/public.scss @@ -235,7 +235,8 @@ .breadcrumbs { text-align: right; padding: v.$mp-3 0rem; - margin-bottom: v.$mp-2; + padding-bottom: 0; + margin-bottom: 0; &:empty { display: none; }