diff --git a/package.json b/package.json index 758af630cc..152b427e5b 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.220-d", + "phraseanet-production-client": "0.34.236-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/resources/www/lightbox/images/chevron-left-solid.svg b/resources/www/lightbox/images/chevron-left-solid.svg new file mode 100644 index 0000000000..41061c287f --- /dev/null +++ b/resources/www/lightbox/images/chevron-left-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/lightbox/images/chevron-right-solid.svg b/resources/www/lightbox/images/chevron-right-solid.svg new file mode 100644 index 0000000000..6f3ecc4dc0 --- /dev/null +++ b/resources/www/lightbox/images/chevron-right-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/lightbox/images/file-download-solid-blue.svg b/resources/www/lightbox/images/file-download-solid-blue.svg new file mode 100644 index 0000000000..bf3bfc4d65 --- /dev/null +++ b/resources/www/lightbox/images/file-download-solid-blue.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/lightbox/images/file-download-solid.svg b/resources/www/lightbox/images/file-download-solid.svg new file mode 100644 index 0000000000..c12919acc9 --- /dev/null +++ b/resources/www/lightbox/images/file-download-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/lightbox/images/home-solid.svg b/resources/www/lightbox/images/home-solid.svg new file mode 100644 index 0000000000..6978af21f6 --- /dev/null +++ b/resources/www/lightbox/images/home-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/lightbox/images/pause-solid.svg b/resources/www/lightbox/images/pause-solid.svg new file mode 100644 index 0000000000..7cf2497164 --- /dev/null +++ b/resources/www/lightbox/images/pause-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/lightbox/images/play-solid.svg b/resources/www/lightbox/images/play-solid.svg new file mode 100644 index 0000000000..bcd81f7a6d --- /dev/null +++ b/resources/www/lightbox/images/play-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/lightbox/styles/main.scss b/resources/www/lightbox/styles/main.scss index 94613502fa..c98acc4a3e 100644 --- a/resources/www/lightbox/styles/main.scss +++ b/resources/www/lightbox/styles/main.scss @@ -99,7 +99,7 @@ img { overflow: scroll; } .display_id { - top: 5px; + top: 0; margin: 0 0 0 5px; } } @@ -134,8 +134,8 @@ img { background-color: #212121; } .display_id { - top: 4px; - left: 8px; + top: 5px; + left: 5px; } .agreement { position: absolute; @@ -173,7 +173,9 @@ img { .display_id { background-color: #FFFFFF; - padding: 3px 6px; + padding: 3.5px 6px; + min-width: 15px; + text-align: center; font-weight: bold; z-index: 99; color: #212121; @@ -214,6 +216,28 @@ img { overflow: hidden; background-color: #1F1E1B; color: #BFBFBF; + .PNB.choices { + position: relative; + } + .comment_button { + text-align: center; + background: #353430; + margin: 0; + width: 118px; + position: absolute; + left: 50%; + transform: translateX(-50%); + padding: 7px; + font-size: 14px; + line-height: 14px; + border: 0; + bottom: -30px; + .fa-comment.icon-white { + font-size: 15px; + line-height: 18px; + margin-right: 10px; + } + } } #basket_options { @@ -230,6 +254,11 @@ img { #basket_infos .user_infos { height: 120px; top: auto; + bottom: 43px; +} +.lightbox-icon { + width: 10px; + padding-bottom: 1px; } #basket_infos { @@ -284,7 +313,7 @@ img { } #right_column .right_column_wrapper { - //top: 30px; + top: 30px; bottom: 45px; } @@ -296,6 +325,7 @@ img { #record_infos { overflow-x: hidden; overflow-y: auto; + margin-bottom: 80px; } #record_compare { @@ -303,7 +333,10 @@ img { top: auto; left: auto; } - +.download-feed{ + color: #fff; + font-size: 22px; +} #record_compare .header, #record_compare .lightbox_container { left: 5px; } @@ -546,10 +579,14 @@ table th i { } .basket_downloader { - background-color: #1F1E1B; + background-color: #ffffff; margin: 0 10px; - padding: 2px; + padding: 4px 0; border: 0; + transition: 0.3s all; + &:hover { + background-color: #e6e6e6; + } } hr { @@ -562,6 +599,13 @@ hr { .report { margin: 0 10px; vertical-align: bottom; +}.back-home { + margin: 0 10px; + vertical-align: bottom; + width: 20px; + background: #1F1E1B; + padding: 5px; + border-radius: 3px; } /* diff --git a/templates/web/lightbox/agreement_box.html.twig b/templates/web/lightbox/agreement_box.html.twig index ddf7ef1601..8a5d673da7 100644 --- a/templates/web/lightbox/agreement_box.html.twig +++ b/templates/web/lightbox/agreement_box.html.twig @@ -47,4 +47,16 @@ {% endif %} + {% if basket_element.getBasket().getValidation() %} + + {% endif %} diff --git a/templates/web/lightbox/feed.html.twig b/templates/web/lightbox/feed.html.twig index 0dc742d47d..5a63d68abb 100644 --- a/templates/web/lightbox/feed.html.twig +++ b/templates/web/lightbox/feed.html.twig @@ -92,11 +92,12 @@
- - {% if basket.getValidation() %} - - {% endif %} + +
+ + diff --git a/templates/web/lightbox/feed_options_box.html.twig b/templates/web/lightbox/feed_options_box.html.twig index ea555b12cb..706c2771b6 100644 --- a/templates/web/lightbox/feed_options_box.html.twig +++ b/templates/web/lightbox/feed_options_box.html.twig @@ -1,25 +1,25 @@ {% if feed_element %}
diff --git a/templates/web/lightbox/sc_options_box.html.twig b/templates/web/lightbox/sc_options_box.html.twig index 930ef37f98..50edaf67d9 100644 --- a/templates/web/lightbox/sc_options_box.html.twig +++ b/templates/web/lightbox/sc_options_box.html.twig @@ -1,42 +1,31 @@ {% if basket_element %} | - {% if basket_element.getBasket().getValidation() %} - - {% endif %} + {% endif %}
diff --git a/templates/web/lightbox/validate.html.twig b/templates/web/lightbox/validate.html.twig index 87c67ec0b9..72d55c0f6d 100644 --- a/templates/web/lightbox/validate.html.twig +++ b/templates/web/lightbox/validate.html.twig @@ -155,11 +155,10 @@
- - + + diff --git a/yarn.lock b/yarn.lock index 714926c5ce..38e0f53175 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7578,10 +7578,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.220-d: - version "0.34.220-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.220-d.tgz#5046bff7f86e26e3d239fa97a7f3618e27cbacfb" - integrity sha512-cPEFyCRkgf36wS8axGtIhkLHXdq4Rg9yRZozPm3BA93R8tD9fFWSMc6y1z6Ux10qUcyEXhtje6+a8tSqpKUPyw== +phraseanet-production-client@0.34.236-d: + version "0.34.236-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.236-d.tgz#083120cc1ff02893b62058ff875742d45975e3ee" + integrity sha512-mOT8S2V2FlhOVZmIo2cWQuXOTQ9D4h7t0jquhLboz2zN4Uo0iLFAEkM0P9GmizYSixh1MYLbU0vFLJUPzvz2Wg== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"