Skip to content

Commit

Permalink
fix(NcAppSettingsDialog): Do not enfore element height that causes do…
Browse files Browse the repository at this point in the history
…uble scrollbars

Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de>
Co-authored-by: Eduardo Morales <emoral435@gmail.com>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
  • Loading branch information
susnux and emoral435 committed Jan 26, 2024
1 parent bb3b25e commit 016ffcf
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions src/components/NcAppSettingsDialog/NcAppSettingsDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -402,9 +402,6 @@ export default {
<style lang="scss" scoped>
.app-settings {
&:deep(.dialog) {
min-height: 256px;
}
:deep &__navigation {
min-width: 200px;
margin-right: 20px;
Expand All @@ -414,11 +411,7 @@ export default {
}
:deep &__content {
box-sizing: border-box;
overflow-y: auto;
overflow-x: hidden;
padding-inline: 20px;
min-height: 256px;
padding-inline: 16px;
}
}
Expand Down Expand Up @@ -469,4 +462,11 @@ export default {
}
}
@media only screen and (max-width: $breakpoint-small-mobile) {
.app-settings {
:deep .dialog__name {
padding-inline-start: 16px;
}
}
}
</style>
2 changes: 1 addition & 1 deletion src/components/NcDialog/NcDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ export default defineComponent({
margin-block: 0;
&:not(:empty) {
margin-block: 6px 12px; // only if there are actione we add margin so if it is empty scroll content looks nice
margin-block: 6px 12px; // only if there are actions, we add margin so if it is empty scroll content looks nice
}
}
}
Expand Down

0 comments on commit 016ffcf

Please sign in to comment.