Merge branch 'develop'

TNRIS · Jun 12, 2019 · 5b7461a · 5b7461a
2 parents 7ca02fc + 15e8c14
commit 5b7461a
Show file tree

Hide file tree

Showing 24 changed files with 11,951 additions and 226 deletions.
diff --git a/lakegallery/map/static/map/base_script.js b/lakegallery/map/static/map/base_script.js
diff --git a/lakegallery/map/static/map/bootstrap-slider/bootstrap-slider.min.js b/lakegallery/map/static/map/bootstrap-slider/bootstrap-slider.min.js
diff --git a/lakegallery/map/static/map/bootstrap-slider/css/bootstrap-slider.min.css b/lakegallery/map/static/map/bootstrap-slider/css/bootstrap-slider.min.css
diff --git a/lakegallery/map/static/map/leaflet_markercluster/css/MarkerCluster.Default.css b/lakegallery/map/static/map/leaflet_markercluster/css/MarkerCluster.Default.css
@@ -1,23 +1,40 @@
+/* marker cluster colors have been altered from the default (lake blue color scheme) */
+
+/* .marker-cluster-small {
+	background-color: rgba(4, 91, 149, 0.6);
+  }
+.marker-cluster-small div {
+	background-color: rgba(3, 76, 125, 0.6);
+  } */
+
+/* .marker-cluster-large {
+	background-color: rgba(4, 91, 149, 0.6);
+	}
+.marker-cluster-large div {
+	background-color: rgba(3, 76, 125, 0.6);
+	} */
+
 .marker-cluster-small {
-	background-color: rgba(181, 226, 140, 0.6);
+	background-color: rgba(4, 122, 200, 0.6);
 	}
 .marker-cluster-small div {
-	background-color: rgba(110, 204, 57, 0.6);
+	background-color: rgba(4, 106, 174, 0.6);
 	}
 
 .marker-cluster-medium {
-	background-color: rgba(241, 211, 87, 0.6);
+	background-color: rgba(4, 91, 149, 0.6);
 	}
 .marker-cluster-medium div {
-	background-color: rgba(240, 194, 12, 0.6);
+	background-color: rgba(3, 76, 125, 0.6);
 	}
 
 .marker-cluster-large {
-	background-color: rgba(253, 156, 115, 0.6);
+	background-color: rgba(2, 61, 100, 0.6);
 	}
 .marker-cluster-large div {
-	background-color: rgba(241, 128, 23, 0.6);
+	background-color: rgba(1, 37, 61, 0.6);
 	}
+/* end custom cluster colors */
 
 	/* IE 6-8 fallback colors */
 .leaflet-oldie .marker-cluster-small {
@@ -54,7 +71,8 @@
 	text-align: center;
 	border-radius: 15px;
 	font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
+	color: white;
 	}
 .marker-cluster span {
 	line-height: 30px;
-	}
+	}