Merge branch 'main' into images-django-imagekit

2021-08-02 13:43:59 -06:00
parent 0c83882a11 acab222f8f
commit af34dc6520
58 changed files with 4202 additions and 1234 deletions
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@ -72,6 +72,14 @@ body {
    flex-grow: 1;
 }

+.preserve-whitespace p {
+    white-space: pre-wrap !important;
+}
+
+.display-inline p {
+    display: inline !important;
+}
+
 /** Shelving
 ******************************************************************************/