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

PHRAS-2829

Browse Source
This commit is contained in:
Harrys Ravalomanana
2019-11-25 17:45:29 +04:00
parent fb708cb131
commit 7a88ece5fe
5 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0", "normalize-css": "^2.1.0",
"npm": "^6.0.0", "npm": "^6.0.0",
"npm-modernizr": "^2.8.3", "npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.78-d", "phraseanet-production-client": "0.34.79-d",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

29
resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss
View File

@@ -7,27 +7,40 @@ ul.image_set{
width:100%; width:100%;
border:none; border:none;
list-style-type: none; list-style-type: none;
display: flex;
flex-wrap: wrap;
} }
li.image_box a img{ li.image_box a img{
position:relative; position:relative;
vertical-align:middle;
border:none; border:none;
width: 100%!important;
height: auto!important;
top: 0 !important;
object-fit: cover;
} }
li.image_box a{ li.image_box a{
padding:0; padding:0;
text-shadow:0; text-shadow:0;
margin:0; margin:0;
width: 100%;
} }
li.image_box{ li.image_box{
width:80px; width: 32%;
height:80px; position: relative;
position:relative; margin: 0 2% 15px 0;
float:left; padding: 0;
margin:0px 15px 15px 0px; display: flex;
padding:0px; align-items: center;
text-align:center; text-align: center;
background: #ededed;
&:nth-child(3n) {
margin-right: 0;
}
.thumb_wrapper { .thumb_wrapper {
background: #ededed; background: #ededed;
width: 100%!important;
height: 100%!important;
} }
} }
a.no.active_choice{ a.no.active_choice{

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

@@ -199,7 +199,6 @@ img {
} }
#report .CHIM.diapo { #report .CHIM.diapo {
position: relative;
text-align: center; text-align: center;
} }

6
templates/mobile/lightbox/validate.html.twig
View File

@@ -61,6 +61,8 @@
{{ 'lightbox::list' | trans }} {{ 'lightbox::list' | trans }}
</a> </a>
</div> </div>
<div class="report_list_backup" id="report_list_backup">&nbsp;</div>
<div class="report_summary_backup " id="report_summary_backup">&nbsp;</div>
{% endif %} {% endif %}
<input type="hidden" id="navigation" value="{{ basket.getId() }}"> <input type="hidden" id="navigation" value="{{ basket.getId() }}">
<div id="report" class="summary_block"> <div id="report" class="summary_block">
@@ -76,7 +78,7 @@
</div> </div>
{% endif %} {% endif %}
<a href="{{ path('lightbox_ajax_load_basketelement', { 'sselcont_id' : basket_element.getId() }) }}"> <a href="{{ path('lightbox_ajax_load_basketelement', { 'sselcont_id' : basket_element.getId() }) }}">
{{thumbnail.format(basket_element.getRecord(app).get_thumbnail(), 80, 80, '', true, false)}} {{thumbnail.format(basket_element.getRecord(app).get_thumbnail(), 300, 300, '', true, false)}}
</a> </a>
<input type="hidden" class="display_id" name="display_id" value="{{basket_element.getOrd()}}" /> <input type="hidden" class="display_id" name="display_id" value="{{basket_element.getOrd()}}" />
</li> </li>
@@ -94,8 +96,6 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="report_list_backup" id="report_list_backup">&nbsp;</div>
<div class="report_summary_backup " id="report_summary_backup">&nbsp;</div>
</div> </div>
{% endblock %} {% endblock %}

8
yarn.lock
View File

@@ -7555,10 +7555,10 @@ phraseanet-common@^0.4.1:
js-cookie "^2.1.0" js-cookie "^2.1.0"
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@0.34.78-d: phraseanet-production-client@0.34.79-d:
version "0.34.78-d" version "0.34.79-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.78-d.tgz#39118f39b07ee9878e2406b48c2c1fa9683598be" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.79-d.tgz#753ebac9e7dcfe49d9f81d2e67847a2031d5e8c6"
integrity sha512-4UtEnUxnvbWxwccLOp/ZisJYKencJ/hrTzmQ7JtdGURC5+KFweohX7nfn+giuA/cmfSk1gP2xc9PW8dJVegDrw== integrity sha512-TGVGYJrRjIMXiuy7TUsAKU+dHep5M0eBBaUykWYUwXDCwtkBSkDAzMW7Rmg6BxQAj8QJArOp+DCQZtVRbF0rZQ==
dependencies: dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2" "@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6" "@turf/turf" "^5.1.6"