From b23f4a7e18c3eb7ec59dc967e5b295a333f45385 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 26 Mar 2022 11:00:53 -0700
Subject: [PATCH 1/4] Clip statuses

---
 bookwyrm/templates/snippets/status/content_status.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html
index fed325841..bee4af1dc 100644
--- a/bookwyrm/templates/snippets/status/content_status.html
+++ b/bookwyrm/templates/snippets/status/content_status.html
@@ -37,7 +37,7 @@
             {% endwith %}
         {% endif %}
 
-        <article class="column ml-3-tablet my-3-mobile">
+        <article class="column ml-3-tablet my-3-mobile is-clipped">
             {% if status_type == 'Review' %}
             <header class="mb-2">
                 <h3

From 0666a2d02ffcc72d9e317eb196bf71d738344dfc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 26 Mar 2022 11:07:58 -0700
Subject: [PATCH 2/4] Remove transparent class on interaction buttons

---
 bookwyrm/templates/snippets/status/layout.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html
index 4e5b75cc0..3dd576fee 100644
--- a/bookwyrm/templates/snippets/status/layout.html
+++ b/bookwyrm/templates/snippets/status/layout.html
@@ -32,7 +32,7 @@
 
     <div class="card-footer-item">
         {% 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/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 toggle-button" focus="id_content_reply" %}
     </div>
     <div class="card-footer-item">
         {% include 'snippets/boost_button.html' with status=status %}
@@ -42,7 +42,7 @@
     </div>
     {% if not moderation_mode %}
     <div class="card-footer-item">
-        {% include 'snippets/status/status_options.html' with class="is-small is-light is-transparent" right=True %}
+        {% include 'snippets/status/status_options.html' with class="is-small is-light" right=True %}
     </div>
     {% endif %}
 

From 23ff58a62b364cf71df669737144fc686ada6220 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 26 Mar 2022 11:35:24 -0700
Subject: [PATCH 3/4] Fixes scrollbar colors in dark mode

---
 bookwyrm/static/css/bookwyrm/_all.scss         | 12 ++++++++++++
 bookwyrm/static/css/themes/bookwyrm-dark.scss  |  2 ++
 bookwyrm/static/css/themes/bookwyrm-light.scss |  2 ++
 3 files changed, 16 insertions(+)

diff --git a/bookwyrm/static/css/bookwyrm/_all.scss b/bookwyrm/static/css/bookwyrm/_all.scss
index 79e5cf52c..31e732ebe 100644
--- a/bookwyrm/static/css/bookwyrm/_all.scss
+++ b/bookwyrm/static/css/bookwyrm/_all.scss
@@ -36,6 +36,18 @@ body {
     flex-direction: column;
 }
 
+::-webkit-scrollbar {
+    width: 12px;
+    height: 12px;
+}
+::-webkit-scrollbar-thumb {
+    background: $scrollbar-thumb;
+    border-radius: 0.5em;
+}
+::-webkit-scrollbar-track {
+    background: $scrollbar-track;
+}
+
 button {
     border: none;
     margin: 0;
diff --git a/bookwyrm/static/css/themes/bookwyrm-dark.scss b/bookwyrm/static/css/themes/bookwyrm-dark.scss
index 0a4f6f23e..96997c4a4 100644
--- a/bookwyrm/static/css/themes/bookwyrm-dark.scss
+++ b/bookwyrm/static/css/themes/bookwyrm-dark.scss
@@ -28,6 +28,8 @@ $background-body: rgb(24, 27, 28);
 $background-secondary: rgb(28, 30, 32);
 $background-tertiary: rgb(32, 34, 36);
 $modal-background-background-color: rgba($black, 0.8);
+$scrollbar-track: $background-secondary;
+$scrollbar-thumb: $light;
 
 /* highlight colors */
 $primary-highlight: $primary;
diff --git a/bookwyrm/static/css/themes/bookwyrm-light.scss b/bookwyrm/static/css/themes/bookwyrm-light.scss
index c74d2ee20..69c1a8063 100644
--- a/bookwyrm/static/css/themes/bookwyrm-light.scss
+++ b/bookwyrm/static/css/themes/bookwyrm-light.scss
@@ -19,6 +19,8 @@ $scheme-main: $white-bis;
 $background-body: $white;
 $background-secondary: $white-ter;
 $background-tertiary: $white-bis;
+$scrollbar-track: $background-secondary;
+$scrollbar-thumb: $grey-lighter;
 
 /* highlight colors */
 $primary-highlight: $primary-light;

From 3ebc800a9b03815d8abb496d77354dd7a6dbb620 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 26 Mar 2022 11:38:00 -0700
Subject: [PATCH 4/4] Fixes progress bar color in dark mode

---
 bookwyrm/templates/snippets/goal_progress.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/goal_progress.html b/bookwyrm/templates/snippets/goal_progress.html
index bc8fd53b7..ae14bb915 100644
--- a/bookwyrm/templates/snippets/goal_progress.html
+++ b/bookwyrm/templates/snippets/goal_progress.html
@@ -14,6 +14,11 @@
     {% blocktrans with username=goal.user.display_name read_count=progress.count|intcomma goal_count=goal.goal|intcomma path=goal.local_path %}{{ username }} has read <a href="{{ path }}">{{ read_count }} of {{ goal_count}} books</a>.{% endblocktrans %}
     {% endif %}
 </p>
-<progress class="progress is-large" value="{{ progress.count }}" max="{{ goal.goal }}" aria-hidden="true">{{ progress.percent }}%</progress>
+<progress
+    class="progress is-large is-primary"
+    value="{{ progress.count }}"
+    max="{{ goal.goal }}"
+    aria-hidden="true"
+>{{ progress.percent }}%</progress>
 
 {% endwith %}