wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move more sizing logic to css

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2016-11-28 14:05:46 +01:00
parent 7ac240f6f2
commit b2b9abfa33
No known key found for this signature in database
GPG key ID: 425003AC385454C5
4 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/css/jquery.ocdialog.css
View file

@ -26,8 +26,8 @@
background: transparent;
right: 0;
bottom: 0;
padding: 20px;
padding-bottom: 10px;
padding: 10px;
padding-bottom: 0;
box-sizing: border-box;
width: 100%;
background-image: linear-gradient(rgba(255, 255, 255, 0), rgba(255, 255, 255, 1));
@ -70,3 +70,7 @@
top: 0; left: 0;
width: 100%; height: 100%;
}
.oc-dialog-content {
width: 100%;
}

2
core/css/styles.css
View file

@ -773,7 +773,7 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
box-sizing: border-box;
display: inline-block;
overflow-y: auto;
height: calc(100% + 20px); /** overflow under the button row */
height: 100%; /** overflow under the button row */
width: 100%;
padding-bottom: 55px;
}

23
core/js/jquery.ocdialog.js
View file

@ -159,27 +159,16 @@
$.Widget.prototype._setOptions.apply(this, arguments);
},
_setSizes: function() {
var content_height = this.$dialog.height();
var lessHeight = 0;
if(this.$title) {
content_height -= this.$title.outerHeight(true);
lessHeight += this.$title.outerHeight(true);
}
if(this.$buttonrow) {
content_height -= this.$buttonrow.outerHeight(true);
}
this.parent = this.$dialog.parent().length > 0 ? this.$dialog.parent() : $('body');
if (this.parent.height() > 0) {
content_height = Math.min(content_height, this.parent.height() - 20);
}
if (content_height> 0) {
this.element.css({
height: content_height + 'px',
width: this.$dialog.innerWidth() - 30 + 'px'
});
} else {
this.element.css({
width : this.$dialog.innerWidth() - 30 + 'px'
});
lessHeight += this.$buttonrow.outerHeight(true);
}
this.element.css({
'height': 'calc(100% - ' + lessHeight + 'px)'
});
},
_createOverlay: function() {
if(!this.options.modal) {

4
core/js/oc-dialogs.js
View file

@ -232,8 +232,8 @@ var OCdialogs = {
self.$filePicker.ocdialog({
closeOnEscape: true,
// max-width of 600
width: Math.min((4/5)*$(document).width(), 600),
height: Math.min((4 / 5) * $(document).height(), 500),
width: 600,
height: 500,
modal: modal,
buttons: buttonlist,
close: function() {