Skip to content

Fix assessments tab height #6111

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

Merged
marcellamaki merged 1 commit into from
Aug 28, 2026
Merged

Fix assessments tab height #6111

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
>
<VCard class="edit-modal-wrapper">
<Uploader
class="uploader-container"
allowMultiple
displayOnly
:uploadingHandler="createNodesFromUploads"
Expand Down Expand Up @@ -96,7 +97,10 @@
</ResizableNavigationDrawer>

<!-- Main editing area -->
<VContent>
<VContent
class="edit-modal-content"
:class="{ 'has-bottom-bar': showBottomBar }"
>
<VLayout
v-if="loadError"
align-center
Expand Down Expand Up @@ -126,7 +130,7 @@
</template>
</Uploader>
</VCard>
<BottomBar v-if="!loading && !loadError && !showFileUploadDefault">
<BottomBar v-if="showBottomBar">
<FileStorage
v-if="showStorage"
class="mx-2"
Expand Down Expand Up @@ -311,6 +315,9 @@
showFileUploadDefault() {
return this.uploadMode && !this.nodeIds.length;
},
showBottomBar() {
return !this.loading && !this.loadError && !this.showFileUploadDefault;
},
nodeIds() {
return (this.detailNodeIds && this.detailNodeIds.split(',')) || [];
},
Expand Down Expand Up @@ -656,6 +663,8 @@

<style lang="scss" scoped>

@import '../../../shared/styles/variables';

::v-deep .v-toolbar__extension {
padding: 0;

Expand All @@ -673,7 +682,6 @@
}

::v-deep .v-content__wrap {
max-height: calc(100vh - 128px);
overflow-y: auto;
}

Expand All @@ -690,4 +698,17 @@
z-index: 5 !important;
}

.edit-modal-content {
height: 100%;

&.has-bottom-bar {
// Reserve room for the fixed BottomBar
padding-bottom: $bottom-bar-height !important;
}
}

.uploader-container {
height: 100%;
}

</style>
30 changes: 25 additions & 5 deletions contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@
</VFlex>
</VLayout>
</VContainer>
<VLayout v-else>
<VFlex grow>
<div
v-else
class="edit-view-layout-wrapper"
>
<div class="edit-view-layout">
<ToolBar
v-if="showTabs"
:flat="!tabsElevated"
Expand Down Expand Up @@ -116,6 +119,7 @@
</ToolBar>
<VContainer
fluid
class="tab-content"
:style="questionsTabStyles"
>
<VTabsItems v-model="currentTab">
Expand Down Expand Up @@ -174,8 +178,8 @@
</VTabItem>
</VTabsItems>
</VContainer>
</VFlex>
</VLayout>
</div>
</div>
</VContainer>

</template>
Expand Down Expand Up @@ -441,10 +445,26 @@
z-index: 5;
}

.edit-view-layout-wrapper {

@rtibblesbot rtibblesbot Aug 27, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: Is the extra div doing something? .wrapper already carries a definite height: 100%, so .edit-view-layout's min-height: 100% should resolve against it directly without the intermediate wrapper.

@AlexVelezLl AlexVelezLl Aug 27, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is preventing this PR from getting an unnecessarily large diff; it's on purpose.

height: 100%;
}

.edit-view-layout {
Comment thread
bjester marked this conversation as resolved.
display: flex;
flex-direction: column;
min-height: 100%;
}

.container {
width: unset;
}

.tab-content {
// Override Vuetify's default margin for VContainer, which is not needed in this layout.
margin-right: 0;
margin-left: 0;
}

.v-alert {
padding: 10px;
margin: 15px;
Expand Down Expand Up @@ -473,7 +493,7 @@

.wrapper {
min-width: 100%;
max-height: inherit;
height: 100%;
overflow: auto;
}

Expand Down
6 changes: 6 additions & 0 deletions contentcuration/contentcuration/frontend/shared/styles/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Shared SCSS variables. Import this partial wherever a value needs to stay in
// sync across components.

// Height of the fixed BottomBar. Content that sits behind the bar reserves the
// same amount of room for it.
$bottom-bar-height: 64px;

@rtibblesbot rtibblesbot Aug 27, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

praise: Defined once and consumed by BottomBar.vue itself, not just by the component that reserves space for it — that's what keeps the two in lockstep.

7 changes: 6 additions & 1 deletion contentcuration/contentcuration/frontend/shared/views/BottomBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@

<style lang="scss" scoped>

@import '../styles/variables';

.bottom-bar {
position: fixed;
bottom: 0;
Expand All @@ -44,7 +46,10 @@
display: flex;
align-items: center;
width: 100%;
height: 64px;
// This value has impact on other modules that depend on it, if you need to change it,
// change the variable value instead, so that all modules that depend on it are
// updated accordingly.
height: $bottom-bar-height;
}

</style>
Loading