From 16a390fdb2aa996083abcc72c5705e3210208d2d Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 7 Jul 2020 14:53:21 +0400 Subject: [PATCH] PHRAS-3164 add favicon --- package.json | 2 +- resources/www/lightbox/styles/main.scss | 18 ++++++++++++++++++ templates/web/lightbox/index.html.twig | 4 ---- templates/web/lightbox/index_layout.html.twig | 3 +++ yarn.lock | 8 ++++---- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index bee423ee72..c306bb3e9e 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.250-d", + "phraseanet-production-client": "0.34.252-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/resources/www/lightbox/styles/main.scss b/resources/www/lightbox/styles/main.scss index c98acc4a3e..35a94621ec 100644 --- a/resources/www/lightbox/styles/main.scss +++ b/resources/www/lightbox/styles/main.scss @@ -713,3 +713,21 @@ a.btn-info { } /** End Lightbox summary modal**/ + +.humane{ + position: fixed; + z-index: 100000; + font-family: Ubuntu, Arial, sans-serif; + text-align: center; + font-size: 15px; + top: 100px; + right: 70px; + width: 400px; + background: #2d2d72; + color: rgb(255, 255, 255); + box-shadow: rgb(0, 0, 0) 0px 4px 4px -4px; + transform: translateY(-40px); + transition: all 0.3s ease-out 0s; + padding: 10px; + border-radius: 5px; +} \ No newline at end of file diff --git a/templates/web/lightbox/index.html.twig b/templates/web/lightbox/index.html.twig index 38c7b45b9c..849653daf6 100644 --- a/templates/web/lightbox/index.html.twig +++ b/templates/web/lightbox/index.html.twig @@ -11,10 +11,6 @@ {% endblock %} - {% block icon %} - - {% endblock %} - {% block content %}
diff --git a/templates/web/lightbox/index_layout.html.twig b/templates/web/lightbox/index_layout.html.twig index e04cfe9b77..92d42a9207 100644 --- a/templates/web/lightbox/index_layout.html.twig +++ b/templates/web/lightbox/index_layout.html.twig @@ -1,5 +1,8 @@ {% extends "common/index_bootstrap.html.twig" %} +{% block icon %} + +{% endblock %} {% block extra_content %}
{% endblock %} diff --git a/yarn.lock b/yarn.lock index 3e726f9310..865b962908 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7678,10 +7678,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.250-d: - version "0.34.250-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.250-d.tgz#6d885ed986b22733bdd8e76a1abb0ab85fe35635" - integrity sha512-ae9URsI+LfoRcEP8OD73KpOjJnLYRiqXtgzAzLF97oATY9fidd70lZQPRHgSGKCMLgvE4F68noEAjWoIWE7cpQ== +phraseanet-production-client@0.34.252-d: + version "0.34.252-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.252-d.tgz#e3a628d08d825c2554220cfcbbda3f8e3c3c6127" + integrity sha512-jSfa47v3TcwIbv6ItpzzXER/1U7ydrLyiUFRpJn+H0FapPUJCoKZ9Iy1PqNmUIzlTjqewQlatXSCLzMfzBcMlg== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"