From e3966ca5cb700ee4b80c2e2af55344bacc1f2ed1 Mon Sep 17 00:00:00 2001 From: bkfox Date: Thu, 1 Feb 2024 18:15:24 +0100 Subject: [PATCH] logs --- aircox/static/aircox/css/admin.css | 1 - aircox/static/aircox/css/chunk-common.css | 1 + aircox/static/aircox/css/public.css | 5 ++++- aircox/templates/aircox/base.html | 4 ++-- aircox/templates/aircox/home.html | 4 +++- aircox/templates/aircox/program_detail.html | 4 ++-- assets/src/assets/common.scss | 1 + assets/src/assets/components.scss | 1 - assets/src/assets/public.scss | 6 +++++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/aircox/static/aircox/css/admin.css b/aircox/static/aircox/css/admin.css index 7de5308..2e1801c 100644 --- a/aircox/static/aircox/css/admin.css +++ b/aircox/static/aircox/css/admin.css @@ -338,7 +338,6 @@ } .a-carousel .a-carousel-viewport { box-shadow: inset 0em 0em 20rem var(--a-carousel-bg); - margin-bottom: var(--a-carousel-p); padding: var(--a-carousel-p) 0; margin-top: calc(0rem - var(--a-carousel-p)); } diff --git a/aircox/static/aircox/css/chunk-common.css b/aircox/static/aircox/css/chunk-common.css index 343894a..32e77a5 100644 --- a/aircox/static/aircox/css/chunk-common.css +++ b/aircox/static/aircox/css/chunk-common.css @@ -6973,6 +6973,7 @@ input.half-field:not(:active):not(:hover) { --body-bg: #fff; --text-color: black; --text-color-light: #555; + --break-color: rgb(245, 245, 245); --main-color: #EFCA08; --main-color-light: #F4da51; --main-color-dark: #F49F0A; diff --git a/aircox/static/aircox/css/public.css b/aircox/static/aircox/css/public.css index a773a46..34a9786 100644 --- a/aircox/static/aircox/css/public.css +++ b/aircox/static/aircox/css/public.css @@ -338,7 +338,6 @@ } .a-carousel .a-carousel-viewport { box-shadow: inset 0em 0em 20rem var(--a-carousel-bg); - margin-bottom: var(--a-carousel-p); padding: var(--a-carousel-p) 0; margin-top: calc(0rem - var(--a-carousel-p)); } @@ -7329,6 +7328,10 @@ a.tag:hover { margin-top: 0.6rem; margin-bottom: 1.2rem; } +.page section.container:not(:last-child) { + padding-bottom: 0.6rem; + border-bottom: 2px var(--break-color) solid; +} .page section.container > .title { font-size: var(--title-2-sz); clear: both; diff --git a/aircox/templates/aircox/base.html b/aircox/templates/aircox/base.html index 877d1b2..e9916ae 100644 --- a/aircox/templates/aircox/base.html +++ b/aircox/templates/aircox/base.html @@ -125,11 +125,11 @@ Usefull context: {% block content-container %} {% if page and page.content %} -
+
{% block content %} {{ page.content|safe }} {% endblock %} -
+ {% endif %} {% endblock %} {% endblock %} diff --git a/aircox/templates/aircox/home.html b/aircox/templates/aircox/home.html index bd4976b..4babb16 100644 --- a/aircox/templates/aircox/home.html +++ b/aircox/templates/aircox/home.html @@ -25,6 +25,8 @@ {% endwith %} +
+ {% for obj in next_diffs|slice:"1:" %} {% if object != diffusion %} @@ -55,7 +57,7 @@ {% if podcasts %}
-

{% translate "Last podcasts" %}

+

{% translate "Last podcasts" %}

{% include "./widgets/carousel.html" with objects=podcasts url_name="podcast-list" url_label=_("All podcasts") %}
{% endif %} diff --git a/aircox/templates/aircox/program_detail.html b/aircox/templates/aircox/program_detail.html index eee9336..cfd6e75 100644 --- a/aircox/templates/aircox/program_detail.html +++ b/aircox/templates/aircox/program_detail.html @@ -5,7 +5,7 @@ {% block content-container %} {% with schedules=program.schedule_set.all %} {% if schedules %} -
+
{% for schedule in schedules %}
@@ -29,7 +29,7 @@
{% endfor %} -
+ {% endif %} {% endwith %} diff --git a/assets/src/assets/common.scss b/assets/src/assets/common.scss index d9911b1..5ec85fb 100644 --- a/assets/src/assets/common.scss +++ b/assets/src/assets/common.scss @@ -16,6 +16,7 @@ input.half-field:not(:active):not(:hover) { --body-bg: #fff; --text-color: black; --text-color-light: #555; + --break-color: rgb(245, 245, 245); --main-color: #EFCA08; --main-color-light: #F4da51; diff --git a/assets/src/assets/components.scss b/assets/src/assets/components.scss index 9d40b5b..cabe3f6 100644 --- a/assets/src/assets/components.scss +++ b/assets/src/assets/components.scss @@ -488,7 +488,6 @@ .a-carousel-viewport { box-shadow: inset 0em 0em 20rem var(--a-carousel-bg); // background-color: var(--a-carousel-bg); - margin-bottom: var(--a-carousel-p); padding: var(--a-carousel-p) 0; margin-top: calc( 0rem - var(--a-carousel-p) ); } diff --git a/assets/src/assets/public.scss b/assets/src/assets/public.scss index cfff66e..5cb9d8c 100644 --- a/assets/src/assets/public.scss +++ b/assets/src/assets/public.scss @@ -17,11 +17,15 @@ } } - section.container { margin-top: v.$mp-3; margin-bottom: v.$mp-4; + &:not(:last-child) { + padding-bottom: calc(v.$mp-4 / 2); + border-bottom: 2px var(--break-color) solid; + } + > .title { font-size: var(--title-2-sz); clear: both;