Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
bb1cfe77f2
@ -129,7 +129,7 @@
|
|||||||
<!-- Streak -->
|
<!-- Streak -->
|
||||||
<div class="col-2" id="streak-{{ habit.id }}" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
|
<div class="col-2" id="streak-{{ habit.id }}" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
|
||||||
{% if not habit.streak == 0 %}
|
{% if not habit.streak == 0 %}
|
||||||
{{ habit.streak }}20 🔥
|
{{ habit.streak }} 🔥
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@ -34,13 +34,18 @@
|
|||||||
|
|
||||||
<div class="d-md-flex gap-3">
|
<div class="d-md-flex gap-3">
|
||||||
|
|
||||||
|
{% if current_user.is_authenticated %}
|
||||||
{% include 'components/heatmap.html' %}
|
{% include 'components/heatmap.html' %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
|
{% if current_user.is_authenticated %}
|
||||||
{% include 'components/habit_lists.html' %}
|
{% include 'components/habit_lists.html' %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if current_user.is_authenticated %}
|
||||||
{% include 'components/delete_button.html' %}
|
{% include 'components/delete_button.html' %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user