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.

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

Firefox Scroll Bug #1119

Merged
merged 2 commits into from
Aug 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions web/assets/css/home.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@
}

/* Chrome, Safari and Opera */
#content::-webkit-scrollbar, #notification-list::-webkit-scrollbar, .tum-live-side-navigation::-webkit-scrollbar {
#content::-webkit-scrollbar, #notification-list::-webkit-scrollbar, .tum-live-side-navigation::-webkit-scrollbar,
#public-courses::-webkit-scrollbar, #user-courses::-webkit-scrollbar{
display: none;
}

/* IE, Edge and Firefox */
#content, #notification-list, .tum-live-side-navigation {
#content, #notification-list, .tum-live-side-navigation, #public-courses, #user-courses {
-ms-overflow-style: none; /* IE and Edge */
scrollbar-width: none; /* Firefox */
}
Expand Down
12 changes: 6 additions & 6 deletions web/template/home.gohtml
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
<!-- views -->
<article class="text-3 p-4 grow" :class="{'hidden' : navigation.value}">
<template x-if="state.isPublicCourses()">
<article id="public-courses" class="tum-live-course-list">
<article id="public-courses" class="tum-live-course-list h-full overflow-y-scroll">
<header>
<h1>
<i class="text-base fa-solid fa-chalkboard mr-2"></i>
Expand Down Expand Up @@ -272,7 +272,7 @@
</article>
</template>
<template x-if="state.isUserCourses()">
<article id="user-courses" class="tum-live-course-list">
<article id="user-courses" class="tum-live-course-list h-full overflow-y-scroll">
<header>
<h1>
<i class="text-base fa-solid fa-graduation-cap mr-2"></i>
Expand Down Expand Up @@ -369,7 +369,7 @@
</span>
</div>
<a :href="`/w/${livestream.Course.Slug}/${livestream.Stream.ID}`">
<div :style="`background:url('/api/stream/${livestream.Stream.ID}/thumbs/live'), url('/thumb-fallback.png')`"
<div :style="`background:url('/api/stream/${livestream.Stream.ID}/thumbs/live'), url('/thumb-fallback.png'); background-size: cover;`"
class="h-full tum-live-thumbnail"></div>
</a>
</div>
Expand Down Expand Up @@ -439,7 +439,7 @@
<article class="tum-live-stream group sm:col-span-1 col-span-full"
@click.outside="vod.Dropdown.toggle(false)">
<a :href="course.WatchURL(vod.ID)" class="block mb-2">
<div :style="`background: url('/api/stream/${vod.ID}/thumbs/vod'), url('/thumb-fallback.png')`"
<div :style="`background: url('/api/stream/${vod.ID}/thumbs/vod'), url('/thumb-fallback.png'); background-size: cover;`"
class="aspect-video tum-live-thumbnail">
<div :id="`vod-progress-${vod.ID}`"
class="tum-live-thumbnail-progress">
Expand Down Expand Up @@ -628,7 +628,7 @@
</template>
</div>
<a :href="`/w/${livestream.Course.Slug}/${livestream.Stream.ID}`">
<div :style="`background:url('/api/stream/${livestream.Stream.ID}/thumbs/live'), url('/thumb-fallback.png')`"
<div :style="`background:url('/api/stream/${livestream.Stream.ID}/thumbs/live'), url('/thumb-fallback.png'); background-size: cover;`"
class="h-full tum-live-thumbnail"></div>
</a>
<div class="tum-live-badge absolute bg-black/[.8] text-white bottom-2 right-2 z-40 text-xs">
Expand Down Expand Up @@ -706,7 +706,7 @@
<template x-for="course in recently.get()" :key="course.ID">
<article class="tum-live-stream sm:col-span-1 col-span-full p-3">
<a :href="course.LastRecordingURL()" class="block mb-2">
<div :style="`background:url('/api/stream/${course.LastRecording.ID}/thumbs/vod'), url('/thumb-fallback.png')`"
<div :style="`background:url('/api/stream/${course.LastRecording.ID}/thumbs/vod'), url('/thumb-fallback.png'); background-size: cover;`"
class="aspect-video tum-live-thumbnail">
<div :id="`vod-progress-${course.LastRecording.ID}`"
class="tum-live-thumbnail-progress">
Expand Down
Loading