Merge branch 'master' into saclay

2 files changed, 14 insertions, 1 deletions

diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index 2cb5fba..ab6c524 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -1257,9 +1257,14 @@ label[for=id_transport_0]{
     background-image:url('../images/buttons/walk.png');
 }
 
+#id_transport_it span#id_transport_it_foot{
+    display:none;
+}
+
 #id_transport_it span#id_transport_it_foot.selected,
 label[for=id_transport_0]:hover,
 label[for=id_transport_0][aria-pressed=true]{
+    display:inline-block;
     background-image:url('../images/buttons/walk_on.png');
 }
 
@@ -1268,9 +1273,14 @@ label[for=id_transport_1]{
     background-image:url('../images/buttons/bicycle.png');
 }
 
+#id_transport_it span#id_transport_it_bicycle{
+    display:none;
+}
+
 #id_transport_it span#id_transport_it_bicycle.selected,
 label[for=id_transport_1]:hover,
 label[for=id_transport_1][aria-pressed=true]{
+    display:inline-block;
     background-image:url('../images/buttons/bicycle_on.png');
 }
 
@@ -1714,7 +1724,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 3c0ae1d..e004ce4 100644
--- a/static/saclay/js/interface.js
+++ b/static/saclay/js/interface.js
@@ -227,6 +227,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);
     });
 }