hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 10:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2587 from mike-esokia/PHRAS-2034_fix_ui_lightbox_mobile

Browse Source 
PHRAS-2034 add scroll for webkit
This commit is contained in:
Nicolas Maillat
2018-05-11 14:47:21 +02:00
committed by GitHub
parent 07da4872f5 015cb0313a
commit a3c07056c3
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/www/lightbox/styles/main-mobile.scss
View File

@@ -4,13 +4,13 @@
width: 90%; width: 90%;
margin: 0px auto; margin: 0px auto;
padding: 4px; padding: 4px;
ui-btn { .ui-btn {
height: 36px !important; height: 36px !important;
width: 36px !important; width: 36px !important;
font-size: 16px !important; font-size: 16px !important;
border-radius: 19px; border-radius: 19px;
} }
ui-btn::after { .ui-btn::after {
height: 30px !important; height: 30px !important;
width: 30px !important; width: 30px !important;
margin-left: -15px; margin-left: -15px;

11
templates/mobile/common/thumbnail.html.twig
View File

@@ -59,17 +59,18 @@
{% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %} {% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %}
<iframe width="100%" height="100%" <iframe width="100%" height="100%"
src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}" src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}"
frameborder="0"></iframe> frameborder="0" allowfullscreen></iframe>
{% elseif record_type == 'FLEXPAPER' %} {% elseif record_type == 'FLEXPAPER' %}
<iframe width="100%" height="100%" <iframe width="100%" height="100%"
src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}" src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}"
frameborder="0"></iframe> frameborder="0" allowfullscreen></iframe>
{% elseif record_type == 'AUDIO_MP3' %} {% elseif record_type == 'AUDIO_MP3' %}
<iframe width="100%" height="100%" <iframe width="100%" height="100%"
src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}" src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}"
frameborder="0" allowfullscreen></iframe> frameborder="0" allowfullscreen></iframe>
{% else %} {% else %}
<img style="max-height: 100%;max-width:100%" class="record record_image imgTips zoomable thumb" oncontextMenu="return(false);" <img style="max-height: 100%;max-width:100%" class="record record_image imgTips zoomable thumb"
src="{{thumbnail.get_url()|trim}}" ondragstart="return false;" /> oncontextMenu="return(false);"
{% endif %} src="{{ thumbnail.get_url()|trim }}" ondragstart="return false;"/>
{% endif %}
{% endmacro %} {% endmacro %}

5
templates/mobile/lightbox/basket_element.html.twig
View File

@@ -25,13 +25,14 @@
} }
#content { #content {
position:absolute; position: fixed;
top:50px; top:50px;
bottom: 0; bottom: 0;
right: 0; right: 0;
left: 0; left: 0;
text-align: center; text-align: center;
overflow: scroll; overflow-y: scroll;
-webkit-overflow-scrolling: touch;
} }
</style> </style>
{% endblock %} {% endblock %}

7
templates/mobile/lightbox/feed_element.html.twig
View File

@@ -16,13 +16,14 @@
} }
#content { #content {
position:absolute; position: fixed;
top:50px; top:50px;
bottom: 0; bottom: 0;
right: 0; right: 0;
left: 0; left: 0;
text-align: center; text-align: center;
overflow: scroll; overflow-y: scroll;
-webkit-overflow-scrolling: touch;
} }
</style> </style>
{% endblock %} {% endblock %}
@@ -35,7 +36,7 @@
<h1>{{feed_element.getOrd()}} - {{record.get_title()}}</h1> <h1>{{feed_element.getOrd()}} - {{record.get_title()}}</h1>
<a rel="external" href="{{ path('lightbox') }}" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a> <a rel="external" href="{{ path('lightbox') }}" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
</div> </div>
<div data-role="content"> <div id="content" data-role="content">
{{ thumbnail.format100percent(record.get_preview()) }} {{ thumbnail.format100percent(record.get_preview()) }}
</div> </div>
<div data-role="footer"> <div data-role="footer">