Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2022-02-04 11:33:43 +01:00
commit ecbaed5c85
2 changed files with 6 additions and 1 deletions

View File

@ -765,6 +765,11 @@ a.item-heart {
max-width: 100%; max-width: 100%;
} }
.widget-ckeditor img {
height:auto !important;
}
.frameitem { .frameitem {
position: absolute; position: absolute;
right: 0px; right: 0px;

View File

@ -68,7 +68,7 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
{{ alert.content|raw }} <div class="widget-ckeditor">{{ alert.content|raw }}</div>
{% if not alert.items is empty %} {% if not alert.items is empty %}
{% if app.user %} {% if app.user %}