mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
Merge branch 'master' into PHRAS-2196-api-stories-pagination
This commit is contained in:
@@ -84,7 +84,7 @@
|
||||
"league/flysystem": "^1.0",
|
||||
"league/flysystem-aws-s3-v2": "^1.0",
|
||||
"league/fractal": "dev-webgalleries#af1acc0275438571bc8c1d08a05a4b5af92c9f97 as 0.13.0",
|
||||
"media-alchemyst/media-alchemyst": "^0.5",
|
||||
"media-alchemyst/media-alchemyst": "^0.5.5",
|
||||
"monolog/monolog": "~1.3",
|
||||
"mrclay/minify": "~2.1.6",
|
||||
"neutron/process-manager": "2.0.x-dev@dev",
|
||||
|
337
composer.lock
generated
337
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -650,8 +650,12 @@ button.confirm_report {
|
||||
min-height: 26px;
|
||||
padding: 10px 0;
|
||||
}
|
||||
|
||||
.ui-controlgroup, fieldset.ui-controlgroup {
|
||||
margin: 10px 0!important;
|
||||
}
|
||||
.ui-listview.lightbox-list-view {
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
& > .ui-li-static {
|
||||
padding: .7em 1em;
|
||||
text-overflow: inherit;
|
||||
@@ -687,6 +691,10 @@ button.confirm_report {
|
||||
|
||||
.center-image {
|
||||
text-align: center;
|
||||
iframe {
|
||||
min-height: 240px;
|
||||
width: auto;
|
||||
}
|
||||
}
|
||||
|
||||
/*validate page*/
|
||||
|
@@ -77,8 +77,8 @@
|
||||
for="radio-view-no_{{ basket_element.getId() }}">{{ 'validation:: NON' | trans }}</label>
|
||||
</fieldset>
|
||||
{% endif %}
|
||||
<div style="text-align:center;margin:0 0 1em 0">
|
||||
<a href="{{ path('lightbox_ajax_note_form', { 'sselcont_id' : basket_element.getId() }) }}" data-role="button" data-inline="true" data-rel="dialog" data-transition="slidedown">
|
||||
<div style="text-align:center;margin:20px 0">
|
||||
<a style="margin: 0" href="{{ path('lightbox_ajax_note_form', { 'sselcont_id' : basket_element.getId() }) }}" data-role="button" data-inline="true" data-rel="dialog" data-transition="slidedown">
|
||||
{{ 'validation:: editer ma note' | trans }}
|
||||
</a>
|
||||
</div>
|
||||
|
Reference in New Issue
Block a user