mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-27 12:01:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1431 from bookwyrm-social/discover-clipping

Browse source 
Discover clipping and content warning display
This commit is contained in:
Mouse Reeve 2021-09-19 09:40:33 -07:00 committed by GitHub
commit 0a32fefd93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bookwyrm/templates/discover/discover.html
View file

@ -15,14 +15,15 @@
</p> </p>
</header> </header>
{% with tile_classes="tile is-child box has-background-white-ter is-clipped" %}
<div class="tile is-ancestor"> <div class="tile is-ancestor">
<div class="tile is-6 is-parent"> <div class="tile is-6 is-parent">
<div class="tile is-child box has-background-white-ter"> <div class="{{ tile_classes }}">
{% include 'discover/large-book.html' with status=large_activities.0 %} {% include 'discover/large-book.html' with status=large_activities.0 %}
</div> </div>
</div> </div>
<div class="tile is-6 is-parent"> <div class="tile is-6 is-parent">
<div class="tile is-child box has-background-white-ter"> <div class="{{ tile_classes }}">
{% include 'discover/large-book.html' with status=large_activities.1 %} {% include 'discover/large-book.html' with status=large_activities.1 %}
</div> </div>
</div> </div>
@ -31,18 +32,18 @@
<div class="tile is-ancestor"> <div class="tile is-ancestor">
<div class="tile is-vertical is-6"> <div class="tile is-vertical is-6">
<div class="tile is-parent"> <div class="tile is-parent">
<div class="tile is-child box has-background-white-ter"> <div class="{{ tile_classes }}">
{% include 'discover/large-book.html' with status=large_activities.2 %} {% include 'discover/large-book.html' with status=large_activities.2 %}
</div> </div>
</div> </div>
<div class="tile"> <div class="tile">
<div class="tile is-parent is-6"> <div class="tile is-parent is-6">
<div class="tile is-child box has-background-white-ter"> <div class="{{ tile_classes }}">
{% include 'discover/small-book.html' with status=small_activities.0 %} {% include 'discover/small-book.html' with status=small_activities.0 %}
</div> </div>
</div> </div>
<div class="tile is-parent is-6"> <div class="tile is-parent is-6">
<div class="tile is-child box has-background-white-ter"> <div class="{{ tile_classes }}">
{% include 'discover/small-book.html' with status=small_activities.1 %} {% include 'discover/small-book.html' with status=small_activities.1 %}
</div> </div>
</div> </div>
@ -51,18 +52,18 @@
<div class="tile is-vertical is-6"> <div class="tile is-vertical is-6">
<div class="tile"> <div class="tile">
<div class="tile is-parent is-6"> <div class="tile is-parent is-6">
<div class="tile is-child box has-background-white-ter"> <div class="{{ tile_classes }}">
{% include 'discover/small-book.html' with status=small_activities.2 %} {% include 'discover/small-book.html' with status=small_activities.2 %}
</div> </div>
</div> </div>
<div class="tile is-parent is-6"> <div class="tile is-parent is-6">
<div class="tile is-child box has-background-white-ter"> <div class="{{ tile_classes }}">
{% include 'discover/small-book.html' with status=small_activities.3 %} {% include 'discover/small-book.html' with status=small_activities.3 %}
</div> </div>
</div> </div>
</div> </div>
<div class="tile is-parent"> <div class="tile is-parent">
<div class="tile is-child box has-background-white-ter"> <div class="{{ tile_classes }}">
{% include 'discover/large-book.html' with status=large_activities.3 %} {% include 'discover/large-book.html' with status=large_activities.3 %}
</div> </div>
</div> </div>
@ -71,16 +72,17 @@
<div class="tile is-ancestor"> <div class="tile is-ancestor">
<div class="tile is-6 is-parent"> <div class="tile is-6 is-parent">
<div class="tile is-child box has-background-white-ter"> <div class="{{ tile_classes }}">
{% include 'discover/large-book.html' with status=large_activities.4 %} {% include 'discover/large-book.html' with status=large_activities.4 %}
</div> </div>
</div> </div>
<div class="tile is-6 is-parent"> <div class="tile is-6 is-parent">
<div class="tile is-child box has-background-white-ter"> <div class="{{ tile_classes }}">
{% include 'discover/large-book.html' with status=large_activities.5 %} {% include 'discover/large-book.html' with status=large_activities.5 %}
</div> </div>
</div> </div>
</div> </div>
{% endwith %}
</section> </section>
<div class="block"> <div class="block">

9
bookwyrm/templates/snippets/status/content_status.html
View file

@ -67,9 +67,12 @@
{% endif %} {% endif %}
{% if status.content_warning %} {% if status.content_warning %}
<div class="notification pt-2 pb-2 is-clearfix is-warning is-light"> <div class="notification p-2 is-clearfix is-warning is-light">
<p class="is-pulled-left"> <p class="is-pulled-left is-flex">
<strong>{% trans "Content warning:" %}</strong> {% trans "Content warning" as text %}
<span class="icon icon-warning" title="{{ text }}">
<span class="is-sr-only">{{ text }}</span>
</span>
{{ status.content_warning }} {{ status.content_warning }}
</p> </p>