From 8ea4ca2d0652712c89bef797922dd4889d045c35 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Wed, 10 Jan 2024 14:25:53 +0000
Subject: [PATCH] fix #3192
Closes #3192
Merge request studip/studip!2478
---
.../scss/courseware/layouts/collapsible.scss | 8 ++------
.../stylesheets/scss/courseware/layouts/tabs.scss | 11 ++---------
.../courseware/layouts/CoursewareCollapsibleBox.vue | 4 ++--
.../components/courseware/layouts/CoursewareTab.vue | 4 ++--
4 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/resources/assets/stylesheets/scss/courseware/layouts/collapsible.scss b/resources/assets/stylesheets/scss/courseware/layouts/collapsible.scss
index 79dc2eedc0d..16e4195763a 100644
--- a/resources/assets/stylesheets/scss/courseware/layouts/collapsible.scss
+++ b/resources/assets/stylesheets/scss/courseware/layouts/collapsible.scss
@@ -28,12 +28,8 @@
}
}
- .cw-collapsible-content {
- display: none;
- &.cw-collapsible-content-open {
- display: block;
- padding: 10px;
- }
+ .cw-collapsible-content .cw-collapsible-content-open {
+ padding: 10px;
}
}
diff --git a/resources/assets/stylesheets/scss/courseware/layouts/tabs.scss b/resources/assets/stylesheets/scss/courseware/layouts/tabs.scss
index aa12b5e929f..cf28364678c 100644
--- a/resources/assets/stylesheets/scss/courseware/layouts/tabs.scss
+++ b/resources/assets/stylesheets/scss/courseware/layouts/tabs.scss
@@ -101,14 +101,7 @@
}
.cw-tabs {
- .cw-tab {
- display: none;
- height: 0;
-
- &.cw-tab-active {
- display: block;
- height: unset;
- padding: 4px 8px;
- }
+ .cw-tab .cw-tab-active {
+ padding: 4px 8px;
}
}
diff --git a/resources/vue/components/courseware/layouts/CoursewareCollapsibleBox.vue b/resources/vue/components/courseware/layouts/CoursewareCollapsibleBox.vue
index 7415478383d..eefc0fb5d0e 100644
--- a/resources/vue/components/courseware/layouts/CoursewareCollapsibleBox.vue
+++ b/resources/vue/components/courseware/layouts/CoursewareCollapsibleBox.vue
@@ -5,7 +5,7 @@
<studip-icon v-if="icon" :shape="icon" /> {{ title }}
</header>
</a>
- <div class="cw-collapsible-content" :class="{ 'cw-collapsible-content-open': isOpen }">
+ <div v-if="isOpen" class="cw-collapsible-content" :class="{ 'cw-collapsible-content-open': isOpen }">
<slot></slot>
</div>
</div>
@@ -54,4 +54,4 @@ export default {
}
}
};
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/vue/components/courseware/layouts/CoursewareTab.vue b/resources/vue/components/courseware/layouts/CoursewareTab.vue
index 8d2e9bd39c1..ae007074872 100644
--- a/resources/vue/components/courseware/layouts/CoursewareTab.vue
+++ b/resources/vue/components/courseware/layouts/CoursewareTab.vue
@@ -1,9 +1,9 @@
<template>
<div
+ v-if="isActive"
role="tabpanel"
class="cw-tab"
:id="id"
- :class="{ 'cw-tab-active': isActive }"
:aria-labelledby="selectorId"
>
<slot></slot>
@@ -48,4 +48,4 @@ export default {
}
}
};
-</script>
\ No newline at end of file
+</script>
--
GitLab