Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create scrollable content via min-height over sidebar and settings … #4825

Merged
merged 1 commit into from
Nov 16, 2023
Merged

Create scrollable content via min-height over sidebar and settings … #4825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/components/NcAppSettingsDialog/NcAppSettingsDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
scroller: null,
/**
* Currently registered settings sections
* @type {{ id: string, name: string, icon?: VNode[] }}

Check warning on line 259 in src/components/NcAppSettingsDialog/NcAppSettingsDialog.vue

View workflow job for this annotation

GitHub Actions / eslint 

The type 'VNode' is undefined
*/
sections: [],
}
Expand Down Expand Up @@ -395,6 +395,9 @@

<style lang="scss" scoped>
.app-settings {
&:deep(.dialog) {
JuliaKirschenheuter marked this conversation as resolved.
Show resolved Hide resolved
min-height: 256px;
}
&__navigation {
min-width: 200px;
margin-right: 20px;
Expand All @@ -409,6 +412,7 @@
overflow-x: hidden;
padding: 24px;
width: 100%;
min-height: 256px;
}
}

Expand Down
3 changes: 1 addition & 2 deletions src/components/NcAppSidebar/NcAppSidebarTabs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,7 @@ export default {

&__content {
position: relative;
// take full available height
min-height: 0;
min-height: 256px;
height: 100%;
// force the use of the tab component if more than one tab
// you can just put raw content if you don't use tabs
Expand Down