From e142c5404a1e8a5a518835d1abb71a314200bade Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Mon, 1 Aug 2022 08:42:18 +0000
Subject: [PATCH] fixes #967
Closes #967
Merge request studip/studip!841
---
resources/assets/stylesheets/scss/courseware.scss | 5 ++++-
resources/vue/components/courseware/CoursewareRibbon.vue | 9 +++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/resources/assets/stylesheets/scss/courseware.scss b/resources/assets/stylesheets/scss/courseware.scss
index 739b1d320f3..83a7c21d76b 100644
--- a/resources/assets/stylesheets/scss/courseware.scss
+++ b/resources/assets/stylesheets/scss/courseware.scss
@@ -203,6 +203,9 @@ r i b b o n
$consum_ribbon_width: calc(100% - 58px);
#course-courseware-index,
#contents-courseware-courseware {
+ &.consume {
+ overflow: hidden;
+ }
#layout_container {
overflow-x: hidden;
position: relative;
@@ -4784,4 +4787,4 @@ p u b l i c l i n k s
}
/* * * * * * * * * * * * * * *
e n d p u b l i c l i n k s
-* * * * * * * * * * * * * * */
\ No newline at end of file
+* * * * * * * * * * * * * * */
diff --git a/resources/vue/components/courseware/CoursewareRibbon.vue b/resources/vue/components/courseware/CoursewareRibbon.vue
index 4b18c15fadb..72a3a509836 100644
--- a/resources/vue/components/courseware/CoursewareRibbon.vue
+++ b/resources/vue/components/courseware/CoursewareRibbon.vue
@@ -106,9 +106,9 @@ export default {
},
handleScroll() {
if (window.outerWidth > 767) {
- this.stickyRibbon = window.scrollY > 130;
+ this.stickyRibbon = window.scrollY > 130 && !this.consumeMode;
} else {
- this.stickyRibbon = window.scrollY > 75;
+ this.stickyRibbon = window.scrollY > 75 && !this.consumeMode;
}
},
},
@@ -132,6 +132,11 @@ export default {
},
consumeMode(newState) {
this.$refs.consumeModeSwitch.focus();
+ if (newState) {
+ document.body.classList.add('consume');
+ } else {
+ document.body.classList.remove('consume');
+ }
}
}
};
--
GitLab