Skip to content

Commit

Permalink
Merge pull request #3762 from nextcloud/bugfix/3744
Browse files Browse the repository at this point in the history
Adapt the card modal to upstream changes
  • Loading branch information
juliusknorr authored Apr 29, 2022
2 parents 58e6989 + 24f7ef6 commit a8af331
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
9 changes: 1 addition & 8 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<Modal v-if="cardDetailsInModal && $route.params.cardId"
:clear-view-delay="0"
:title="t('deck', 'Card details')"
size="large"
@close="hideModal()">
<div class="modal__content modal__card">
<router-view name="sidebar" />
Expand Down Expand Up @@ -153,14 +154,6 @@ export default {
}
}
}

.modal__card {
min-width: 320px;
width: 50vw;
max-width: 800px;
min-height: 200px;
height: 80vh;
}
</style>

<style lang="scss">
Expand Down
6 changes: 6 additions & 0 deletions src/components/card/CardSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,8 @@ export default {
max-width: calc(100% - #{$modal-padding*2});
padding: 0 14px;
max-height: 100%;
overflow: initial;

&::v-deep {
.app-sidebar-header {
position: sticky;
Expand All @@ -239,6 +241,10 @@ export default {
background-color: var(--color-main-background);
}

.app-sidebar__tab {
overflow: initial;
}

#emptycontent, .emptycontent {
margin-top: 88px;
}
Expand Down

0 comments on commit a8af331

Please sign in to comment.