Merge branch 'main' into progress-update-ui

bookwyrm/static/css/fonts/.editorconfig

@@ -0,0 +1,4 @@
+# @see https://editorconfig.org/
+
+[*.svg]
+insert_final_newline = unset

bookwyrm/static/css/format.css

@@ -67,8 +67,8 @@ html {
     content: '\e9d9';
 }
 .form-rate-stars label.icon:hover:before {
-     content: '\e9d9';
- }
+    content: '\e9d9';
+}
 .form-rate-stars label.icon:hover ~ label.icon:before{
     content: '\e9d7';
 }

bookwyrm/static/css/icons.css

@@ -1,153 +1,153 @@
 @font-face {
-  font-family: 'icomoon';
-  src:  url('fonts/icomoon.eot?n5x55');
-  src:  url('fonts/icomoon.eot?n5x55#iefix') format('embedded-opentype'),
-    url('fonts/icomoon.ttf?n5x55') format('truetype'),
-    url('fonts/icomoon.woff?n5x55') format('woff'),
-    url('fonts/icomoon.svg?n5x55#icomoon') format('svg');
-  font-weight: normal;
-  font-style: normal;
-  font-display: block;
+    font-family: 'icomoon';
+    src:  url('fonts/icomoon.eot?n5x55');
+    src:  url('fonts/icomoon.eot?n5x55#iefix') format('embedded-opentype'),
+        url('fonts/icomoon.ttf?n5x55') format('truetype'),
+        url('fonts/icomoon.woff?n5x55') format('woff'),
+        url('fonts/icomoon.svg?n5x55#icomoon') format('svg');
+    font-weight: normal;
+    font-style: normal;
+    font-display: block;
 }
 
 [class^="icon-"], [class*=" icon-"] {
-  /* use !important to prevent issues with browser extensions that change fonts */
-  font-family: 'icomoon' !important;
-  speak: never;
-  font-style: normal;
-  font-weight: normal;
-  font-variant: normal;
-  text-transform: none;
-  line-height: 1;
+    /* use !important to prevent issues with browser extensions that change fonts */
+    font-family: 'icomoon' !important;
+    speak: never;
+    font-style: normal;
+    font-weight: normal;
+    font-variant: normal;
+    text-transform: none;
+    line-height: 1;
 
-  /* Better Font Rendering =========== */
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
+    /* Better Font Rendering =========== */
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 }
 
 .icon-graphic-heart:before {
-  content: "\e91e";
+    content: "\e91e";
 }
 .icon-graphic-paperplane:before {
-  content: "\e91f";
+    content: "\e91f";
 }
 .icon-graphic-banknote:before {
-  content: "\e920";
+    content: "\e920";
 }
 .icon-stars:before {
-  content: "\e91a";
+    content: "\e91a";
 }
 .icon-warning:before {
-  content: "\e91b";
+    content: "\e91b";
 }
 .icon-book:before {
-  content: "\e900";
+    content: "\e900";
 }
 .icon-bookmark:before {
-  content: "\e91c";
+    content: "\e91c";
 }
 .icon-rss:before {
-  content: "\e91d";
+    content: "\e91d";
 }
 .icon-envelope:before {
-  content: "\e901";
+    content: "\e901";
 }
 .icon-arrow-right:before {
-  content: "\e902";
+    content: "\e902";
 }
 .icon-bell:before {
-  content: "\e903";
+    content: "\e903";
 }
 .icon-x:before {
-  content: "\e904";
+    content: "\e904";
 }
 .icon-quote-close:before {
-  content: "\e905";
+    content: "\e905";
 }
 .icon-quote-open:before {
-  content: "\e906";
+    content: "\e906";
 }
 .icon-image:before {
-  content: "\e907";
+    content: "\e907";
 }
 .icon-pencil:before {
-  content: "\e908";
+    content: "\e908";
 }
 .icon-list:before {
-  content: "\e909";
+    content: "\e909";
 }
 .icon-unlock:before {
-  content: "\e90a";
+    content: "\e90a";
 }
 .icon-unlisted:before {
-  content: "\e90a";
+    content: "\e90a";
 }
 .icon-globe:before {
-  content: "\e90b";
+    content: "\e90b";
 }
 .icon-public:before {
-  content: "\e90b";
+    content: "\e90b";
 }
 .icon-lock:before {
-  content: "\e90c";
+    content: "\e90c";
 }
 .icon-followers:before {
-  content: "\e90c";
+    content: "\e90c";
 }
 .icon-chain-broken:before {
-  content: "\e90d";
+    content: "\e90d";
 }
 .icon-chain:before {
-  content: "\e90e";
+    content: "\e90e";
 }
 .icon-comments:before {
-  content: "\e90f";
+    content: "\e90f";
 }
 .icon-comment:before {
-  content: "\e910";
+    content: "\e910";
 }
 .icon-boost:before {
-  content: "\e911";
+    content: "\e911";
 }
 .icon-arrow-left:before {
-  content: "\e912";
+    content: "\e912";
 }
 .icon-arrow-up:before {
-  content: "\e913";
+    content: "\e913";
 }
 .icon-arrow-down:before {
-  content: "\e914";
+    content: "\e914";
 }
 .icon-home:before {
-  content: "\e915";
+    content: "\e915";
 }
 .icon-local:before {
-  content: "\e916";
+    content: "\e916";
 }
 .icon-dots-three:before {
-  content: "\e917";
+    content: "\e917";
 }
 .icon-check:before {
-  content: "\e918";
+    content: "\e918";
 }
 .icon-dots-three-vertical:before {
-  content: "\e919";
+    content: "\e919";
 }
 .icon-search:before {
-  content: "\e986";
+    content: "\e986";
 }
 .icon-star-empty:before {
-  content: "\e9d7";
+    content: "\e9d7";
 }
 .icon-star-half:before {
-  content: "\e9d8";
+    content: "\e9d8";
 }
 .icon-star-full:before {
-  content: "\e9d9";
+    content: "\e9d9";
 }
 .icon-heart:before {
-  content: "\e9da";
+    content: "\e9da";
 }
 .icon-plus:before {
-  content: "\ea0a";
+    content: "\ea0a";
 }

bookwyrm/static/js/tabs.js

@@ -59,7 +59,9 @@ class TabGroup {
     }
 
     initPanels() {
-        let selectedPanelId = this.tablist.querySelector('[role="tab"][aria-selected="true"]').getAttribute("aria-controls");
+        let selectedPanelId = this.tablist
+            .querySelector('[role="tab"][aria-selected="true"]')
+            .getAttribute("aria-controls");
         for(let panel of this.panels) {
             if(panel.getAttribute("id") !== selectedPanelId) {
                 panel.setAttribute("hidden", "");

bookwyrm/templates/import.html

@@ -11,16 +11,16 @@
         {% csrf_token %}
 
         <label class="label" for="source">
-          <p>{% trans "Data source" %}</p>
+            <p>{% trans "Data source" %}</p>
         <div class="select {{ class }}">
-          <select name="source" id="source">
-            <option value="GoodReads" {% if current == 'GoodReads' %}selected{% endif %}>
-            GoodReads
-            </option>
-            <option value="LibraryThing" {% if current == 'LibraryThing' %}selected{% endif %}>
-            LibraryThing
-            </option>
-          </select>
+            <select name="source" id="source">
+                <option value="GoodReads" {% if current == 'GoodReads' %}selected{% endif %}>
+                    GoodReads
+                </option>
+                <option value="LibraryThing" {% if current == 'LibraryThing' %}selected{% endif %}>
+                    LibraryThing
+                </option>
+            </select>
         </div>
         </label>
 

bookwyrm/templates/snippets/shelve_button/progress_update_modal.html

@@ -18,8 +18,12 @@
         <div class="control">
             <input
              aria-label="{% if readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}"
-             class="input" type="number" min="0"
-             name="progress" size="3" value="{{ readthrough.progress|default:'' }}">
+             class="input"
+             type="number"
+             min="0"
+             name="progress"
+             size="3"
+             value="{{ readthrough.progress|default:'' }}">
         </div>
         <div class="control select">
             <select name="progress_mode" aria-label="Progress mode">

bookwyrm/tests/data/ol_isbn_search.json

@@ -1,45 +1,45 @@
 {
-  "ISBN:9782070427796": {
-    "url": "https://openlibrary.org/books/OL16262504M/Les_ombres_errantes",
-    "key": "/books/OL16262504M",
-    "title": "Les ombres errantes",
-    "authors": [
-      {
-        "url": "https://openlibrary.org/authors/OL269675A/Pascal_Quignard",
-        "name": "Pascal Quignard"
-      }
-    ],
-    "by_statement": "Pascal Quignard.",
-    "identifiers": {
-      "goodreads": [
-        "1835483"
-      ],
-      "librarything": [
-        "983474"
-      ],
-      "isbn_10": [
-        "207042779X"
-      ],
-      "openlibrary": [
-        "OL16262504M"
-      ]
-    },
-    "classifications": {
-      "dewey_decimal_class": [
-        "848/.91403"
-      ]
-    },
-    "publishers": [
-      {
-        "name": "Gallimard"
-      }
-    ],
-    "publish_places": [
-      {
-        "name": "Paris"
-      }
-    ],
-    "publish_date": "2002",
-    "notes": "Hardback published Grasset, 2002."
-  }
+    "ISBN:9782070427796": {
+        "url": "https://openlibrary.org/books/OL16262504M/Les_ombres_errantes",
+        "key": "/books/OL16262504M",
+        "title": "Les ombres errantes",
+        "authors": [
+            {
+                "url": "https://openlibrary.org/authors/OL269675A/Pascal_Quignard",
+                "name": "Pascal Quignard"
+            }
+        ],
+        "by_statement": "Pascal Quignard.",
+        "identifiers": {
+            "goodreads": [
+                "1835483"
+            ],
+            "librarything": [
+                "983474"
+            ],
+            "isbn_10": [
+                "207042779X"
+            ],
+            "openlibrary": [
+                "OL16262504M"
+            ]
+        },
+        "classifications": {
+            "dewey_decimal_class": [
+                "848/.91403"
+            ]
+        },
+        "publishers": [
+            {
+                "name": "Gallimard"
+            }
+        ],
+        "publish_places": [
+            {
+                "name": "Paris"
+            }
+        ],
+        "publish_date": "2002",
+        "notes": "Hardback published Grasset, 2002."
+    }
 }