diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-10-01 22:59:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-01 22:59:12 +0200 |
| commit | 8799c6ee5be45b22a8cdd0b04e54579336eca139 (patch) | |
| tree | 43085e8ce72360cfe240dc8dc0d6ac56c7c7d954 /apps/files | |
| parent | 40a3dbf87818d0e8f300feeb31f3babb577ed53d (diff) | |
| parent | 36062fec7d06351da8f1553d9655430c0cda856d (diff) | |
| download | nextcloud-server-8799c6ee5be45b22a8cdd0b04e54579336eca139.tar.gz nextcloud-server-8799c6ee5be45b22a8cdd0b04e54579336eca139.zip | |
Merge pull request #11522 from nextcloud/filepicker-design
Filepicker design improvements
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/css/files.scss | 6 | ||||
| -rw-r--r-- | apps/files/css/upload.scss | 8 | ||||
| -rw-r--r-- | apps/files/js/fileactions.js | 2 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index c41255b9868..bd57f1907f5 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -52,10 +52,6 @@ min-width: 500px; } -#filestable tbody tr { - height: 51px; -} - /* fit app list view heights */ .app-files #app-content>.viewcontainer { min-height: 0%; @@ -132,7 +128,7 @@ #filestable tbody tr { transition: background-color 0.3s ease; - height: 40px; + height: 51px; } #filestable tbody tr:hover, #filestable tbody tr:focus, diff --git a/apps/files/css/upload.scss b/apps/files/css/upload.scss index 0df2e39a613..00c77100a23 100644 --- a/apps/files/css/upload.scss +++ b/apps/files/css/upload.scss @@ -172,12 +172,14 @@ .oc-dialog .fileexists #allfiles + span{ vertical-align: bottom; } + .oc-dialog .oc-dialog-buttonrow { width:100%; text-align:right; -} -.oc-dialog .oc-dialog-buttonrow .cancel { - float:left; + + .cancel { + float:left; + } } .highlightUploaded { diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 8ce8eddb0b0..4fcb290ca8b 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -662,7 +662,7 @@ if (permissions & OC.PERMISSION_UPDATE) { actions = OC.dialogs.FILEPICKER_TYPE_COPY_MOVE; } - OC.dialogs.filepicker(t('files', 'Target folder'), function(targetPath, type) { + OC.dialogs.filepicker(t('files', 'Choose target folder'), function(targetPath, type) { if (type === OC.dialogs.FILEPICKER_TYPE_COPY) { context.fileList.copy(filename, targetPath, false, context.dir); } diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 8fb8a021811..154209ca975 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -849,7 +849,7 @@ }; var actions = this.isSelectedMovable() ? OC.dialogs.FILEPICKER_TYPE_COPY_MOVE : OC.dialogs.FILEPICKER_TYPE_COPY; - OC.dialogs.filepicker(t('files', 'Target folder'), function(targetPath, type) { + OC.dialogs.filepicker(t('files', 'Choose target folder'), function(targetPath, type) { self.fileMultiSelectMenu.toggleLoading('copyMove', true); if (type === OC.dialogs.FILEPICKER_TYPE_COPY) { self.copy(files, targetPath, disableLoadingState); |