From 9e1fa5413aa48a20652d2219add5404b7a7fd01f Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 27 Dec 2019 15:09:03 +0400 Subject: [PATCH 1/4] PHRAS-2863 #comment fix lightbox mobile pdf reading on thumbnail #time 2h --- .../www/lightbox/styles/jquery-mobile/_jquery-validator.scss | 5 +++++ resources/www/lightbox/styles/main-mobile.scss | 3 +++ templates/mobile/common/thumbnail.html.twig | 3 +++ 3 files changed, 11 insertions(+) diff --git a/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss b/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss index 013a7ae0a7..67a0ad85cd 100644 --- a/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss +++ b/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss @@ -319,3 +319,8 @@ a.active_choice { color: #313131; padding: 6px 0 6px 30px; } + +.pdf-iframe { + background: #1a1a1a; + padding-bottom: 10px; +} diff --git a/resources/www/lightbox/styles/main-mobile.scss b/resources/www/lightbox/styles/main-mobile.scss index 7f53448267..e9ff61aa43 100644 --- a/resources/www/lightbox/styles/main-mobile.scss +++ b/resources/www/lightbox/styles/main-mobile.scss @@ -694,6 +694,9 @@ button.confirm_report { iframe { min-height: 240px; width: auto; + .ui-mobile & { + width: 100%; + } } } diff --git a/templates/mobile/common/thumbnail.html.twig b/templates/mobile/common/thumbnail.html.twig index 250e8f0e98..6ef1322f01 100644 --- a/templates/mobile/common/thumbnail.html.twig +++ b/templates/mobile/common/thumbnail.html.twig @@ -68,9 +68,12 @@ + {% elseif record_type == 'PDF' %} + {% else %} + {{ record_type }} {% endif %} {% endmacro %} From cba9b9b5acb4e90377de32408c8db9715014c650 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 27 Dec 2019 15:11:40 +0400 Subject: [PATCH 2/4] PHRAS-2863 --- templates/mobile/common/thumbnail.html.twig | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/mobile/common/thumbnail.html.twig b/templates/mobile/common/thumbnail.html.twig index 6ef1322f01..d2b805d5fb 100644 --- a/templates/mobile/common/thumbnail.html.twig +++ b/templates/mobile/common/thumbnail.html.twig @@ -74,6 +74,5 @@ - {{ record_type }} {% endif %} {% endmacro %} From 4d768889f21de7af651d28e1395d01f16abccf61 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 7 Jan 2020 10:55:11 +0400 Subject: [PATCH 3/4] PHRAS-2863 #comment Lightbox mobile: resize pdf iframe #time 3h --- templates/mobile/lightbox/basket_element.html.twig | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/templates/mobile/lightbox/basket_element.html.twig b/templates/mobile/lightbox/basket_element.html.twig index 54736a3fb2..05f043fb7f 100644 --- a/templates/mobile/lightbox/basket_element.html.twig +++ b/templates/mobile/lightbox/basket_element.html.twig @@ -93,5 +93,14 @@ + {% endblock %} From 93a9bb83e08711240bc5d975000c757155597ceb Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 7 Jan 2020 11:04:24 +0400 Subject: [PATCH 4/4] PHRAS-2863 --- templates/mobile/lightbox/basket_element.html.twig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/mobile/lightbox/basket_element.html.twig b/templates/mobile/lightbox/basket_element.html.twig index 05f043fb7f..55ba5637ff 100644 --- a/templates/mobile/lightbox/basket_element.html.twig +++ b/templates/mobile/lightbox/basket_element.html.twig @@ -97,9 +97,8 @@ /*resize of PDF */ $(window).on("load resize ",function(e){ if($('.pdf-iframe').length > 0) { - - var pdfHeight = $('.pdf-iframe').width() / 0.707; - $('.pdf-iframe').css('height', pdfHeight); + var pdfHeight = $('.pdf-iframe').width() / 0.707; + $('.pdf-iframe').css('height', pdfHeight); } });