Merge branch 'master' into Develop

# Conflicts: # test/Calibre-Web TestSummary_Linux.html
2021-08-30 20:18:21 +02:00
parent c0a06eec46 42ef049b63
commit e3db2796c9
45 changed files with 3250 additions and 3239 deletions
@@ -6490,7 +6490,9 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
        height: 150px;
        margin-bottom: 0
    }
-
+    .container-fluid .book .cover img {
+    width: 100px !important;
+    }
    #books .cover img, #books_rand .cover img, .book.isotope-item .cover img {
        width: 100px !important
    }