diff --git a/crates/app/src/public/css/style.css b/crates/app/src/public/css/style.css index 1b0a22b..001e26c 100644 --- a/crates/app/src/public/css/style.css +++ b/crates/app/src/public/css/style.css @@ -162,6 +162,13 @@ p { margin-bottom: 0; } +.post_content pre, +.post_content h1, +.post_content h2, +.post_content h3 { + max-width: calc(100% - 39px - 0.5rem); +} + .post_right:not(.repost) { max-width: calc(100% - 52px); } diff --git a/crates/app/src/public/html/communities/base.lisp b/crates/app/src/public/html/communities/base.lisp index b6eab17..b1aa4b3 100644 --- a/crates/app/src/public/html/communities/base.lisp +++ b/crates/app/src/public/html/communities/base.lisp @@ -280,7 +280,17 @@ ("hook" "check_reactions") ("hook-arg:id" "{{ community.id }}") (text "{{ components::likes(id=community.id, asset_type=\"Community\", likes=community.likes, dislikes=community.dislikes) }}")) - (text "{%- endif %}")))))) + (text "{%- endif %}"))) + + (text "{% if user and user.id != community.owner -%}") + (hr) + (div + ("class" "flex flex-wrap gap-2 w-full fade") + (a + ("class" "red") + ("href" "javascript:trigger('me::report', ['{{ community.id }}', 'community'])") + (text "({{ lang[\"general:action.report\"]|lower }})"))) + (text "{%- endif %}")))) (div ("class" "rhs w-full") (text "{% if can_read -%} {% block content %}{% endblock %} {% else %}") diff --git a/crates/app/src/public/html/components.lisp b/crates/app/src/public/html/components.lisp index 3bbe159..61b6ed8 100644 --- a/crates/app/src/public/html/components.lisp +++ b/crates/app/src/public/html/components.lisp @@ -191,7 +191,7 @@ (text "{% if not post.context.content_warning -%}") (span ("id" "post-content:{{ post.id }}") - ("class" "no_p_margin") + ("class" "no_p_margin post_content") ("hook" "long") (text "{{ post.content|markdown|safe }} {% if expect_repost -%} {% if repost -%} {{ self::post(post=repost[1], owner=repost[0], secondary=not secondary, community=false, show_community=false, can_manage_post=false) }} {% else %}") (div @@ -204,15 +204,14 @@ (details ("class" "card tiny tertiary w-full") (summary - ("class" "flex gap-2 flex-wrap items-center red w-full") - (text "{{ icon \"triangle-alert\" }}") + ("class" "red w-full") (b (text "{{ post.context.content_warning }}"))) (div ("class" "flex flex-col gap-2") (span ("id" "post-content:{{ post.id }}") - ("class" "no_p_margin") + ("class" "no_p_margin post_content") ("hook" "long") (text "{{ post.content|markdown|safe }} {% if expect_repost -%} {% if repost -%} {{ self::post(post=repost[1], owner=repost[0], secondary=not secondary, community=false, show_community=false, can_manage_post=false) }} {% else %}") (div diff --git a/crates/app/src/public/html/macros.lisp b/crates/app/src/public/html/macros.lisp index 188bd45..98a0621 100644 --- a/crates/app/src/public/html/macros.lisp +++ b/crates/app/src/public/html/macros.lisp @@ -137,7 +137,7 @@ (a ("href" "/popular") ("class" "{% if selected == 'popular' -%}active{%- endif %}") - (icon (text "layers")) + (icon (text "trending-up")) (str (text "general:link.popular")))) (div diff --git a/crates/app/src/public/html/mod/reports.lisp b/crates/app/src/public/html/mod/reports.lisp index c2c0a4f..2ba8518 100644 --- a/crates/app/src/public/html/mod/reports.lisp +++ b/crates/app/src/public/html/mod/reports.lisp @@ -53,6 +53,8 @@ window.open(`/post/${asset}`); } else if (asset_type === \"Community\") { window.open(`/community/${asset}`); + } else if (asset_type === \"User\") { + window.open(`/api/v1/auth/user/find/${asset}`); } } diff --git a/crates/app/src/public/html/profile/base.lisp b/crates/app/src/public/html/profile/base.lisp index 7b86141..9698f1e 100644 --- a/crates/app/src/public/html/profile/base.lisp +++ b/crates/app/src/public/html/profile/base.lisp @@ -172,6 +172,16 @@ (span ("class" "date") (text "{{ profile.last_seen }}")))) + (text "{%- endif %}") + + (text "{% if user and user.id != profile.id -%}") + (hr) + (div + ("class" "flex flex-wrap gap-2 w-full fade") + (a + ("class" "red") + ("href" "javascript:trigger('me::report', ['{{ profile.id }}', 'user'])") + (text "({{ lang[\"general:action.report\"]|lower }})"))) (text "{%- endif %}"))) (text "{% if not is_self and user -%}") (div