mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
Merge branch '3.8'
Conflicts: composer.json composer.lock lib/classes/task/Scheduler.php
This commit is contained in:
@@ -15,23 +15,6 @@
|
||||
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 %}
|
||||
|
Reference in New Issue
Block a user