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

Merge branch '3.8'

Browse Source 
Conflicts:
	composer.lock
	templates/mobile/common/index.html.twig
This commit is contained in:
Romain Neutron
2013-09-05 13:57:42 +02:00
parent c53017b1ab a5b58730fd
commit 6c29fc88e9
20 changed files with 382 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
templates/mobile/common/index.html.twig
View File

@@ -8,6 +8,31 @@
<link rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/jquery-mobile/jquery.mobile.css' }) }}" />
<script src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
<script src="{{ path('minifier', { 'f' : 'assets/jquery-mobile/jquery.mobile.js' }) }}"></script>
<style type="text/css">
html,body, div[data-role ="page"] {
height: 100%;
width: 100%;
margin: 0px;
padding: 0px;
}
.ui-content{
height: 85%;
width: 100%;
margin: 0px;
padding: 0px;
display:table;
}
#map {
height: 100%;
width: 100%;
padding: 0px;
display:table-cell;
vertical-align: middle;
text-align: center
}
</style>
{% block stylesheet %}{% endblock %}
{% block icon %}{% endblock %}
{% block javascript %}{% endblock %}