Fixed scrolling container
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
parent
0274507cb1
commit
440b5c944f
|
@ -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,
|
||||
|
|
|
@ -67,7 +67,6 @@
|
|||
return new OCA.Files.FavoritesFileList(
|
||||
$el, {
|
||||
fileActions: fileActions,
|
||||
scrollContainer: $('#app-content')
|
||||
}
|
||||
);
|
||||
},
|
||||
|
|
|
@ -67,7 +67,6 @@
|
|||
return new OCA.Files.RecentFileList(
|
||||
$el, {
|
||||
fileActions: fileActions,
|
||||
scrollContainer: $('#app-content')
|
||||
}
|
||||
);
|
||||
},
|
||||
|
|
|
@ -29,7 +29,6 @@ OCA.External.App = {
|
|||
this.fileList = new OCA.External.FileList(
|
||||
$el,
|
||||
{
|
||||
scrollContainer: $('#app-content'),
|
||||
fileActions: this._createFileActions()
|
||||
}
|
||||
);
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -67,7 +67,6 @@ OCA.Sharing.PublicApp = {
|
|||
$el,
|
||||
{
|
||||
id: 'files.public',
|
||||
scrollContainer: $('#app-content'),
|
||||
dragOptions: dragOptions,
|
||||
folderDropOptions: folderDropOptions,
|
||||
fileActions: fileActions,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
$el,
|
||||
{
|
||||
id: 'systemtags',
|
||||
scrollContainer: $('#app-content'),
|
||||
fileActions: this._createFileActions(),
|
||||
config: OCA.Files.App.getFilesConfig()
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
#content {
|
||||
#app-navigation + #app-content {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue