diff --git a/package.json b/package.json index 70e5d14918..fc730f3db4 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.79-d", + "phraseanet-production-client": "0.34.80-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss b/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss index a44f3d8f48..5a12f1c4b6 100644 --- a/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss +++ b/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss @@ -26,15 +26,15 @@ li.image_box a{ width: 100%; } li.image_box{ - width: 32%; + width: 18%; position: relative; - margin: 0 2% 15px 0; + margin: 0 2.5% 15px 0; padding: 0; display: flex; align-items: center; text-align: center; background: #ededed; - &:nth-child(3n) { + &:nth-child(5n) { margin-right: 0; } .thumb_wrapper { @@ -43,6 +43,19 @@ li.image_box{ height: 100%!important; } } +@media screen and (max-width: 767px) { + li.image_box{ + width: 32%; + margin: 0 2% 15px 0; + &:nth-child(5n) { + margin-right: 2% ; + } + &:nth-child(3n) { + margin-right: 0; + } + } +} + a.no.active_choice{ background-color:red; color: #fff; diff --git a/templates/mobile/lightbox/basket_element.html.twig b/templates/mobile/lightbox/basket_element.html.twig index 4934ae1848..08cfc9bd1b 100644 --- a/templates/mobile/lightbox/basket_element.html.twig +++ b/templates/mobile/lightbox/basket_element.html.twig @@ -67,10 +67,10 @@ {% if basket_element.getBasket().getValidation() %} {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %}
diff --git a/templates/mobile/lightbox/sc_note.html.twig b/templates/mobile/lightbox/sc_note.html.twig index 06fbfb0285..fe3ed24cd8 100644 --- a/templates/mobile/lightbox/sc_note.html.twig +++ b/templates/mobile/lightbox/sc_note.html.twig @@ -2,7 +2,8 @@{{ 'validation:: note' | trans }} : {{ validationDatas.getNote()|nl2br }}
{% endif %} {% endif %} diff --git a/yarn.lock b/yarn.lock index d94be22d25..ebc0ac35a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.1: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.79-d: - version "0.34.79-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.79-d.tgz#753ebac9e7dcfe49d9f81d2e67847a2031d5e8c6" - integrity sha512-TGVGYJrRjIMXiuy7TUsAKU+dHep5M0eBBaUykWYUwXDCwtkBSkDAzMW7Rmg6BxQAj8QJArOp+DCQZtVRbF0rZQ== +phraseanet-production-client@0.34.80-d: + version "0.34.80-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.80-d.tgz#1e54bee4306ab11528377cb63c19d8c7491ef0f3" + integrity sha512-ilGs7ndDNztwlyeW9MA2TMiMhZC+P1/lNNeIsIuh+KuJH8M3Y3SWBcmsN2lqu5iM1Xg5FbWJ6iXcCSrLWHTqsw== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"