Skip to content
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

Jump to bottom

fixing minor issues on multimedia templates #584

Merged
merged 1 commit into from
Aug 29, 2024
Merged

fixing minor issues on multimedia templates #584

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
6 changes: 5 additions & 1 deletion packages/vue/src/templates/edu/PageEduGalleryDetail/PageEduGalleryDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,11 @@ const { data } = reactive(props)
indent="col-2"
class="mb-5 lg:mb-10"
>
<BlockImageStandard :data="block.image" />
<BlockImageStandard
:data="block.image"
:caption="block.caption"
:display-caption="block.displayCaption"
/>
</LayoutHelper>
</template>
<template v-else-if="block.blockType === 'ImageComparisonBlock'">
Expand Down
20 changes: 13 additions & 7 deletions packages/vue/src/templates/edu/PageEduMultimediaDetail/PageEduMultimediaDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import LayoutHelper from './../../../components/LayoutHelper/LayoutHelper.vue'
import BaseHeading from './../../../components/BaseHeading/BaseHeading.vue'
import DetailHeadline from './../../../components/DetailHeadline/DetailHeadline.vue'
import ShareButtonsEdu from './../../../components/ShareButtonsEdu/ShareButtonsEdu.vue'
import BaseVideo from './../../../components/BaseVideo/BaseVideo.vue'
import BlockVideo from './../../../components/BlockVideo/BlockVideo.vue'
import BlockImageStandard from './../../../components/BlockImage/BlockImageStandard.vue'
import BlockVideoEmbed from './../../../components/BlockVideoEmbed/BlockVideoEmbed.vue'
import BaseButton from './../../../components/BaseButton/BaseButton.vue'
Expand Down Expand Up @@ -143,7 +143,7 @@ const creditText = computed(() => {
case 'image':
return heroImage.value?.credit
case 'video':
return videoBlock.value?.caption
return videoBlock.value?.credit
case 'document':
return data.credit
default:
Expand Down Expand Up @@ -263,8 +263,8 @@ const { data } = reactive(props)
/>
<template v-if="videoBlock.blockType === 'VideoBlock' && videoBlock.video">
<div class="max-w-screen-2xl lg:mb-24 mx-auto mt-10 mb-8">
<BaseVideo
:data="videoBlock.video"
<BlockVideo
:data="videoBlock"
schema
/>
</div>
Expand Down Expand Up @@ -297,7 +297,6 @@ const { data } = reactive(props)
/>

<div class="max-w-screen-3xl lg:mb-24 mx-auto mt-10 mb-8">
<!-- inline hero content -->
<LayoutHelper
v-if="heroImage"
indent="col-2"
Expand All @@ -311,8 +310,6 @@ const { data } = reactive(props)
</div>
</template>

<!-- !Gallery body -->

<LayoutHelper indent="col-2">
<div class="lg:grid grid-cols-12">
<div
Expand Down Expand Up @@ -430,5 +427,14 @@ const { data } = reactive(props)
.bg-stars .MixinCarousel__Heading {
@apply text-white;
}
.BlockVideo,
.BlockVideoEmbed {
.BaseImageCaption {
@apply px-4 sm:px-5;
@screen 3xl {
@apply px-0;
}
}
}
}
</style>
Loading