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 'master' into PHRAS-2196-api-stories-pagination

Browse Source
This commit is contained in:
Nicolas Maillat
2019-12-13 09:24:28 +01:00
committed by GitHub
parent 6afc40ef3b 9508178e48
commit 1e5aff5abb
4 changed files with 180 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -84,7 +84,7 @@
"league/flysystem": "^1.0", "league/flysystem": "^1.0",
"league/flysystem-aws-s3-v2": "^1.0", "league/flysystem-aws-s3-v2": "^1.0",
"league/fractal": "dev-webgalleries#af1acc0275438571bc8c1d08a05a4b5af92c9f97 as 0.13.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", "monolog/monolog": "~1.3",
"mrclay/minify": "~2.1.6", "mrclay/minify": "~2.1.6",
"neutron/process-manager": "2.0.x-dev@dev", "neutron/process-manager": "2.0.x-dev@dev",

337
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

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

@@ -650,8 +650,12 @@ button.confirm_report {
min-height: 26px; min-height: 26px;
padding: 10px 0; padding: 10px 0;
} }
.ui-controlgroup, fieldset.ui-controlgroup {
margin: 10px 0!important;
}
.ui-listview.lightbox-list-view { .ui-listview.lightbox-list-view {
margin-top: 0;
margin-bottom: 0;
& > .ui-li-static { & > .ui-li-static {
padding: .7em 1em; padding: .7em 1em;
text-overflow: inherit; text-overflow: inherit;
@@ -687,6 +691,10 @@ button.confirm_report {
.center-image { .center-image {
text-align: center; text-align: center;
iframe {
min-height: 240px;
width: auto;
}
} }
/*validate page*/ /*validate page*/

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

@@ -77,8 +77,8 @@
for="radio-view-no_{{ basket_element.getId() }}">{{ 'validation:: NON' | trans }}</label> for="radio-view-no_{{ basket_element.getId() }}">{{ 'validation:: NON' | trans }}</label>
</fieldset> </fieldset>
{% endif %} {% endif %}
<div style="text-align:center;margin:0 0 1em 0"> <div style="text-align:center;margin:20px 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"> <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 }} {{ 'validation:: editer ma note' | trans }}
</a> </a>
</div> </div>