diff --git a/package.json b/package.json index 310c5cd977..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.235-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/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/styles/main.scss b/resources/www/lightbox/styles/main.scss index 5c2ae1a573..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; @@ -229,16 +231,13 @@ img { font-size: 14px; line-height: 14px; border: 0; - bottom: 10px; + bottom: -30px; .fa-comment.icon-white { font-size: 15px; line-height: 18px; margin-right: 10px; } } - .user_infos .comment_button { - bottom: initial; - } } #basket_options { @@ -580,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 { 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 6ae64905a3..5a63d68abb 100644 --- a/templates/web/lightbox/feed.html.twig +++ b/templates/web/lightbox/feed.html.twig @@ -97,7 +97,7 @@