hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2504-ginga-subtitle

Browse Source
This commit is contained in:
aynsix
2020-07-08 18:04:47 +03:00
parent 8f3f3845c0 1cc45f9794
commit 1d243776e2
26 changed files with 811 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/web/prod/actions/Tools/videoEditor.html.twig
View File

@@ -92,7 +92,9 @@
</video>
</div>
<div class="videotools-spinner ui-widget-overlay ui-front hidden" id="videotools-spinner" style="opacity: 0.9">
<img src="/assets/common/images/icons/loading.svg" alt="" id="gif-loader">
</div>
<div id="thumb_camera_button"></div>
<div class="vertical-divider"></div>