diff --git a/cps/constants.py b/cps/constants.py index 89810e90..c1bcbe59 100644 --- a/cps/constants.py +++ b/cps/constants.py @@ -113,7 +113,8 @@ del env_CALIBRE_PORT EXTENSIONS_AUDIO = {'mp3', 'mp4', 'ogg', 'opus', 'wav', 'flac', 'm4a', 'm4b'} -EXTENSIONS_CONVERT = ['pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2', 'lit', 'lrf', 'txt', 'htmlz', 'rtf', 'odt'] +EXTENSIONS_CONVERT_FROM = ['pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2', 'lit', 'lrf', 'txt', 'htmlz', 'rtf', 'odt','cbz','cbr'] +EXTENSIONS_CONVERT_TO = ['pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2', 'lit', 'lrf', 'txt', 'htmlz', 'rtf', 'odt'] EXTENSIONS_UPLOAD = {'txt', 'pdf', 'epub', 'kepub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'djvu', 'prc', 'doc', 'docx', 'fb2', 'html', 'rtf', 'lit', 'odt', 'mp3', 'mp4', 'ogg', 'opus', 'wav', 'flac', 'm4a', 'm4b'} diff --git a/cps/static/css/caliBlur.css b/cps/static/css/caliBlur.css index 490f652f..383f7e37 100644 --- a/cps/static/css/caliBlur.css +++ b/cps/static/css/caliBlur.css @@ -1461,7 +1461,8 @@ body > div.container-fluid > div > div.col-sm-10 > div > form > a:hover { -webkit-box-shadow: 0 0 2px rgba(0, 0, 0, .35); box-shadow: 0 0 2px rgba(0, 0, 0, .35); position: relative; - z-index: -9 + z-index: -9; + width: 150px !important; } #books > .cover > a, #books_rand > .cover > a, .book.isotope-item > .cover > a, body > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > form > div.col-sm-12 > div.col-sm-12 > div.col-sm-2 > a { diff --git a/cps/static/css/style.css b/cps/static/css/style.css index 2294d326..3d6256b2 100644 --- a/cps/static/css/style.css +++ b/cps/static/css/style.css @@ -107,6 +107,11 @@ a, .danger,.book-remove, .editable-empty, .editable-empty:hover { color: #45b29d text-decoration: none; } +.row.display-flex { + display: flex; + flex-wrap: wrap; +} + .container-fluid img { display: block; max-width: 100%; @@ -116,7 +121,11 @@ a, .danger,.book-remove, .editable-empty, .editable-empty:hover { color: #45b29d .container-fluid .discover{ margin-bottom: 50px; } .container-fluid .new-books { border-top: 1px solid #ccc; } .container-fluid .new-books h2 { margin: 50px 0 0 0; } -.container-fluid .book { margin-top: 20px; } +.container-fluid .book { + margin-top: 20px; + display: flex; + flex-direction: column; +} .container-fluid .book .cover { height: 225px; diff --git a/cps/templates/author.html b/cps/templates/author.html index f043e618..63dd175a 100644 --- a/cps/templates/author.html +++ b/cps/templates/author.html @@ -34,7 +34,7 @@