mirror of
https://gitlab.com/brutaldon/brutaldon.git
synced 2024-12-04 14:46:24 -05:00
Merge branch brutaldon:main into main
This commit is contained in:
commit
feb6a73a5c
@ -165,7 +165,7 @@
|
|||||||
<div class="container">
|
<div class="container">
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1 class="title">
|
<h1 class="title">
|
||||||
Title
|
Brutaldon
|
||||||
</h1>
|
</h1>
|
||||||
<p class="subtitle">
|
<p class="subtitle">
|
||||||
Brutaldon is totally a thing.
|
Brutaldon is totally a thing.
|
||||||
|
@ -14,14 +14,15 @@
|
|||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
<h1>Brutaldon ({{ own_acct.username }}) - {{ timeline_name }} timelime</h1>
|
||||||
{% if form %}
|
{% if form %}
|
||||||
<h1 class="title">Post</h1>
|
<h2 class="title">Post</h2>
|
||||||
<div class="box">
|
<div class="box">
|
||||||
{% include "main/post_minimal_partial.html" %}
|
{% include "main/post_minimal_partial.html" %}
|
||||||
</div>
|
</div>
|
||||||
<hr class="is-hidden">
|
<hr class="is-hidden">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<h1 class="title">Your {{ timeline_name }} timeline</h1>
|
<h2 class="title">Your {{ timeline_name }} timeline</h2>
|
||||||
<div id="timeline">
|
<div id="timeline">
|
||||||
{% for toot in toots %}
|
{% for toot in toots %}
|
||||||
{% cache 600 toot_partial toot.id %}
|
{% cache 600 toot_partial toot.id %}
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
<div class="media-content">
|
<div class="media-content">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<p>
|
<p>
|
||||||
<strong>{{ toot.account.display_name | fix_emojos:toot.account.emojis | strip_html |safe}}</strong>
|
<h3><strong>{{ toot.account.display_name | fix_emojos:toot.account.emojis | strip_html |safe}}</strong></h3>
|
||||||
<small><a href="{% url "user" toot.account.acct %}">
|
<small><a href="{% url "user" toot.account.acct %}">
|
||||||
@{{ toot.account.acct }}</a></small>
|
@{{ toot.account.acct }}</a></small>
|
||||||
<a href="{{ toot.url }}">
|
<a href="{{ toot.url }}">
|
||||||
|
Loading…
Reference in New Issue
Block a user