mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-01 05:49:58 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'dialog/master'

Browse Source 
Fix for #833
This commit is contained in:
Ozzieisaacs 2019-03-09 20:02:17 +01:00
commit 0b0e62fdf2
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cps/static/css/style.css
View File

@ -130,3 +130,7 @@ input.pill:not(:checked) + label .glyphicon {
.editable-cancel { margin-bottom: 0px !important; margin-left: 7px !important;} .editable-cancel { margin-bottom: 0px !important; margin-left: 7px !important;}
.editable-submit { margin-bottom: 0px !important;} .editable-submit { margin-bottom: 0px !important;}
.modal-body .comments {
max-height:300px;
overflow-y: auto;
}

2
cps/static/css/upload.css
View File

@ -1,5 +1,5 @@
@media (min-device-width: 768px) { @media (min-device-width: 768px) {
.modal-dialog { .upload-modal-dialog {
position: absolute; position: absolute;
top: 45%; top: 45%;
left: 50%; left: 50%;

4
cps/static/js/caliBlur.js
View File

@ -411,8 +411,8 @@ $( 'div.comments' ).readmore( {
collapsedHeight: 134, collapsedHeight: 134,
heightMargin: 45, heightMargin: 45,
speed: 300, speed: 300,
moreLink: '<a href="#">READ MORE</a>', moreLink: '<a href="#">READ MORE</a>', // ToDo: make translateable
lessLink: '<a href="#">READ LESS</a>', lessLink: '<a href="#">READ LESS</a>', // ToDo: make translateable
}); });
///////////////////////////////// /////////////////////////////////
// End of Global Work // // End of Global Work //

2
cps/static/js/uploadprogress.js
View File

@ -19,7 +19,7 @@
} }
var template = "<div class=\"modal fade\" id=\"file-progress-modal\">" + var template = "<div class=\"modal fade\" id=\"file-progress-modal\">" +
"<div class=\"modal-dialog\">" + "<div class=\"modal-dialog upload-modal-dialog\">" +
" <div class=\"modal-content\">" + " <div class=\"modal-content\">" +
" <div class=\"modal-header\">" + " <div class=\"modal-header\">" +
" <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\"><span aria-hidden=\"true\">&times;</span></button>" + " <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\"><span aria-hidden=\"true\">&times;</span></button>" +