Skip to content

Commit

Permalink
Merge pull request #6232 from nextcloud/fix/nextcloud-30-design-issues
Browse files Browse the repository at this point in the history
fix: 30 design issues
  • Loading branch information
juliusknorr authored Aug 29, 2024
2 parents e647faf + fb54b81 commit c6c41c5
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 5 deletions.
5 changes: 2 additions & 3 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,8 @@ export default {
.modal__card {
width: 100%;
min-width: 100%;
height: 100vh;
max-height: calc(100vh - 120px);
overflow: auto;
height: calc(100% - 20px);
overflow: hidden;
}
</style>
1 change: 0 additions & 1 deletion src/CardMoveDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ export default {

<style lang="scss" scoped>
.modal__content {
width: 25vw;
min-width: 250px;
min-height: 120px;
margin: 20px 20px 100px 20px;
Expand Down
19 changes: 18 additions & 1 deletion src/components/card/CardSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,10 @@ section.app-sidebar__tab--active {
height: 100%;
}
.modal-container {
overflow: hidden;
}
// FIXME: Obivously we should at some point not randomly reuse the sidebar component
// since this is not oficially supported
.modal__card .app-sidebar {
Expand All @@ -222,10 +226,23 @@ section.app-sidebar__tab--active {
max-width: calc(100% - #{$modal-padding * 2});
padding: 0 14px;
height: 97%;
overflow: initial;
overflow: hidden !important;
user-select: text;
-webkit-user-select: text;
.app-sidebar-header__mainname-container {
padding-top: calc(var(--default-grid-baseline, 4px) * 2);
}
.app-sidebar-tabs {
max-height: 90%;
}
.app-sidebar__tab {
min-height: calc(100% - 20px);
max-height: calc(100% - 20px);
}
// FIXME: test
&:deep {
.app-sidebar-header {
Expand Down
6 changes: 6 additions & 0 deletions src/components/navigation/AppNavigationBoard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -350,4 +350,10 @@ export default {
.forced-active {
box-shadow: inset 4px 0 var(--color-primary-element);
}
:deep(.active) {
.material-design-icon svg {
fill: var(--color-primary-element-text);
}
}
</style>

0 comments on commit c6c41c5

Please sign in to comment.