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

[WIP] Fix CSS z-index for audio enrichment slide to keep them over the sound wave element #1013

Merged
merged 8 commits into from
Jan 9, 2024
Merged

[WIP] Fix CSS z-index for audio enrichment slide to keep them over the sound wave element #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e53e211
Update views.py
gcondess Nov 5, 2021
7c51eee
Merge branch 'dev' of https://github.com/gcondess/podv2 into dev
gcondess Apr 25, 2022
34953a8
Merge branch 'dev' of https://github.com/EsupPortail/Esup-Pod into dev
gcondess Apr 25, 2022
07ed2c5
Merge pull request #971 from EsupPortail/develop
ptitloup Oct 23, 2023
2d0be03
Merge branch 'master' of https://github.com/EsupPortail/Esup-Pod into…
gcondess Oct 26, 2023
813b3b6
Merge branch 'develop' of https://github.com/EsupPortail/Esup-Pod int…
gcondess Dec 6, 2023
7cee6f2
:bug: Fix z-index in audio enrichment to keep enrichement slides over…
gcondess Dec 7, 2023
ad72cef
Merge branch 'develop' of https://github.com/EsupPortail/Esup-Pod int…
gcondess Dec 19, 2023
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: 5 additions & 0 deletions pod/enrichment/static/css/videojs-slides.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
z-index: 2;
}

.vjs-wavesurfer.vjs-fluid wave.vjs-wavedisplay {
z-index:0;
}

.vjs-slides {
display: block;
}
Expand All @@ -18,6 +22,7 @@
height: 100%;
bottom: 0;
padding: 0;
z-index:1;
}

.video-slides > li {
Expand Down
4 changes: 4 additions & 0 deletions pod/enrichment/templates/enrichment/video_enrichment-iframe.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@

{% block more_script %}
{{block.super}}
<script>
var enrichmentIsOn = true;
</script>

<script id="enrichment_script_id" src="{% static 'js/videojs-slides.js' %}?ver={{VERSION}}"></script>
{% include 'enrichment/video_enrichment-script.html' %}
{% endblock more_script %}
4 changes: 4 additions & 0 deletions pod/video/templates/videos/video-iframe.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@

<link rel="stylesheet" href="{% static 'css/video-iframe.css' %}?ver={{VERSION}}">

{% if CSS_OVERRIDE %}
<link rel="stylesheet" href="{% static CSS_OVERRIDE %}?ver={{VERSION}}" media="screen">
{% endif %}

<meta itemprop="duration" content="{{ video.duration }}">
<meta itemprop="thumbnailUrl" content="{{ video.get_thumbnail_url }}">
<meta itemprop="contentURL" content="{% if request.is_secure %}https{% else %}http{% endif %}: //{{ request.META.HTTP_HOST }}{% url 'video:video' slug=video.slug %}">
Expand Down