summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-07-28 19:12:18 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2015-07-28 19:12:18 +0200
commit39689f74fede79cb2a66c13bc91f5300c7407330 (patch)
tree729c95b2c225b05b3e37c07417b6fae91dfbe1ca
parent80197fb14c2c90053fbd5a52b066da0a44be2ed6 (diff)
downloadChimère - projet Saclay-39689f74fede79cb2a66c13bc91f5300c7407330.tar.bz2
Chimère - projet Saclay-39689f74fede79cb2a66c13bc91f5300c7407330.zip
Better fix of bad opening of popup with images inside
-rw-r--r--static/saclay/css/styles.css1
-rw-r--r--static/saclay/js/interface.js4
2 files changed, 4 insertions, 1 deletions
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index 7316646..f196f71 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -1709,7 +1709,6 @@ a.close_img{
.small-gallery{
width:auto;
margin-top:0;
- height:220px;
}
.small-gallery p.legend{
diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js
index cfaaae5..114c210 100644
--- a/static/saclay/js/interface.js
+++ b/static/saclay/js/interface.js
@@ -219,6 +219,10 @@ function display_feature_detail(data, settings){
$('html').addClass('js-on');
$(function(){
$('div.media-player').jmeEmbedControls();
+ setTimeout(function(){
+ settings.current_popup.updateSize();
+ setTimeout(function(){ settings.current_popup.updateSize(); }, 1000);
+ }, 1000);
});
}