Merge remote-tracking branch 'upstream/master'

diff --git a/website/js/images/marker-icon-2x.png b/website/css/images/marker-icon-2x.png
similarity index 100%
rename from website/js/images/marker-icon-2x.png
rename to website/css/images/marker-icon-2x.png

diff --git a/website/js/images/marker-icon.png b/website/css/images/marker-icon.png
similarity index 100%
rename from website/js/images/marker-icon.png
rename to website/css/images/marker-icon.png

diff --git a/website/js/images/marker-shadow.png b/website/css/images/marker-shadow.png
similarity index 100%
rename from website/js/images/marker-shadow.png
rename to website/css/images/marker-shadow.png

diff --git a/website/css/search.css b/website/css/search.css
index eb0d06d735d65129fa4d4a658d99d3393ec72b1c..9c061783bcd0ca61b2391b2f0b3ca0f36d2a0ead 100644 (file)
--- a/website/css/search.css
+++ b/website/css/search.css
@@ -65,7 +65,7 @@ form label {
   color: #333;
   font-size: 11px;
   background-color: rgba(255, 255, 255, 0.7);
-  z-index: 100;
+  z-index: 500;
 }
 
 #map-position-close {