fix merge conflicts
This commit is contained in:
commit
de2b0d9064
2 changed files with 103 additions and 129 deletions
|
|
@ -33,7 +33,7 @@ body {
|
|||
|
||||
</div>
|
||||
<div class="video-block">
|
||||
<video src="{{ settings.TIMELINE_PREFIX }}{{ film.padma_id }}/loop.mp4" autoplay loop muted></video>
|
||||
<video src="{{ settings.TIMELINE_PREFIX }}{{ film.padma_id }}/loop.mp4" autoplay loop muted playsinline></video>
|
||||
</div>
|
||||
<div class="summary-block">
|
||||
<p>{{ film.data.summary|safe }}</p>
|
||||
|
|
@ -49,7 +49,7 @@ body {
|
|||
{{film.data.director.1}}: {{ film.data.bio_zh|safe }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="play">
|
||||
<div class="texts">
|
||||
{% for text in film.related_texts %}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue