Merge branch 'main' into bw-dev-npm-fix

bookwyrm/static/css/bookwyrm/_all.scss

@@ -34,6 +34,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;
@@ -125,13 +137,6 @@ button:focus-visible .button-invisible-overlay {
     opacity: 1;
 }
 
-/** Tooltips
- ******************************************************************************/
-
-.tooltip {
-    width: 100%;
-}
-
 /** States
  ******************************************************************************/
 

bookwyrm/static/css/bookwyrm/components/_details.scss

@@ -114,3 +114,17 @@ details[open] summary .details-close {
         padding-bottom: 0.25rem;
     }
 }
+
+/** Navbar details
+ ******************************************************************************/
+
+#navbar-dropdown .navbar-item {
+    color: $text;
+    font-size: 0.875rem;
+    padding: 0.375rem 3rem 0.375rem 1rem;
+    white-space: nowrap;
+}
+
+#navbar-dropdown .navbar-item:hover {
+    background-color: $background-secondary;
+}

bookwyrm/static/css/bookwyrm/utilities/_colors.scss

@@ -23,3 +23,8 @@
 .has-background-tertiary {
     background-color: $background-tertiary !important;
 }
+
+/* Workaround for dark theme as .has-text-black doesn't give desired effect. */
+.has-text-default {
+    color: $text !important;
+}

bookwyrm/static/css/themes/bookwyrm-dark.scss

@@ -8,7 +8,9 @@ $primary: #005e50;
 $primary-light: #1d2b28;
 $info: #1f4666;
 $success: #246447;
+$success-light: #0d2f1e;
 $warning: #8b6c15;
+$warning-light: #372e13;
 $danger: #872538;
 $danger-light: #481922;
 $light: #393939;
@@ -26,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;
@@ -49,6 +53,7 @@ $link-hover: $white-bis;
 $link-hover-border: #51595d;
 $link-focus: $white-bis;
 $link-active: $white-bis;
+$link-light: #0d1c26;
 
 /* bulma overrides */
 $background: $background-secondary;
@@ -79,5 +84,13 @@ $progress-value-background-color: $border-light;
 $family-primary: $family-sans-serif;
 $family-secondary: $family-sans-serif;
 
+.has-text-muted {
+    color: $grey-lighter !important;
+}
+
+.has-text-more-muted {
+    color: $grey-light !important;
+}
+
 @import "../bookwyrm";
 @import "../vendor/icons.css";

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;
@@ -55,5 +57,14 @@ $invisible-overlay-background-color: rgba($scheme-invert, 0.66);
 $family-primary: $family-sans-serif;
 $family-secondary: $family-sans-serif;
 
+
+.has-text-muted {
+    color: $grey-dark !important;
+}
+
+.has-text-more-muted {
+    color: $grey !important;
+}
+
 @import "../bookwyrm";
 @import "../vendor/icons.css";

bookwyrm/static/js/status_cache.js

@@ -203,6 +203,8 @@ let StatusCache = new (class {
             .forEach((item) => (item.disabled = false));
 
         next_identifier = next_identifier == "complete" ? "read" : next_identifier;
+        next_identifier =
+            next_identifier == "stopped-reading-complete" ? "stopped-reading" : next_identifier;
 
         // Disable the current state
         button.querySelector(