File tree Expand file tree Collapse file tree
contentcuration/contentcuration/frontend
channelEdit/components/edit Expand file tree Collapse file tree Original file line number Diff line number Diff line change 9696 </ResizableNavigationDrawer >
9797
9898 <!-- Main editing area -->
99- <VContent >
99+ <VContent
100+ class="edit-modal-content"
101+ :class =" { ' has-bottom-bar' : showBottomBar } "
102+ >
100103 <VLayout
101104 v-if =" loadError "
102105 align-center
126129 </template >
127130 </Uploader >
128131 </VCard >
129- <BottomBar v-if =" ! loading && ! loadError && ! showFileUploadDefault " >
132+ <BottomBar v-if =" showBottomBar " >
130133 <FileStorage
131134 v-if =" showStorage "
132135 class="mx-2"
311314 showFileUploadDefault () {
312315 return this .uploadMode && ! this .nodeIds .length ;
313316 },
317+ showBottomBar () {
318+ return ! this .loading && ! this .loadError && ! this .showFileUploadDefault ;
319+ },
314320 nodeIds () {
315321 return (this .detailNodeIds && this .detailNodeIds .split (' ,' )) || [];
316322 },
673679 }
674680
675681 :: v- deep .v - content__wrap {
676- max- height: calc (100vh - 128px );
677682 overflow- y: auto;
678683 }
679684
690695 z- index: 5 ! important;
691696 }
692697
698+ .edit - modal- content {
699+ height: 100 % ;
700+
701+ & .has - bottom- bar {
702+ // Reserve room for the fixed BottomBar,
703+ padding- bottom: 64px ! important;
704+ }
705+ }
706+
693707< / style>
Original file line number Diff line number Diff line change 2424 </VFlex >
2525 </VLayout >
2626 </VContainer >
27- <VLayout v-else >
28- <VFlex grow>
27+ <div
28+ v-else
29+ class =" edit-view-layout-wrapper"
30+ >
31+ <div class =" edit-view-layout" >
2932 <ToolBar
3033 v-if =" showTabs "
3134 :flat =" ! tabsElevated "
116119 </ToolBar >
117120 <VContainer
118121 fluid
122+ class="tab-content"
119123 :style =" questionsTabStyles "
120124 >
121125 <VTabsItems v-model =" currentTab " >
174178 </VTabItem >
175179 </VTabsItems >
176180 </VContainer >
177- </VFlex >
178- </VLayout >
181+ </div >
182+ </div >
179183 </VContainer >
180184
181185</template >
441445 z-index : 5 ;
442446 }
443447
448+ .edit-view-layout-wrapper {
449+ height : 100% ;
450+ }
451+
452+ .edit-view-layout {
453+ display : flex ;
454+ flex-direction : column ;
455+ min-height : 100% ;
456+ }
457+
444458 .container {
445459 width : unset ;
446460 }
447461
462+ .tab-content {
463+ // Override Vuetify's default margin for VContainer, which is not needed in this layout.
464+ margin-right : 0 ;
465+ margin-left : 0 ;
466+ }
467+
448468 .v-alert {
449469 padding : 10px ;
450470 margin : 15px ;
473493
474494 .wrapper {
475495 min-width : 100% ;
496+ height : 100% ;
476497 max-height : inherit ;
477498 overflow : auto ;
478499 }
Original file line number Diff line number Diff line change 11<template >
22
3- <div >
3+ <div class = " uploader-container " >
44 <slot
55 :openFileDialog =" openFileDialog"
66 :handleFiles =" handleFiles"
283283
284284<style lang="scss" scoped>
285285
286+ .uploader-container {
287+ height : 100% ;
288+ }
289+
286290 .storage-alert {
287291 font-size : 12pt ;
288292 }
You can’t perform that action at this time.
0 commit comments