Commit 0b0e62fd authored by Ozzieisaacs's avatar Ozzieisaacs

Merge remote-tracking branch 'dialog/master'

Fix for #833
parents 6f80a63c 3dfc2f25
...@@ -130,3 +130,7 @@ input.pill:not(:checked) + label .glyphicon { ...@@ -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;
}
@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%;
......
...@@ -411,8 +411,8 @@ $( 'div.comments' ).readmore( { ...@@ -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 //
......
...@@ -19,7 +19,7 @@ ...@@ -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>" +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment