From 5376aa261c635baf25d74abf82f0aea377ca07dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nu=C5=A1a=20Puk=C5=A1i=C4=8D?= Date: Sat, 11 Oct 2025 20:10:09 +0200 Subject: [PATCH] Misc fixes --- assets/styles/02-layout/header.css | 3 +- assets/styles/02-layout/layout.css | 15 ++-- assets/styles/04-pages/forum.css | 86 ++++++++++++++--------- templates/components/Header.html.twig | 3 + templates/event/_kind20_picture.html.twig | 10 +-- templates/event/index.html.twig | 4 -- templates/layout.html.twig | 7 +- templates/pages/editor.html.twig | 2 +- 8 files changed, 69 insertions(+), 61 deletions(-) diff --git a/assets/styles/02-layout/header.css b/assets/styles/02-layout/header.css index 18dabd2..a85735c 100644 --- a/assets/styles/02-layout/header.css +++ b/assets/styles/02-layout/header.css @@ -16,7 +16,8 @@ .header .container { display: flex; - flex-direction: column; + flex-direction: row; + width: 100%; } .header__categories ul { diff --git a/assets/styles/02-layout/layout.css b/assets/styles/02-layout/layout.css index 357dd9b..464027d 100644 --- a/assets/styles/02-layout/layout.css +++ b/assets/styles/02-layout/layout.css @@ -83,6 +83,10 @@ main { word-break: break-word; } +main > section { + padding: 0 var(--spacing-2); +} + main.static { margin-left: auto; margin-right: auto; @@ -156,11 +160,7 @@ aside header { main { margin-top: 60px; - } - - section { - padding-left: 20px; - padding-right: 20px; + padding: 0; } nav header, @@ -174,12 +174,9 @@ aside header { .mobile-toggles { display: flex; - justify-content: space-between; - gap: .5rem; - position: sticky; - top: 61px; /* below main header */ z-index: 1050; padding: .5rem 0; + margin: 0 var(--spacing-2); } .mobile-toggles .toggle { diff --git a/assets/styles/04-pages/forum.css b/assets/styles/04-pages/forum.css index f10058f..21e35a2 100644 --- a/assets/styles/04-pages/forum.css +++ b/assets/styles/04-pages/forum.css @@ -60,76 +60,92 @@ margin: 1rem 0; } +@media (max-width: 960px) { + .subcategories-grid .tags { + justify-content: flex-start; + } + + .subcategories-grid .tag { + padding: 0; + background-color: transparent; + color: var(--color-primary); + } + + .subcategories-grid .tag:before { + content: '#'; + } +} + .sub-card { - border: 1px solid var(--color-primary); - background: #fff; - padding: 1rem; - display: flex; - flex-direction: column; - justify-content: space-between; +border: 1px solid var(--color-primary); +background: #fff; +padding: 1rem; +display: flex; +flex-direction: column; +justify-content: space-between; } .sub-card h3 { - margin: 0 0 0.5rem 0; +margin: 0 0 0.5rem 0; } .sub-card div { - display: flex; - justify-content: space-between; - align-items: center; +display: flex; +justify-content: space-between; +align-items: center; } .sub-card .count { - align-self: flex-end; - flex-shrink: 0; +align-self: flex-end; +flex-shrink: 0; } .articles-list { - list-style: none; - padding: 0; +list-style: none; +padding: 0; } .article-item { - border: 1px solid #ddd; - padding: 1rem; - margin: 1rem 0; - background: #fafafa; +border: 1px solid #ddd; +padding: 1rem; +margin: 1rem 0; +background: #fafafa; } .article-item h3 { - margin: 0 0 0.5rem 0; +margin: 0 0 0.5rem 0; } .article-item p { - margin: 0.5rem 0; +margin: 0.5rem 0; } .article-item small { - color: #666; +color: #666; } .nav-sub-card { - border: 1px solid #333; - background: #fff; - padding: 0.5rem; - margin: 0.5rem 0; - display: flex; - flex-direction: column; - box-shadow: 1px 1px 3px rgba(0,0,0,0.2); +border: 1px solid #333; +background: #fff; +padding: 0.5rem; +margin: 0.5rem 0; +display: flex; +flex-direction: column; +box-shadow: 1px 1px 3px rgba(0,0,0,0.2); } .nav-sub-card h4 { - margin: 0 0 0.25rem 0; - font-size: 1rem; +margin: 0 0 0.25rem 0; +font-size: 1rem; } .nav-sub-card .tags { - flex: 1; +flex: 1; } .nav-sub-card .count { - font-size: 1.2rem; - font-weight: bold; - color: #333; - align-self: flex-end; +font-size: 1.2rem; +font-weight: bold; +color: #333; +align-self: flex-end; } diff --git a/templates/components/Header.html.twig b/templates/components/Header.html.twig index 47397d3..e071c24 100644 --- a/templates/components/Header.html.twig +++ b/templates/components/Header.html.twig @@ -1,5 +1,8 @@
+
+ +
diff --git a/templates/event/_kind20_picture.html.twig b/templates/event/_kind20_picture.html.twig index 6012102..18f3a9c 100644 --- a/templates/event/_kind20_picture.html.twig +++ b/templates/event/_kind20_picture.html.twig @@ -13,10 +13,6 @@ {% set isEmbed = true %} {% endif %} - {% if title %} -

{{ title }}

- {% endif %} - {# Content warning #} {% set contentWarning = null %} {% for tag in event.tags %} @@ -92,9 +88,6 @@ {% endif %} - {% for fallback in main.fallbacks %} - - {% endfor %} {{ main.altText|default('Picture') }} + {% for fallback in main.fallbacks %} + + {% endfor %} {% if images|length > 1 %} diff --git a/templates/event/index.html.twig b/templates/event/index.html.twig index 038e17d..6ce77e7 100644 --- a/templates/event/index.html.twig +++ b/templates/event/index.html.twig @@ -339,10 +339,6 @@ .picture-gallery { grid-template-columns: 1fr; } - - .picture-title { - font-size: 1.5rem; - } } {% endblock %} diff --git a/templates/layout.html.twig b/templates/layout.html.twig index ffcfcc5..05ce01e 100644 --- a/templates/layout.html.twig +++ b/templates/layout.html.twig @@ -14,6 +14,9 @@
  • Latest articles
    • +
  • + Forum +
  • Multimedia
    • @@ -40,10 +43,6 @@
    -
    - -{# #} -
    {% block body %}{% endblock %} {# Floating reading list quick add widget #} diff --git a/templates/pages/editor.html.twig b/templates/pages/editor.html.twig index bdfbb8e..2fbf00c 100644 --- a/templates/pages/editor.html.twig +++ b/templates/pages/editor.html.twig @@ -15,7 +15,7 @@
    {% if not is_granted('ROLE_USER') %}
    -

    Login is required to post articles.

    +

    A Nostr identity is required to post articles.

    {% endif %}