Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r27440 -r27569
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27440)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27569)
@@ -59,6 +59,16 @@
position: relative;
}
+.mfp-iframe-holder {
+ padding-top: 0 !important;
+ padding-bottom: 0 !important;
+}
+
+.mfp-iframe-holder .mfp-close {
+ top: 24px !important;
+ right: 10px !important;
+}
+
.divStyle {
float:left;
display:inline;
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r27294 -r27569
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 27294)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 27569)
@@ -277,8 +277,12 @@
loadMaterialPic(materialDefinitionId);
getMaterial();
}
+
+ var bodyHeight = $('body').height();
$(".toussePage").show();
+ $('#imageAndMaterialID').height((bodyHeight-50)+'px');
+
if(sstsConfig.toussePicturesShow && showToussePictures){
$(".instruction-book,.packing-teach,.tousse-video,.checkbox-materialTd").show();
@@ -342,14 +346,16 @@