From 11e4f181271029845bb4d23001bfba636f06cc2d Mon Sep 17 00:00:00 2001 From: mike-esokia Date: Fri, 11 May 2018 13:08:05 +0400 Subject: [PATCH 1/2] add scroll for webkit --- templates/mobile/common/thumbnail.html.twig | 11 ++++++----- templates/mobile/lightbox/basket_element.html.twig | 5 +++-- templates/mobile/lightbox/feed_element.html.twig | 9 +++++---- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/templates/mobile/common/thumbnail.html.twig b/templates/mobile/common/thumbnail.html.twig index bc36892b3a..250e8f0e98 100644 --- a/templates/mobile/common/thumbnail.html.twig +++ b/templates/mobile/common/thumbnail.html.twig @@ -59,17 +59,18 @@ {% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %} + frameborder="0" allowfullscreen> {% elseif record_type == 'FLEXPAPER' %} + frameborder="0" allowfullscreen> {% elseif record_type == 'AUDIO_MP3' %} {% else %} - - {% endif %} + + {% endif %} {% endmacro %} diff --git a/templates/mobile/lightbox/basket_element.html.twig b/templates/mobile/lightbox/basket_element.html.twig index 96b602f317..0cd2a1be3b 100644 --- a/templates/mobile/lightbox/basket_element.html.twig +++ b/templates/mobile/lightbox/basket_element.html.twig @@ -25,13 +25,14 @@ } #content { - position:absolute; + position: fixed; top:50px; bottom: 0; right: 0; left: 0; text-align: center; - overflow: scroll; + overflow-y: scroll; + -webkit-overflow-scrolling: touch; } {% endblock %} diff --git a/templates/mobile/lightbox/feed_element.html.twig b/templates/mobile/lightbox/feed_element.html.twig index 1ba0c911bb..9aa5f0aa99 100644 --- a/templates/mobile/lightbox/feed_element.html.twig +++ b/templates/mobile/lightbox/feed_element.html.twig @@ -16,13 +16,14 @@ } #content { - position:absolute; + position: fixed; top:50px; bottom: 0; right: 0; left: 0; text-align: center; - overflow: scroll; + overflow-y: scroll; + -webkit-overflow-scrolling: touch; } {% endblock %} @@ -35,9 +36,9 @@

{{feed_element.getOrd()}} - {{record.get_title()}}

Home -
+
{{ thumbnail.format100percent(record.get_preview()) }}
-{% endblock %} +{% endblock %} \ No newline at end of file From 015cb0313a2e0c98c42c63ddd47a49d6e5f286a1 Mon Sep 17 00:00:00 2001 From: mike-esokia Date: Fri, 11 May 2018 13:15:43 +0400 Subject: [PATCH 2/2] fix css class for button --- resources/www/lightbox/styles/main-mobile.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/www/lightbox/styles/main-mobile.scss b/resources/www/lightbox/styles/main-mobile.scss index 424fe29311..a3476342d9 100644 --- a/resources/www/lightbox/styles/main-mobile.scss +++ b/resources/www/lightbox/styles/main-mobile.scss @@ -4,13 +4,13 @@ width: 90%; margin: 0px auto; padding: 4px; - ui-btn { + .ui-btn { height: 36px !important; width: 36px !important; font-size: 16px !important; border-radius: 19px; } - ui-btn::after { + .ui-btn::after { height: 30px !important; width: 30px !important; margin-left: -15px;