ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged develop into feature/VBV-567-reminder-email

This commit is contained in:
Daniel Egger 2023-11-02 16:02:19 +00:00
parent c1e73f58e6 fbc97195a4
commit f0ab395eea
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/src/pages/learningPath/learningContentPage/LearningContentContainer.vue
View File

@ -14,7 +14,13 @@ defineEmits(["exit"]);
<div>
<div class="absolute bottom-0 top-0 w-full bg-white">
<CoursePreviewBar v-if="courseSessionsStore.hasCourseSessionPreview" />
<div class="h-content overflow-y-auto">
<div
:class="{
'h-content': !courseSessionsStore.hasCourseSessionPreview,
'h-content-preview': courseSessionsStore.hasCourseSessionPreview,
}"
class="overflow-y-auto"
>
<header
class="relative flex h-12 w-full items-center justify-between bg-white px-4 lg:h-16 lg:px-8"
>
@ -34,12 +40,17 @@ defineEmits(["exit"]);
</template>
<style lang="scss" scoped>
$nav-height: 86px;
$nav-height: 86px; // navigation height
$nav-height-preview: $nav-height + 64px; //navigation height + preview bar height
.h-content {
height: calc(100vh - $nav-height);
}
.h-content-preview {
height: calc(100vh - $nav-height-preview);
}
.nav {
height: $nav-height;
}

2
client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue
View File

@ -90,7 +90,7 @@ const step = useRouteQuery("step");
</p>
</div>
<div>
<div v-if="assignment?.competence_certificate">
<h3 class="mb-4 mt-8">{{ $t("a.Kompetenznachweis") }}</h3>
<p class="text-large">
{{