diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css index f2921944..cb9e1d12 100644 --- a/bookwyrm/static/css/bookwyrm.css +++ b/bookwyrm/static/css/bookwyrm.css @@ -29,6 +29,30 @@ body { min-width: 75% !important; } +/** Utilities not covered by Bulma + ******************************************************************************/ + +@media only screen and (max-width: 768px) { + .is-sr-only-mobile { + border: none !important; + clip: rect(0, 0, 0, 0) !important; + height: 0.01em !important; + overflow: hidden !important; + padding: 0 !important; + position: absolute !important; + white-space: nowrap !important; + width: 0.01em !important; + } + + .m-0-mobile { + margin: 0 !important; + } +} + +.button.is-transparent { + background-color: transparent; +} + /** Shelving ******************************************************************************/ diff --git a/bookwyrm/templates/snippets/boost_button.html b/bookwyrm/templates/snippets/boost_button.html index e590c58d..3a01fc82 100644 --- a/bookwyrm/templates/snippets/boost_button.html +++ b/bookwyrm/templates/snippets/boost_button.html @@ -4,18 +4,16 @@ {% with status.id|uuid as uuid %}
{% csrf_token %} -
{% csrf_token %} -
{% endwith %} diff --git a/bookwyrm/templates/snippets/fav_button.html b/bookwyrm/templates/snippets/fav_button.html index adb3d033..cd22822a 100644 --- a/bookwyrm/templates/snippets/fav_button.html +++ b/bookwyrm/templates/snippets/fav_button.html @@ -3,18 +3,17 @@ {% with status.id|uuid as uuid %}
{% csrf_token %} -
{% csrf_token %} -
{% endwith %} diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html index 1bf184f9..6014158f 100644 --- a/bookwyrm/templates/snippets/status/layout.html +++ b/bookwyrm/templates/snippets/status/layout.html @@ -4,16 +4,16 @@ {% load humanize %} {% block card-header %} -

- {% include 'snippets/status/status_header.html' with status=status %} -

+
+ {% include 'snippets/status/status_header.html' with status=status %} +
{% endblock %} {% block card-content %}{% endblock %} {% block card-footer %} +{% if moderation_mode and perms.bookwyrm.moderate_post %} - +{% elif no_interact %} +{# nothing here #} +{% elif request.user.is_authenticated %} - + {% if not moderation_mode %} +{% endif %} + +{% else %} + {% endif %} {% endblock %} - {% block card-bonus %} {% if request.user.is_authenticated and not moderation_mode %} {% with status.id|uuid as uuid %} diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html index 7a04b44a..3b46b9ce 100644 --- a/bookwyrm/templates/snippets/status/status_header.html +++ b/bookwyrm/templates/snippets/status/status_header.html @@ -1,72 +1,108 @@ {% load bookwyrm_tags %} {% load i18n %} - +
+ -{% if status.status_type == 'GeneratedNote' %} - {{ status.content | safe }} -{% elif status.status_type == 'Rating' %} - {% trans "rated" %} -{% elif status.status_type == 'Review' %} - {% trans "reviewed" %} -{% elif status.status_type == 'Comment' %} - {% trans "commented on" %} -{% elif status.status_type == 'Quotation' %} - {% trans "quoted" %} -{% elif status.reply_parent %} - {% with parent_status=status|parent %} +
+

+ - {% endwith %} -{% endif %} + {% if status.status_type == 'GeneratedNote' %} + {{ status.content | safe }} + {% elif status.status_type == 'Rating' %} + {% trans "rated" %} + {% elif status.status_type == 'Review' %} + {% trans "reviewed" %} + {% elif status.status_type == 'Comment' %} + {% trans "commented on" %} + {% elif status.status_type == 'Quotation' %} + {% trans "quoted" %} + {% elif status.reply_parent %} + {% with parent_status=status|parent %} -{% if status.book %} - {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %} - {{ status.book|title }}{% if status.status_type == 'Rating' %}: - - + {% if status.book %} + {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %} + {{ status.book|title }}{% if status.status_type == 'Rating' %}: + +

+

+ {{ status.published_date|timesince }} + {% if status.progress %} + + {% if status.progress_mode == 'PG' %} + ({% include 'snippets/page_text.html' with page=status.progress total_pages=status.book.pages %}) + {% else %} + ({{ status.progress }}%) + {% endif %} + + {% endif %} + {% include 'snippets/privacy-icons.html' with item=status %} +

+
+
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html index 0749e1c2..549039b7 100644 --- a/bookwyrm/templates/snippets/status/status_options.html +++ b/bookwyrm/templates/snippets/status/status_options.html @@ -3,9 +3,8 @@ {% load bookwyrm_tags %} {% block dropdown-trigger %} - - {% trans "More options" %} - + +{% trans "More options" %} {% endblock %} {% block dropdown-list %} diff --git a/bookwyrm/templates/snippets/toggle/toggle_button.html b/bookwyrm/templates/snippets/toggle/toggle_button.html index fe1823f1..410f823b 100644 --- a/bookwyrm/templates/snippets/toggle/toggle_button.html +++ b/bookwyrm/templates/snippets/toggle/toggle_button.html @@ -10,9 +10,12 @@ > {% if icon %} - + {{ text }} + {% elif icon_with_text %} + + {{ text }} {% else %} {{ text }} {% endif %}