diff --git a/common/static/scss/_mark.scss b/common/static/scss/_mark.scss index 3f68276c..52db3502 100644 --- a/common/static/scss/_mark.scss +++ b/common/static/scss/_mark.scss @@ -27,11 +27,11 @@ ul.log-list { footer.log-command { display: flex; justify-content: flex-end; -// flex-direction: row-reverse; + .action { - display: flex; /* Align items within each span */ - align-items: center; /* Center items vertically */ - margin-right: 10px; /* Add some spacing between items */ + display: flex; + align-items: center; + margin-right: 10px; } } @media (max-width: 768px) { diff --git a/journal/urls.py b/journal/urls.py index d76b3cc8..55f26547 100644 --- a/journal/urls.py +++ b/journal/urls.py @@ -24,7 +24,9 @@ urlpatterns = [ path("comment/", comment, name="comment"), path("mark_log//", mark_log, name="mark_log"), path("mark_history/", mark_history, name="mark_history"), - path("mark_history/edit/", mark_history_edit, name="mark_history_edit"), + path( + "mark_history/edit/", mark_history_edit, name="mark_history_edit" + ), path( "add_to_collection/", add_to_collection, name="add_to_collection" ), diff --git a/journal/views.py b/journal/views.py index 6106b025..6be88971 100644 --- a/journal/views.py +++ b/journal/views.py @@ -162,7 +162,7 @@ def mark(request, item_uuid): silence = request.POST.get("silence", False) mark.delete(silence=silence) if ( - silence + silence ): # this means the mark is deleted from mark_history, thus redirect to item page return redirect( reverse("catalog:retrieve", args=[item.url_path, item.uuid]) @@ -408,10 +408,10 @@ def collection_retrieve(request, collection_uuid): else None ) available_as_featured = ( - request.user.is_authenticated - and (following or request.user == collection.owner) - and not featured_since - and collection.members.all().exists() + request.user.is_authenticated + and (following or request.user == collection.owner) + and not featured_since + and collection.members.all().exists() ) stats = {} if featured_since: @@ -728,13 +728,13 @@ def render_list_not_fount(request): def _render_list( - request, user_name, type, shelf_type=None, item_category=None, tag_title=None + request, user_name, type, shelf_type=None, item_category=None, tag_title=None ): user = User.get(user_name) if user is None: return render_user_not_found(request) if user != request.user and ( - request.user.is_blocked_by(user) or request.user.is_blocking(user) + request.user.is_blocked_by(user) or request.user.is_blocking(user) ): return render_user_blocked(request) tag = None @@ -806,8 +806,8 @@ def user_tag_edit(request): reverse("journal:user_tag_list", args=[request.user.mastodon_acct]) ) elif ( - tag_title != tag.title - and Tag.objects.filter(owner=request.user, title=tag_title).exists() + tag_title != tag.title + and Tag.objects.filter(owner=request.user, title=tag_title).exists() ): msg.error(request.user, _("标签已存在")) return HttpResponseRedirect(request.META.get("HTTP_REFERER")) @@ -836,7 +836,7 @@ def user_tag_list(request, user_name): if user is None: return render_user_not_found(request) if user != request.user and ( - request.user.is_blocked_by(user) or request.user.is_blocking(user) + request.user.is_blocked_by(user) or request.user.is_blocking(user) ): return render_user_blocked(request) tags = Tag.objects.filter(owner=user) @@ -859,7 +859,7 @@ def user_collection_list(request, user_name): if user is None: return render_user_not_found(request) if user != request.user and ( - request.user.is_blocked_by(user) or request.user.is_blocking(user) + request.user.is_blocked_by(user) or request.user.is_blocking(user) ): return render_user_blocked(request) collections = Collection.objects.filter(owner=user) @@ -884,7 +884,7 @@ def user_liked_collection_list(request, user_name): if user is None: return render_user_not_found(request) if user != request.user and ( - request.user.is_blocked_by(user) or request.user.is_blocking(user) + request.user.is_blocked_by(user) or request.user.is_blocking(user) ): return render_user_blocked(request) collections = Collection.objects.filter(likes__owner=user) @@ -912,7 +912,7 @@ def profile(request, user_name): if not request.user.is_authenticated and user.get_preference().no_anonymous_view: return render(request, "users/home_anonymous.html", {"user": user}) if user != request.user and ( - user.is_blocked_by(request.user) or user.is_blocking(request.user) + user.is_blocked_by(request.user) or user.is_blocking(request.user) ): return render_user_blocked(request)