summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2014-04-29 15:34:48 +0200
committerMorris Jobke <morris.jobke@gmail.com>2014-04-29 15:34:48 +0200
commit14e568b13c7d767e5c9011254392969ee10cf444 (patch)
treecd257117f05adef088b577a8cccd1062383e4bd1 /core
parent6b02126dc1c8ba9de5b87c6c8568feea5948d2a0 (diff)
downloadnextcloud-server-14e568b13c7d767e5c9011254392969ee10cf444.tar.gz
nextcloud-server-14e568b13c7d767e5c9011254392969ee10cf444.zip
fix oc dialog because the body isn't 100% x 100% in dimensions anymore
Diffstat (limited to 'core')
-rw-r--r--core/css/jquery.ocdialog.css7
-rw-r--r--core/js/jquery.ocdialog.js4
2 files changed, 5 insertions, 6 deletions
diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css
index a1221137bc4..4dccba2d0c5 100644
--- a/core/css/jquery.ocdialog.css
+++ b/core/css/jquery.ocdialog.css
@@ -24,12 +24,11 @@
}
.oc-dialog-buttonrow {
background: white;
- float: right;
- position: relative;
- bottom: 0;
+ position: absolute;
+ bottom: 15px;
+ right: 15px;
display: block;
margin-top: 10px;
- width: 100%;
}
.oc-dialog-close {
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index 02cd6ac1466..b91f3ed7654 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -67,8 +67,8 @@
self.parent = self.$dialog.parent().length > 0 ? self.$dialog.parent() : $('body');
var pos = self.parent.position();
self.$dialog.css({
- left: pos.left + (self.parent.width() - self.$dialog.outerWidth())/2,
- top: pos.top + (self.parent.height() - self.$dialog.outerHeight())/2
+ left: pos.left + (window.innerWidth - self.$dialog.outerWidth())/2,
+ top: pos.top + (window.innerHeight - self.$dialog.outerHeight())/2
});
});