From 656155eb4e42cedc4674a6b27d90dd81202e2f52 Mon Sep 17 00:00:00 2001 From: Dorian Wood Date: Fri, 13 Sep 2024 22:11:00 -0400 Subject: [PATCH 1/8] refinessing the css. center column works again --- brutaldon/static/css/brutal-css.css | 12 ++++- brutaldon/static/css/brutaldon.css | 4 ++ brutaldon/static/css/simple.css | 11 +++-- brutaldon/templates/base.html | 54 ++++++++++++++-------- brutaldon/templates/main/toot_partial.html | 11 ++--- 5 files changed, 60 insertions(+), 32 deletions(-) diff --git a/brutaldon/static/css/brutal-css.css b/brutaldon/static/css/brutal-css.css index e44a1ae..6329fec 100644 --- a/brutaldon/static/css/brutal-css.css +++ b/brutaldon/static/css/brutal-css.css @@ -1,3 +1,13 @@ img.avatar { - height: 90px; + height: 3rem; +} + +h3 { + margin-top: 1rem; + margin-bottom: 1rem; +} + +figure > p { + margin-top: 0rem; + margin-bottom: 0rem; } diff --git a/brutaldon/static/css/brutaldon.css b/brutaldon/static/css/brutaldon.css index 75ccb35..98d4d27 100644 --- a/brutaldon/static/css/brutaldon.css +++ b/brutaldon/static/css/brutaldon.css @@ -235,3 +235,7 @@ div.poll { { margin-top: 0; } +button > a { + color: white; +} + diff --git a/brutaldon/static/css/simple.css b/brutaldon/static/css/simple.css index 984203c..23b85a7 100644 --- a/brutaldon/static/css/simple.css +++ b/brutaldon/static/css/simple.css @@ -73,12 +73,16 @@ body { background-color: var(--bg); font-size: 1.15rem; line-height: 1.5; + /* display: flex; */ + /* flex-direction: column; */ + /* max-width: 50rem; */ + /* justify-content: center; */ display: grid; grid-template-columns: 1fr min(45rem, 90%) 1fr; margin: 0; } body > * { - grid-column: 2; + /* grid-column: 2; */ } /* Make the header bg full width, but the content inline with body */ @@ -87,7 +91,7 @@ body > header { border-bottom: 1px solid var(--border); text-align: center; padding: 0 0.5rem 2rem 0.5rem; - grid-column: 1 / -1; + /* grid-column: 1 / -1; */ } body > header > *:only-child { @@ -130,7 +134,6 @@ h2 { h3 { font-size: 2rem; - margin-top: 3rem; } h4 { @@ -262,7 +265,7 @@ header > nav ol { align-content: space-around; align-items: center; display: flex; - flex-direction: row; + flex-direction: column; flex-wrap: wrap; justify-content: center; list-style-type: none; diff --git a/brutaldon/templates/base.html b/brutaldon/templates/base.html index 6b9f070..48c0f1f 100644 --- a/brutaldon/templates/base.html +++ b/brutaldon/templates/base.html @@ -30,7 +30,7 @@ - + {% if not preferences %} -
- +
+
{% block navbar %}
- + {% endif %} + {% endblock %} @@ -130,7 +144,7 @@ Brutaldon

- Brutaldon is totally a thing. + Brutaldon is a brutalist minimal client for Mastodon.

{% endblock %} @@ -188,5 +202,7 @@ {% endblock %} {% endif %} + +
diff --git a/brutaldon/templates/main/toot_partial.html b/brutaldon/templates/main/toot_partial.html index 38aaa77..e7363a7 100644 --- a/brutaldon/templates/main/toot_partial.html +++ b/brutaldon/templates/main/toot_partial.html @@ -11,15 +11,12 @@
{% endif %} -
-

+

-

-

{{ toot.account.display_name | fix_emojos:toot.account.emojis | strip_html |safe}}

@@ -31,9 +28,11 @@ {% if reblog %}
Boosted by @{{ reblog_by }} +
+
{% endif %}

{% if toot.spoiler_text %} @@ -192,7 +191,6 @@ -
{% if toot.account.acct == own_acct.acct %} @@ -216,7 +214,6 @@    {% if toot.in_reply_to_id or toot.replies_count > 0 %} - thread {% else %} @@ -228,7 +225,5 @@ {% endif %} -
-
{% endif %} From 76fbc426d09da92feb58eca426c7b7238186986f Mon Sep 17 00:00:00 2001 From: Dorian Wood Date: Sat, 14 Sep 2024 18:59:45 -0400 Subject: [PATCH 2/8] trying to get search working --- brutaldon/static/css/brutal-css.css | 4 ++++ brutaldon/templates/main/search.html | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/brutaldon/static/css/brutal-css.css b/brutaldon/static/css/brutal-css.css index 6329fec..4bd64a6 100644 --- a/brutaldon/static/css/brutal-css.css +++ b/brutaldon/static/css/brutal-css.css @@ -11,3 +11,7 @@ figure > p { margin-top: 0rem; margin-bottom: 0rem; } + +nav > ul { + list-style-type: none; +} diff --git a/brutaldon/templates/main/search.html b/brutaldon/templates/main/search.html index c83c0d8..11bb6e9 100644 --- a/brutaldon/templates/main/search.html +++ b/brutaldon/templates/main/search.html @@ -15,17 +15,17 @@
-
+
- +
-
+
From f9981670f2dbb59326de5ebcab659900f62be8db Mon Sep 17 00:00:00 2001 From: Dorian Wood Date: Fri, 20 Sep 2024 10:20:57 -0400 Subject: [PATCH 3/8] removing toot form from timeline views it was set up to add an extra h1 tag in the document, which is bad practice. The easiest path forward was simply to remove it. --- brutaldon/templates/main/timeline.html | 7 ------- 1 file changed, 7 deletions(-) diff --git a/brutaldon/templates/main/timeline.html b/brutaldon/templates/main/timeline.html index d229d2f..fc009b6 100644 --- a/brutaldon/templates/main/timeline.html +++ b/brutaldon/templates/main/timeline.html @@ -14,13 +14,6 @@ {% endblock %} {% block content %} - {% if form %} -

Post

-
- {% include "main/post_minimal_partial.html" %} -
- - {% endif %}

Your {{ timeline_name }} timeline

{% for toot in toots %} From 41588c42efdb6d8d19f5a1fd3405dad20f648322 Mon Sep 17 00:00:00 2001 From: Dorian Wood Date: Sun, 22 Sep 2024 16:10:18 -0400 Subject: [PATCH 4/8] moving icons. needs polish --- brutaldon/templates/main/toot_partial.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/brutaldon/templates/main/toot_partial.html b/brutaldon/templates/main/toot_partial.html index 00d88f5..8835f52 100644 --- a/brutaldon/templates/main/toot_partial.html +++ b/brutaldon/templates/main/toot_partial.html @@ -11,6 +11,8 @@
{% endif %} +
+
- {% if reblog %} -

- - - -

- {% endif %}
-
-

{{ toot.account.display_name | fix_emojos:toot.account.emojis | strip_html |safe}} @@ -36,6 +29,13 @@ {{ toot.created_at |humane_time }} {% if reblog %} +

+

+ + + +

+

Boosted by @{{ reblog_by }} {% endif %} From 18526befb08da69b1471b54981ab0e30c34f2a26 Mon Sep 17 00:00:00 2001 From: Dorian Wood Date: Wed, 23 Oct 2024 16:42:14 -0400 Subject: [PATCH 5/8] changing django version to 4.2 from 3.2 --- Pipfile | 2 +- brutaldon/settings.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index 09e8b9c..2d50d91 100644 --- a/Pipfile +++ b/Pipfile @@ -21,7 +21,7 @@ requests = "*" six = "*" "urllib3" = "*" webencodings = "*" -Django = "~=3.2" +Django = "~=4.2" django-html_sanitizer = "*" inscriptis = "*" lxml = "*" diff --git a/brutaldon/settings.py b/brutaldon/settings.py index 5fe9ea0..8d0610d 100644 --- a/brutaldon/settings.py +++ b/brutaldon/settings.py @@ -12,6 +12,14 @@ https://docs.djangoproject.com/en/2.0/ref/settings/ import os +# Work around issue in sanitizer +import django +try: + from django.utils.encoding import smart_text +except: + from django.utils.encoding import smart_str + django.utils.encoding.smart_text = smart_str + # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) From 83e31008fed07d02573e8ff17cf055077ed71df4 Mon Sep 17 00:00:00 2001 From: Dorian Wood Date: Wed, 23 Oct 2024 16:43:40 -0400 Subject: [PATCH 6/8] moving avatars in the document structure --- brutaldon/templates/main/toot_partial.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brutaldon/templates/main/toot_partial.html b/brutaldon/templates/main/toot_partial.html index 8835f52..2083f8f 100644 --- a/brutaldon/templates/main/toot_partial.html +++ b/brutaldon/templates/main/toot_partial.html @@ -13,7 +13,7 @@
-
+
{% block content %}

- Brutaldon + Title

Brutaldon is a brutalist minimal client for Mastodon. diff --git a/brutaldon/templates/main/timeline.html b/brutaldon/templates/main/timeline.html index 113c83e..535a313 100644 --- a/brutaldon/templates/main/timeline.html +++ b/brutaldon/templates/main/timeline.html @@ -14,6 +14,13 @@ {% endblock %} {% block content %} + {% if form %} +

Post

+
+ {% include "main/post_minimal_partial.html" %} +
+ + {% endif %}

Your {{ timeline_name }} timeline

{% for toot in toots %} diff --git a/brutaldon/templates/main/toot_partial.html b/brutaldon/templates/main/toot_partial.html index 5333894..8d01227 100644 --- a/brutaldon/templates/main/toot_partial.html +++ b/brutaldon/templates/main/toot_partial.html @@ -22,7 +22,7 @@

-

{{ toot.account.display_name | fix_emojos:toot.account.emojis | strip_html |safe}}

+ {{ toot.account.display_name | fix_emojos:toot.account.emojis | strip_html |safe}} @{{ toot.account.acct }}