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

PHRAS-3116 Fix on duration display

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-06-18 19:27:38 +04:00
parent 0726e57187
commit 130912f6f9
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0", "normalize-css": "^2.1.0",
"npm": "^6.0.0", "npm": "^6.0.0",
"npm-modernizr": "^2.8.3", "npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.232-d", "phraseanet-production-client": "0.34.234-d",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

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

@@ -289,6 +289,14 @@
> >
</iframe> </iframe>
</div> </div>
<style>
.video-subtitle-editor-container .number {
float: none;
}
.video-subtitle-editor-container .editing .number {
float: left;
}
</style>
<script type="text/javascript"> <script type="text/javascript">
var toolsConfig = { var toolsConfig = {
selectionLength: {{ selectionLength }}, selectionLength: {{ selectionLength }},

8
yarn.lock
View File

@@ -7578,10 +7578,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0" js-cookie "^2.1.0"
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@0.34.232-d: phraseanet-production-client@0.34.234-d:
version "0.34.232-d" version "0.34.234-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.232-d.tgz#cb642ba78e85dbc1b32c9b2785b63ecf7c671fab" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.234-d.tgz#0db4c6477bdda2946d41e9601f1198b350c57886"
integrity sha512-1z448ebd+Clql852Ai8wrsALxeAJ4OlQ0prG/T/sJNunNp1nxhVePZs6AuYTm5l/v6XkW27Em1o6FKn9XK3hfA== integrity sha512-eMfX0xdOsjg9FqhcT22RLX/zNzTFvsQv8oTImJ6Wc9XA2Q/j+SiI40LxnvZEmzYQsEKEQMzbQhA4IxowsbzgYw==
dependencies: dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2" "@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6" "@turf/turf" "^5.1.6"