diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-08-01 08:36:20 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-08-01 08:36:20 +0200 |
| commit | b3157172a0df2acb5737cbea2fbd9645b31b613d (patch) | |
| tree | 0fe789e3498fb27ad625ced5b8c0e71008aec4fa | |
| parent | 86cdfa3db3a3704678df353a63a20997589ef1fe (diff) | |
| parent | 79305a0476a42cc0068eb77320553f2d26dada28 (diff) | |
| download | nextcloud-server-b3157172a0df2acb5737cbea2fbd9645b31b613d.tar.gz nextcloud-server-b3157172a0df2acb5737cbea2fbd9645b31b613d.zip | |
Merge pull request #10085 from owncloud/fixes-for-filepicker
Fixes for filepicker
| -rw-r--r-- | core/css/mobile.css | 9 | ||||
| -rw-r--r-- | core/css/styles.css | 9 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/core/css/mobile.css b/core/css/mobile.css index 21090d08cb7..0310b0228e2 100644 --- a/core/css/mobile.css +++ b/core/css/mobile.css @@ -152,6 +152,15 @@ table.multiselect thead { } +/* do not show dates in filepicker */ +#oc-dialog-filepicker-content .filelist .date { + display: none; +} +#oc-dialog-filepicker-content .filelist .filename { + max-width: 80%; +} + + /* fix controls bar jumping when navigation is slid out */ .snapjs-left #app-navigation-toggle, .snapjs-left #controls { diff --git a/core/css/styles.css b/core/css/styles.css index 5c1b46e0c07..6c4c9181be5 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -767,14 +767,19 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin #oc-dialog-filepicker-content .filelist .filename { position: absolute; top: 8px; + max-width: 60%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } #oc-dialog-filepicker-content .filelist img { margin: 2px 1em 0 4px; } #oc-dialog-filepicker-content .filelist .date { float: right; - margin-right: 1em; - margin-top: 8px; + margin-right: 10px; + margin-top: 0; + padding-top: 9px; } #oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;} .ui-dialog {position:fixed !important;} diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 9920cc58e23..9b767930c10 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -206,7 +206,7 @@ var OCdialogs = { self.$filePicker.ocdialog({ closeOnEscape: true, - width: (4/9)*$(document).width(), + width: (4/5)*$(document).width(), height: 420, modal: modal, buttons: buttonlist, |