From 58aeb72afa6f28ead18888d47438e0704a424e23 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 21 Apr 2021 17:23:48 +0200 Subject: [PATCH 01/14] Move card footer container inside the card-footer component --- bookwyrm/templates/components/card.html | 6 +-- .../templates/moderation/report_preview.html | 38 ++++++++++--------- bookwyrm/templates/snippets/goal_card.html | 12 +++--- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/bookwyrm/templates/components/card.html b/bookwyrm/templates/components/card.html index f1104893a..7dc3e1b04 100644 --- a/bookwyrm/templates/components/card.html +++ b/bookwyrm/templates/components/card.html @@ -11,10 +11,8 @@ {% endif %} - + {% block card-footer %} + {% endblock %} {% block card-bonus %} {% endblock %} diff --git a/bookwyrm/templates/moderation/report_preview.html b/bookwyrm/templates/moderation/report_preview.html index 363783d50..936c04b8f 100644 --- a/bookwyrm/templates/moderation/report_preview.html +++ b/bookwyrm/templates/moderation/report_preview.html @@ -16,22 +16,24 @@ {% endblock %} {% block card-footer %} -
-

{% blocktrans with username=report.reporter.display_name path=report.reporter.local_path %}Reported by {{ username }}{% endblocktrans %}

-
-
- {{ report.created_date | naturaltime }} -
-
-
- {% csrf_token %} - -
-
+ {% endblock %} diff --git a/bookwyrm/templates/snippets/goal_card.html b/bookwyrm/templates/snippets/goal_card.html index 329fea542..5014b81cf 100644 --- a/bookwyrm/templates/snippets/goal_card.html +++ b/bookwyrm/templates/snippets/goal_card.html @@ -17,9 +17,11 @@ {% endblock %} {% block card-footer %} -
- {% csrf_token %} - -

{% blocktrans with path=request.user.local_path %}You can set or change your reading goal any time from your profile page{% endblocktrans %}

-
+ {% endblock %} From 13957c2f4424187c9af786d6fa98dfe6560d6143 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 21 Apr 2021 17:32:35 +0200 Subject: [PATCH 02/14] Move footer some items to header - Header elements are now enclosed in a media layout - Footer elements are not in a card-footer anymore --- .../templates/snippets/status/layout.html | 15 +- .../snippets/status/status_header.html | 142 ++++++++++-------- 2 files changed, 81 insertions(+), 76 deletions(-) diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html index 5b6c0c78d..9c9d8fc16 100644 --- a/bookwyrm/templates/snippets/status/layout.html +++ b/bookwyrm/templates/snippets/status/layout.html @@ -13,7 +13,7 @@ {% block card-content %}{% endblock %} {% block card-footer %} -
+
{% if moderation_mode and perms.bookwyrm.moderate_post %} {# moderation options #} @@ -55,19 +55,6 @@ {% endif %}
- -
- {% include 'snippets/privacy-icons.html' with item=status %} -
- -
- {{ status.published_date | post_date }} -
-{% if not moderation_mode %} -
- {% include 'snippets/status/status_options.html' with class="is-small" right=True %} -
-{% endif %} {% endblock %} diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html index 0fa74ddd1..e9d10c25f 100644 --- a/bookwyrm/templates/snippets/status/status_header.html +++ b/bookwyrm/templates/snippets/status/status_header.html @@ -1,72 +1,90 @@ {% load bookwyrm_tags %} {% load i18n %} - +
+
+ + {% include 'snippets/avatar.html' with user=status.user ariaHide="true" medium="true" %} + +
-{% 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 parent_status.status_type == 'Review' %} - {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to {{ username}}'s review{% endblocktrans %} - {% elif parent_status.status_type == 'Comment' %} - {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to {{ username}}'s comment{% endblocktrans %} - {% elif parent_status.status_type == 'Quotation' %} - {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to {{ username}}'s quote{% endblocktrans %} - {% else %} - {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to {{ username}}'s status{% endblocktrans %} - {% endif %} - - {% endwith %} -{% endif %} - -{% if status.book %} - {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %} - {{ status.book.title }}{% if status.status_type == 'Rating' %}: +
+

+ {{ status.published_date | post_date }} + {% include 'snippets/privacy-icons.html' with item=status %} +

- - {% include 'snippets/stars.html' with rating=status.rating %} - {% endif %} - {% else %} - {% include 'snippets/book_titleby.html' with book=status.book %} - {% endif %} -{% elif status.mention_books %} - {{ status.mention_books.first.title }} -{% 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 parent_status.status_type == 'Review' %} + {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to {{ username}}'s review{% endblocktrans %} + {% elif parent_status.status_type == 'Comment' %} + {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to {{ username}}'s comment{% endblocktrans %} + {% elif parent_status.status_type == 'Quotation' %} + {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to {{ username}}'s quote{% endblocktrans %} + {% else %} + {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to {{ username}}'s status{% endblocktrans %} + {% endif %} + + {% endwith %} + {% endif %} + + {% if status.book %} + {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %} + {{ status.book.title }}{% if status.status_type == 'Rating' %}: + + + + {% include 'snippets/stars.html' with rating=status.rating %} + {% endif %} + {% else %} + {% include 'snippets/book_titleby.html' with book=status.book %} + {% endif %} + {% elif status.mention_books %} + {{ status.mention_books.first.title }} + {% endif %} + + {% 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 %} +
+
-{% 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 %} From f7adaee0ed4fc9b812c21f487bcfe9c4d418f291 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 21 Apr 2021 17:35:55 +0200 Subject: [PATCH 03/14] Verbosify buttons --- bookwyrm/templates/snippets/boost_button.html | 14 ++++++------- bookwyrm/templates/snippets/fav_button.html | 11 +++++----- .../templates/snippets/status/layout.html | 21 ++++++++++++------- .../snippets/status/status_options.html | 5 ++--- .../snippets/toggle/toggle_button.html | 3 +++ 5 files changed, 29 insertions(+), 25 deletions(-) diff --git a/bookwyrm/templates/snippets/boost_button.html b/bookwyrm/templates/snippets/boost_button.html index e590c58d8..27a6196a9 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 adb3d0333..da6e6661f 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 9c9d8fc16..f132f5948 100644 --- a/bookwyrm/templates/snippets/status/layout.html +++ b/bookwyrm/templates/snippets/status/layout.html @@ -26,30 +26,35 @@ {% elif no_interact %} {# nothing here #} {% elif request.user.is_authenticated %} -
-
+
+
{% trans "Reply" as button_text %} - {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text=button_text icon="comment" class="is-small toggle-button" focus="id_content_reply" %} + {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text=button_text icon_with_text="comment" class="is-small is-white toggle-button" focus="id_content_reply" %}
-
+
{% include 'snippets/boost_button.html' with status=status %}
-
+
{% include 'snippets/fav_button.html' with status=status %}
+ {% if not moderation_mode %} +
+ {% include 'snippets/status/status_options.html' with class="is-small is-white" right=True %} +
+ {% endif %}
{% else %} - + {% trans "Reply" %} - + {% trans "Boost status" %} - + {% trans "Like status" %} diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html index a76cbc393..16d49b3d2 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 fe1823f1d..d5a8f3dcd 100644 --- a/bookwyrm/templates/snippets/toggle/toggle_button.html +++ b/bookwyrm/templates/snippets/toggle/toggle_button.html @@ -13,6 +13,9 @@ {{ text }} + {% elif icon_with_text %} + + {{ text }} {% else %} {{ text }} {% endif %} From 17436b665759714543f52ef46471b991d7578e81 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 21 Apr 2021 21:48:19 +0200 Subject: [PATCH 04/14] Header fixes --- .../snippets/status/status_header.html | 154 +++++++++--------- 1 file changed, 80 insertions(+), 74 deletions(-) diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html index e9d10c25f..27bce0ca5 100644 --- a/bookwyrm/templates/snippets/status/status_header.html +++ b/bookwyrm/templates/snippets/status/status_header.html @@ -1,5 +1,6 @@ {% load bookwyrm_tags %} {% load i18n %} +{% load humanize %}
@@ -9,82 +10,87 @@
-

- {{ status.published_date | post_date }} +

+ + + {% 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 parent_status.status_type == 'Review' %} + {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to {{ username}}'s review{% endblocktrans %} + {% elif parent_status.status_type == 'Comment' %} + {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to {{ username}}'s comment{% endblocktrans %} + {% elif parent_status.status_type == 'Quotation' %} + {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to {{ username}}'s quote{% endblocktrans %} + {% else %} + {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to {{ username}}'s status{% endblocktrans %} + {% endif %} + + {% endwith %} + {% endif %} + + {% if status.book %} + {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %} + {{ status.book.title }}{% if status.status_type == 'Rating' %}: + + + + {% include 'snippets/stars.html' with rating=status.rating %} + {% endif %} + {% else %} + {% include 'snippets/book_titleby.html' with book=status.book %} + {% endif %} + {% elif status.mention_books %} + + {{ status.mention_books.first.title }} + + {% endif %} +

+

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

- - - {% 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 parent_status.status_type == 'Review' %} - {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to {{ username}}'s review{% endblocktrans %} - {% elif parent_status.status_type == 'Comment' %} - {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to {{ username}}'s comment{% endblocktrans %} - {% elif parent_status.status_type == 'Quotation' %} - {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to {{ username}}'s quote{% endblocktrans %} - {% else %} - {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to {{ username}}'s status{% endblocktrans %} - {% endif %} - - {% endwith %} - {% endif %} - - {% if status.book %} - {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %} - {{ status.book.title }}{% if status.status_type == 'Rating' %}: - - - - {% include 'snippets/stars.html' with rating=status.rating %} - {% endif %} - {% else %} - {% include 'snippets/book_titleby.html' with book=status.book %} - {% endif %} - {% elif status.mention_books %} - {{ status.mention_books.first.title }} - {% endif %} - - {% 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 %}
From 53b47aa2649965589a9b435d46aa1fea8ee454e8 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 21 Apr 2021 21:48:31 +0200 Subject: [PATCH 05/14] Revert "Move card footer container inside the card-footer component" This reverts commit 58aeb72afa6f28ead18888d47438e0704a424e23. --- bookwyrm/templates/components/card.html | 6 ++- .../templates/moderation/report_preview.html | 38 +++++++++---------- bookwyrm/templates/snippets/goal_card.html | 12 +++--- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/bookwyrm/templates/components/card.html b/bookwyrm/templates/components/card.html index 7dc3e1b04..f1104893a 100644 --- a/bookwyrm/templates/components/card.html +++ b/bookwyrm/templates/components/card.html @@ -11,8 +11,10 @@ {% endif %} - {% block card-footer %} - {% endblock %} +
+ {% block card-footer %} + {% endblock %} +
{% block card-bonus %} {% endblock %} diff --git a/bookwyrm/templates/moderation/report_preview.html b/bookwyrm/templates/moderation/report_preview.html index 936c04b8f..363783d50 100644 --- a/bookwyrm/templates/moderation/report_preview.html +++ b/bookwyrm/templates/moderation/report_preview.html @@ -16,24 +16,22 @@ {% endblock %} {% block card-footer %} -
-
-

{% blocktrans with username=report.reporter.display_name path=report.reporter.local_path %}Reported by {{ username }}{% endblocktrans %}

-
-
- {{ report.created_date | naturaltime }} -
-
-
- {% csrf_token %} - -
-
-
+
+

{% blocktrans with username=report.reporter.display_name path=report.reporter.local_path %}Reported by {{ username }}{% endblocktrans %}

+
+
+ {{ report.created_date | naturaltime }} +
+
+
+ {% csrf_token %} + +
+
{% endblock %} diff --git a/bookwyrm/templates/snippets/goal_card.html b/bookwyrm/templates/snippets/goal_card.html index 5014b81cf..329fea542 100644 --- a/bookwyrm/templates/snippets/goal_card.html +++ b/bookwyrm/templates/snippets/goal_card.html @@ -17,11 +17,9 @@ {% endblock %} {% block card-footer %} -
-
- {% csrf_token %} - -

{% blocktrans with path=request.user.local_path %}You can set or change your reading goal any time from your profile page{% endblocktrans %}

-
-
+
+ {% csrf_token %} + +

{% blocktrans with path=request.user.local_path %}You can set or change your reading goal any time from your profile page{% endblocktrans %}

+
{% endblock %} From 415a12cf787682bbf8b0590ccf14c46415e081f2 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 21 Apr 2021 22:30:52 +0200 Subject: [PATCH 06/14] Move H3 tag --- bookwyrm/templates/snippets/status/layout.html | 6 +++--- bookwyrm/templates/snippets/status/status_header.html | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html index 68feb8971..7ef269af8 100644 --- a/bookwyrm/templates/snippets/status/layout.html +++ b/bookwyrm/templates/snippets/status/layout.html @@ -4,9 +4,9 @@ {% 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 %} diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html index 27bce0ca5..ca8b599c0 100644 --- a/bookwyrm/templates/snippets/status/status_header.html +++ b/bookwyrm/templates/snippets/status/status_header.html @@ -10,7 +10,7 @@
-

+

{{ status.published_date|timesince }} {% if status.progress %} From b1fea9845810db0503afcd36e55fb4a4032eacd3 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 21 Apr 2021 22:31:27 +0200 Subject: [PATCH 07/14] Use one card-footer-item per footer button --- .../templates/snippets/status/layout.html | 49 +++++++++---------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html index 7ef269af8..28bfe6213 100644 --- a/bookwyrm/templates/snippets/status/layout.html +++ b/bookwyrm/templates/snippets/status/layout.html @@ -12,8 +12,8 @@ {% block card-content %}{% endblock %} {% block card-footer %} -

- {% if moderation_mode and perms.bookwyrm.moderate_post %} +{% if moderation_mode and perms.bookwyrm.moderate_post %} +
{# moderation options #}
@@ -22,28 +22,28 @@ {% trans "Delete status" %}
- {% elif no_interact %} - {# nothing here #} - {% elif request.user.is_authenticated %} -
-
- {% trans "Reply" as button_text %} - {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text=button_text icon_with_text="comment" class="is-small is-white toggle-button" focus="id_content_reply" %} -
-
- {% include 'snippets/boost_button.html' with status=status %} -
-
- {% include 'snippets/fav_button.html' with status=status %} -
- {% if not moderation_mode %} -
- {% include 'snippets/status/status_options.html' with class="is-small is-white" right=True %} -
- {% endif %} -
+
+{% elif no_interact %} +{# nothing here #} +{% elif request.user.is_authenticated %} +
+ {% trans "Reply" as button_text %} + {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text=button_text icon_with_text="comment" class="is-small is-light is-transparent toggle-button" focus="id_content_reply" %} +
+
+ {% include 'snippets/boost_button.html' with status=status %} +
+
+ {% include 'snippets/fav_button.html' with status=status %} +
+{% if not moderation_mode %} +
+ {% include 'snippets/status/status_options.html' with class="is-small is-light is-transparent" right=True %} +
+{% endif %} - {% else %} +{% else %} +
{% trans "Reply" %} @@ -57,11 +57,10 @@ {% trans "Like status" %} - {% endif %}
+{% endif %} {% endblock %} - {% block card-bonus %} {% if request.user.is_authenticated and not moderation_mode %} {% with status.id|uuid as uuid %} From 0b0a283e641db55c231bb1afc5a2bef776de2f2b Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 21 Apr 2021 22:32:14 +0200 Subject: [PATCH 08/14] Fix buttons styles --- bookwyrm/static/css/bookwyrm.css | 24 +++++++++++++++++++ bookwyrm/templates/snippets/boost_button.html | 12 +++++----- bookwyrm/templates/snippets/fav_button.html | 12 +++++----- .../snippets/status/status_options.html | 4 ++-- .../snippets/toggle/toggle_button.html | 6 ++--- 5 files changed, 41 insertions(+), 17 deletions(-) diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css index 67eb1ebac..0d790e2a9 100644 --- a/bookwyrm/static/css/bookwyrm.css +++ b/bookwyrm/static/css/bookwyrm.css @@ -30,6 +30,30 @@ body { min-width: 75% !important; } +/** Utils + ******************************************************************************/ + +@media only screen and (max-width: 768px) { + .is-sr-only-mobile { + border: none !important; + clip: rect(0,0,0,0) !important; + height: .01em !important; + overflow: hidden !important; + padding: 0 !important; + position: absolute !important; + white-space: nowrap !important; + width: .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 27a6196a9..3a01fc82d 100644 --- a/bookwyrm/templates/snippets/boost_button.html +++ b/bookwyrm/templates/snippets/boost_button.html @@ -4,16 +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 da6e6661f..cd22822a5 100644 --- a/bookwyrm/templates/snippets/fav_button.html +++ b/bookwyrm/templates/snippets/fav_button.html @@ -3,17 +3,17 @@ {% with status.id|uuid as uuid %}
{% csrf_token %} -
{% csrf_token %} -
{% endwith %} diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html index 16d49b3d2..763d09b8d 100644 --- a/bookwyrm/templates/snippets/status/status_options.html +++ b/bookwyrm/templates/snippets/status/status_options.html @@ -3,8 +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 d5a8f3dcd..410f823bd 100644 --- a/bookwyrm/templates/snippets/toggle/toggle_button.html +++ b/bookwyrm/templates/snippets/toggle/toggle_button.html @@ -10,12 +10,12 @@ > {% if icon %} - + {{ text }} {% elif icon_with_text %} - - {{ text }} + + {{ text }} {% else %} {{ text }} {% endif %} From 7a5ea31ee757bc13e4cf76a90b44b1a4825c0ce7 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 21 Apr 2021 22:32:26 +0200 Subject: [PATCH 09/14] Fix progress display in title --- .../templates/snippets/status/status_header.html | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html index ca8b599c0..b833b92c0 100644 --- a/bookwyrm/templates/snippets/status/status_header.html +++ b/bookwyrm/templates/snippets/status/status_header.html @@ -79,14 +79,12 @@

{{ status.published_date|timesince }} {% if status.progress %} - - {% spaceless %} - ({% if status.progress_mode == 'PG' %} - {% include 'snippets/page_text.html' with page=status.progress total_pages=status.book.pages %} + + {% if status.progress_mode == 'PG' %} + ({% include 'snippets/page_text.html' with page=status.progress total_pages=status.book.pages %}) {% else %} - {{ status.progress }}% - {% endif %}) - {% endspaceless %} + ({{ status.progress }}%) + {% endif %} {% endif %} {% include 'snippets/privacy-icons.html' with item=status %} From 2749e6ad9566d059a76bb78505944efcac6d428f Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 21 Apr 2021 22:36:07 +0200 Subject: [PATCH 10/14] Fix CSS for linter --- bookwyrm/static/css/bookwyrm.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css index 0d790e2a9..74fe76ae5 100644 --- a/bookwyrm/static/css/bookwyrm.css +++ b/bookwyrm/static/css/bookwyrm.css @@ -34,15 +34,15 @@ body { ******************************************************************************/ @media only screen and (max-width: 768px) { - .is-sr-only-mobile { + .is-sr-only-mobile { border: none !important; - clip: rect(0,0,0,0) !important; - height: .01em !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: .01em !important; + width: 0.01em !important; } .m-0-mobile { From 15c7a1dc8225c3140231a6a1d602df6a785b6f62 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 22 Apr 2021 20:57:24 +0200 Subject: [PATCH 11/14] Update bookwyrm.css --- bookwyrm/static/css/bookwyrm.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css index 74fe76ae5..fe7617bcc 100644 --- a/bookwyrm/static/css/bookwyrm.css +++ b/bookwyrm/static/css/bookwyrm.css @@ -30,7 +30,7 @@ body { min-width: 75% !important; } -/** Utils +/** Utilities not covered by Bulma ******************************************************************************/ @media only screen and (max-width: 768px) { From de19c7d7a6886a05e8d6761918e089ae5c8491d5 Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 23 Apr 2021 18:38:33 +0200 Subject: [PATCH 12/14] Update status_header.html --- bookwyrm/templates/snippets/status/status_header.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html index b833b92c0..7b2a6f77d 100644 --- a/bookwyrm/templates/snippets/status/status_header.html +++ b/bookwyrm/templates/snippets/status/status_header.html @@ -3,7 +3,7 @@ {% load humanize %}

-
+