diff options
| -rw-r--r-- | apps/files/js/app.js | 1 | ||||
| -rw-r--r-- | apps/files/js/favoritesplugin.js | 1 | ||||
| -rw-r--r-- | apps/files/js/recentplugin.js | 1 | ||||
| -rw-r--r-- | apps/files_external/js/app.js | 1 | ||||
| -rw-r--r-- | apps/files_sharing/js/app.js | 5 | ||||
| -rw-r--r-- | apps/files_sharing/js/public.js | 1 | ||||
| -rw-r--r-- | apps/files_trashbin/js/app.js | 1 | ||||
| -rw-r--r-- | apps/systemtags/js/app.js | 1 | ||||
| -rw-r--r-- | core/css/apps.scss | 8 | ||||
| -rw-r--r-- | core/css/mobile.scss | 2 | ||||
| -rw-r--r-- | core/css/public.scss | 15 |
11 files changed, 23 insertions, 14 deletions
diff --git a/apps/files/js/app.js b/apps/files/js/app.js index c2cef563fa0..3630ed7587d 100644 --- a/apps/files/js/app.js +++ b/apps/files/js/app.js @@ -83,7 +83,6 @@ // TODO: ideally these should be in a separate class / app (the embedded "all files" app) this.fileList = new OCA.Files.FileList( $('#app-content-files'), { - scrollContainer: $('#app-content'), dragOptions: dragOptions, folderDropOptions: folderDropOptions, fileActions: fileActions, diff --git a/apps/files/js/favoritesplugin.js b/apps/files/js/favoritesplugin.js index 454a505c7bd..7294ef9461c 100644 --- a/apps/files/js/favoritesplugin.js +++ b/apps/files/js/favoritesplugin.js @@ -67,7 +67,6 @@ return new OCA.Files.FavoritesFileList( $el, { fileActions: fileActions, - scrollContainer: $('#app-content') } ); }, diff --git a/apps/files/js/recentplugin.js b/apps/files/js/recentplugin.js index fcd427b18a2..524b556a517 100644 --- a/apps/files/js/recentplugin.js +++ b/apps/files/js/recentplugin.js @@ -67,7 +67,6 @@ return new OCA.Files.RecentFileList( $el, { fileActions: fileActions, - scrollContainer: $('#app-content') } ); }, diff --git a/apps/files_external/js/app.js b/apps/files_external/js/app.js index 859a820f14c..d3f738dcf8a 100644 --- a/apps/files_external/js/app.js +++ b/apps/files_external/js/app.js @@ -29,7 +29,6 @@ OCA.External.App = { this.fileList = new OCA.External.FileList( $el, { - scrollContainer: $('#app-content'), fileActions: this._createFileActions() } ); diff --git a/apps/files_sharing/js/app.js b/apps/files_sharing/js/app.js index 76d52cfe9e0..750f66236ae 100644 --- a/apps/files_sharing/js/app.js +++ b/apps/files_sharing/js/app.js @@ -32,7 +32,6 @@ OCA.Sharing.App = { $el, { id: 'shares.self', - scrollContainer: $('#app-content'), sharedWithUser: true, fileActions: this._createFileActions(), config: OCA.Files.App.getFilesConfig() @@ -55,7 +54,6 @@ OCA.Sharing.App = { $el, { id: 'shares.others', - scrollContainer: $('#app-content'), sharedWithUser: false, fileActions: this._createFileActions(), config: OCA.Files.App.getFilesConfig() @@ -78,7 +76,6 @@ OCA.Sharing.App = { $el, { id: 'shares.link', - scrollContainer: $('#app-content'), linksOnly: true, fileActions: this._createFileActions(), config: OCA.Files.App.getFilesConfig() @@ -101,7 +98,6 @@ OCA.Sharing.App = { $el, { id: 'shares.deleted', - scrollContainer: $('#app-content'), showDeleted: true, sharedWithUser: true, fileActions: this._restoreShareAction(), @@ -125,7 +121,6 @@ OCA.Sharing.App = { $el, { id: 'shares.overview', - scrollContainer: $('#app-content'), config: OCA.Files.App.getFilesConfig(), isOverview: true } diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 06dc6a07d48..35ffd9ff65e 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -67,7 +67,6 @@ OCA.Sharing.PublicApp = { $el, { id: 'files.public', - scrollContainer: $('#app-content'), dragOptions: dragOptions, folderDropOptions: folderDropOptions, fileActions: fileActions, diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js index 002c01bf967..5c29c1232bb 100644 --- a/apps/files_trashbin/js/app.js +++ b/apps/files_trashbin/js/app.js @@ -26,7 +26,6 @@ OCA.Trashbin.App = { var urlParams = OC.Util.History.parseUrlQuery(); this.fileList = new OCA.Trashbin.FileList( $('#app-content-trashbin'), { - scrollContainer: $('#app-content'), fileActions: this._createFileActions(), detailsViewEnabled: false, scrollTo: urlParams.scrollto, diff --git a/apps/systemtags/js/app.js b/apps/systemtags/js/app.js index e027c0be123..04ac53d3b32 100644 --- a/apps/systemtags/js/app.js +++ b/apps/systemtags/js/app.js @@ -27,7 +27,6 @@ $el, { id: 'systemtags', - scrollContainer: $('#app-content'), fileActions: this._createFileActions(), config: OCA.Files.App.getFilesConfig() } diff --git a/core/css/apps.scss b/core/css/apps.scss index bab47f4b004..f0c168eee71 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -587,13 +587,15 @@ kbd { // everything not related to content but needs to be on the window // goes here (popups, tooltips...) position: relative; + min-height: 100%; + display: unset; } #content { box-sizing: border-box; position: relative; display: flex; - margin-left: $navigation-width; margin-top: $header-height; + min-height: 100%; } /* APP-CONTENT AND WRAPPER ------------------------------------------ */ @@ -605,6 +607,10 @@ kbd { min-height: 100%; flex-basis: 100vw; overflow: auto; + /* margin if navigation element is here */ + #app-navigation + & { + margin-left: $navigation-width; + } /* no top border for first settings item */ > .section:first-child { border-top: none; diff --git a/core/css/mobile.scss b/core/css/mobile.scss index 8a7b323a844..93e2909a510 100644 --- a/core/css/mobile.scss +++ b/core/css/mobile.scss @@ -28,7 +28,7 @@ } } - #content { + #app-navigation + #app-content { margin-left: 0; } diff --git a/core/css/public.scss b/core/css/public.scss index 2ddca32c884..19b90064229 100644 --- a/core/css/public.scss +++ b/core/css/public.scss @@ -44,4 +44,19 @@ .ie #content { display: inline-block; } + + + p.info { + margin: 20px auto; + text-shadow: 0 0 2px rgba(0, 0, 0, .4); + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + } + p.info, form fieldset legend, + #datadirContent label, + form fieldset .warning-info, + form input[type='checkbox']+label { + text-align: center; + } } |