diff --git a/common/static/scss/_item.scss b/common/static/scss/_item.scss index 495a89f0..f0c2740e 100644 --- a/common/static/scss/_item.scss +++ b/common/static/scss/_item.scss @@ -47,7 +47,7 @@ transition: transform 0.2s ease-in-out; filter: drop-shadow(0 0.2rem 0.8rem rgba(0, 0, 0, 0.2)); max-width: 80%; - max-height: 50vh; + max-height: 18rem; } .item-edit, diff --git a/common/static/scss/_layout.scss b/common/static/scss/_layout.scss index 6528aa52..7557379c 100644 --- a/common/static/scss/_layout.scss +++ b/common/static/scss/_layout.scss @@ -1,5 +1,5 @@ :root { - --pico-font-size: 90%; + --pico-font-size: 100%; } @media (max-width: 1200px) { diff --git a/journal/models.py b/journal/models.py index d317412e..744240c2 100644 --- a/journal/models.py +++ b/journal/models.py @@ -1048,13 +1048,15 @@ class Mark: @property def action_label(self): - return ( - self.owner.shelf_manager.get_action_label( + if self.shelfmember: + return self.owner.shelf_manager.get_action_label( self.shelf_type, self.item.category ) - if self.shelfmember - else None - ) + if self.comment: + return self.owner.shelf_manager.get_action_label( + ShelfType.PROGRESS, self.comment.item.category + ) + return "" @property def shelf_label(self):