From 1ad2aad08d00a36ee4579061fec6bbcdd9e6464d Mon Sep 17 00:00:00 2001 From: Mattia Succurro Date: Sat, 14 Jun 2025 02:59:47 +0200 Subject: [PATCH 01/10] css fixes --- freak/static/sass/content.sass | 1 + freak/static/sass/layout.sass | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/freak/static/sass/content.sass b/freak/static/sass/content.sass index 5b0b4b3..56354ec 100644 --- a/freak/static/sass/content.sass +++ b/freak/static/sass/content.sass @@ -29,6 +29,7 @@ blockquote ul margin: 4px 0 padding: 0 + padding-inline-start: 1.5em > li margin: 0 diff --git a/freak/static/sass/layout.sass b/freak/static/sass/layout.sass index ff7e034..58d7b49 100644 --- a/freak/static/sass/layout.sass +++ b/freak/static/sass/layout.sass @@ -145,7 +145,8 @@ ul.message-options list-style: none padding: 0 font-size: smaller - margin-bottom: -4px + .comment-frame & + margin-bottom: -4px .post-frame margin-left: 3em From 382d06961bd6e82a46676e5fafac5f9c67119561 Mon Sep 17 00:00:00 2001 From: Mattia Succurro Date: Sat, 14 Jun 2025 12:09:47 +0200 Subject: [PATCH 02/10] minor style changes --- freak/static/sass/base.sass | 12 ++++++------ freak/static/sass/layout.sass | 6 ++++++ freak/templates/feed.html | 4 ++-- freak/templates/macros/nav.html | 8 ++++---- freak/templates/singlepost.html | 15 ++++++++------- freak/website/frontpage.py | 6 ++++-- 6 files changed, 30 insertions(+), 21 deletions(-) diff --git a/freak/static/sass/base.sass b/freak/static/sass/base.sass index 71772ab..97b65a6 100644 --- a/freak/static/sass/base.sass +++ b/freak/static/sass/base.sass @@ -5,10 +5,11 @@ box-sizing: border-box \:root + --accent: #ff7300 + --light-text-primary: #181818 --light-text-alt: #444 --light-border: #999 - --light-accent: #ff7300 --light-success: #73af00 --light-error: #e04433 --light-canvas: #eaecee @@ -18,17 +19,19 @@ --dark-text-primary: #e8e8e8 --dark-text-alt: #c0cad3 --dark-border: #777 - --dark-accent: #ff7300 --dark-success: #93cf00 --dark-error: #e04433 --dark-canvas: #0a0a0e --dark-background: #181a21 --dark-bg-sharp: #080808 + // the following are DEPRECATED // + --light-accent: var(--accent) + --dark-accent: var(--accent) + --text-primary: var(--light-text-primary) --text-alt: var(--light-text-alt) --border: var(--light-border) - --accent: var(--light-accent) --success: var(--light-success) --error: var(--light-error) --canvas: var(--light-canvas) @@ -40,7 +43,6 @@ --text-primary: var(--dark-text-primary) --text-alt: var(--dark-text-alt) --border: var(--dark-border) - --accent: var(--dark-accent) --success: var(--dark-success) --error: var(--dark-error) --canvas: var(--dark-canvas) @@ -51,7 +53,6 @@ body.color-scheme-light --text-primary: var(--light-text-primary) --text-alt: var(--light-text-alt) --border: var(--light-border) - --accent: var(--light-accent) --success: var(--light-success) --error: var(--light-error) --canvas: var(--light-canvas) @@ -62,7 +63,6 @@ body.color-scheme-dark --text-primary: var(--dark-text-primary) --text-alt: var(--dark-text-alt) --border: var(--dark-border) - --accent: var(--dark-accent) --success: var(--dark-success) --error: var(--dark-error) --canvas: var(--dark-canvas) diff --git a/freak/static/sass/layout.sass b/freak/static/sass/layout.sass index 58d7b49..b933e36 100644 --- a/freak/static/sass/layout.sass +++ b/freak/static/sass/layout.sass @@ -103,6 +103,9 @@ aside.card padding: 12px margin: -12px -12px 0 -12px position: relative + a + color: inherit + text-decoration: underline > ul list-style: none margin: 0 @@ -157,6 +160,9 @@ ul.message-options margin-left: 0 margin-right: 3em + .message-options + margin-bottom: 1em + .message-stats position: absolute left: -3em diff --git a/freak/templates/feed.html b/freak/templates/feed.html index 01057a4..87d97d5 100644 --- a/freak/templates/feed.html +++ b/freak/templates/feed.html @@ -20,8 +20,8 @@ {{ nav_top_communities(top_communities) }} {% endif %} - {% if feed_type == 'topic' %} - {% from "macros/nav.html" import nav_topic with context %} + {% if feed_type == 'guild' %} + {% from "macros/nav.html" import nav_guild with context %} {{ nav_topic(topic) }} {% endif %} diff --git a/freak/templates/macros/nav.html b/freak/templates/macros/nav.html index 3a63238..f652f72 100644 --- a/freak/templates/macros/nav.html +++ b/freak/templates/macros/nav.html @@ -1,9 +1,9 @@ -{% macro nav_topic(topic) %} +{% macro nav_guild(gu) %}