aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-10-20 13:10:26 +0200
committerMorris Jobke <hey@morrisjobke.de>2016-10-20 13:10:26 +0200
commitb3f2771d3c5feff7c400b0026560c90a58054b2d (patch)
treecfc8a057d0b6be70bb1492819a3b5cc85bc4124e
parent19e1ff1b0f8db0915921d0a2ecb3f68fa06cf9cb (diff)
downloadnextcloud-server-b3f2771d3c5feff7c400b0026560c90a58054b2d.tar.gz
nextcloud-server-b3f2771d3c5feff7c400b0026560c90a58054b2d.zip
Improve the styling
* remove the scrollbar (content did an overflow due to a min-width) * have proper padding on the right too - padding is 15px on all sides for .oc-dialog Signed-off-by: Morris Jobke <hey@morrisjobke.de>
-rw-r--r--core/css/styles.css4
-rw-r--r--core/js/jquery.ocdialog.js4
2 files changed, 6 insertions, 2 deletions
diff --git a/core/css/styles.css b/core/css/styles.css
index aeb2a5a7363..94e60562ad8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -786,6 +786,10 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
background-color:white;
width:100%;
}
+#oc-dialog-filepicker-content #filestable.filelist {
+ /* prevent the filepicker to overflow */
+ min-width: initial;
+}
#oc-dialog-filepicker-content .filelist td {
padding: 14px;
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index e26555bd63c..66c7d9bd7f1 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -184,11 +184,11 @@
if (content_height> 0) {
this.element.css({
height: content_height + 'px',
- width: this.$dialog.innerWidth()-20 + 'px'
+ width: this.$dialog.innerWidth() - 30 + 'px'
});
} else {
this.element.css({
- width : this.$dialog.innerWidth() - 20 + 'px'
+ width : this.$dialog.innerWidth() - 30 + 'px'
});
}
},