diff --git a/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock index 35b526f..c4a1939 100644 Binary files a/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock and b/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock differ diff --git a/platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin index cae7260..fa9edd1 100644 Binary files a/platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin and b/platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin differ diff --git a/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin index 3a31575..5522e81 100644 Binary files a/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin and b/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin differ diff --git a/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin index 781abc9..466971d 100644 Binary files a/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin and b/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin differ diff --git a/platforms/android/assets/www/css/MarkerCluster.css b/platforms/android/assets/www/css/MarkerCluster.css index 8068a42..4e36242 100644 --- a/platforms/android/assets/www/css/MarkerCluster.css +++ b/platforms/android/assets/www/css/MarkerCluster.css @@ -13,63 +13,40 @@ transition: stroke-dashoffset 0.3s ease-out, stroke-opacity 0.3s ease-in; } -.marker-cluster-small { - background-color: rgba(181, 226, 140, 0.6); - } -.marker-cluster-small div { - background-color: rgba(110, 204, 57, 0.6); - } - +.marker-cluster-small, .marker-cluster-medium, .marker-cluster-large { + background-color: rgba(181, 226, 140, 0.6); +} +.marker-cluster-small div, .marker-cluster-medium div, .marker-cluster-large div { + background-color: rgba(110, 204, 57, 0.6); +} +/* .marker-cluster-medium { - background-color: rgba(241, 211, 87, 0.6); - } + background-color: rgba(241, 211, 87, 0.6); +} .marker-cluster-medium div { - background-color: rgba(240, 194, 12, 0.6); - } + background-color: rgba(240, 194, 12, 0.6); +} .marker-cluster-large { - background-color: rgba(253, 156, 115, 0.6); - } -.marker-cluster-large div { - background-color: rgba(241, 128, 23, 0.6); - } - - /* IE 6-8 fallback colors */ -.leaflet-oldie .marker-cluster-small { - background-color: rgb(181, 226, 140); - } -.leaflet-oldie .marker-cluster-small div { - background-color: rgb(110, 204, 57); - } - -.leaflet-oldie .marker-cluster-medium { - background-color: rgb(241, 211, 87); - } -.leaflet-oldie .marker-cluster-medium div { - background-color: rgb(240, 194, 12); - } - -.leaflet-oldie .marker-cluster-large { - background-color: rgb(253, 156, 115); - } -.leaflet-oldie .marker-cluster-large div { - background-color: rgb(241, 128, 23); + background-color: rgba(253, 156, 115, 0.6); } +.marker-cluster-large div { + background-color: rgba(241, 128, 23, 0.6); +}*/ .marker-cluster { - background-clip: padding-box; - border-radius: 20px; - } + background-clip: padding-box; + border-radius: 20px; +} .marker-cluster div { - width: 30px; - height: 30px; - margin-left: 5px; - margin-top: 5px; + width: 30px; + height: 30px; + margin-left: 5px; + margin-top: 5px; - text-align: center; - border-radius: 15px; - font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif; - } + text-align: center; + border-radius: 15px; +} .marker-cluster span { - line-height: 30px; - } \ No newline at end of file + line-height: 30px; +} \ No newline at end of file diff --git a/platforms/android/assets/www/js/location.js b/platforms/android/assets/www/js/location.js index 36a2665..35f8e35 100644 --- a/platforms/android/assets/www/js/location.js +++ b/platforms/android/assets/www/js/location.js @@ -73,7 +73,7 @@ var lc = L.control.locate({ remainActive: true, // if true locate control remains active on click even if the user's location is in view. markerClass: L.circleMarker, // L.circleMarker or L.marker circleStyle: {}, // change the style of the circle around the user's location - markerStyle: {}, + markerStyle: {color: '#008000', fillColor: '#32CD32'}, followCircleStyle: {}, // set difference for the style of the circle around the user's location while following followMarkerStyle: {}, icon: 'fa fa-map-marker', // class for icon, fa-location-arrow or fa-map-marker diff --git a/www/js/location.js b/www/js/location.js index 36a2665..35f8e35 100644 --- a/www/js/location.js +++ b/www/js/location.js @@ -73,7 +73,7 @@ var lc = L.control.locate({ remainActive: true, // if true locate control remains active on click even if the user's location is in view. markerClass: L.circleMarker, // L.circleMarker or L.marker circleStyle: {}, // change the style of the circle around the user's location - markerStyle: {}, + markerStyle: {color: '#008000', fillColor: '#32CD32'}, followCircleStyle: {}, // set difference for the style of the circle around the user's location while following followMarkerStyle: {}, icon: 'fa fa-map-marker', // class for icon, fa-location-arrow or fa-map-marker