From ef2bc3677c9c198a4894c9f5e0e99041b845d8f0 Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 25 Aug 2020 13:17:33 +0300 Subject: [PATCH] markers coloured --- .../server/css/leaflet.awesome-markers.css | 57 ++++++++ OsmAnd/assets/server/go.html | 71 +++++----- OsmAnd/assets/server/images/markers-matte.png | Bin 0 -> 14323 bytes .../assets/server/images/markers-matte@2x.png | Bin 0 -> 31113 bytes OsmAnd/assets/server/images/markers-plain.png | Bin 0 -> 7946 bytes .../assets/server/images/markers-shadow.png | Bin 0 -> 535 bytes .../server/images/markers-shadow@2x.png | Bin 0 -> 1469 bytes OsmAnd/assets/server/images/markers-soft.png | Bin 0 -> 41226 bytes .../assets/server/images/markers-soft@2x.png | Bin 0 -> 66408 bytes OsmAnd/assets/server/scripts/go.js | 7 +- .../server/scripts/leaflet.awesome-markers.js | 134 ++++++++++++++++++ .../scripts/leaflet.awesome-markers.min.js | 7 + gradle/wrapper/gradle-wrapper.jar | Bin 54329 -> 54417 bytes 13 files changed, 241 insertions(+), 35 deletions(-) create mode 100644 OsmAnd/assets/server/css/leaflet.awesome-markers.css create mode 100644 OsmAnd/assets/server/images/markers-matte.png create mode 100644 OsmAnd/assets/server/images/markers-matte@2x.png create mode 100644 OsmAnd/assets/server/images/markers-plain.png create mode 100644 OsmAnd/assets/server/images/markers-shadow.png create mode 100644 OsmAnd/assets/server/images/markers-shadow@2x.png create mode 100644 OsmAnd/assets/server/images/markers-soft.png create mode 100644 OsmAnd/assets/server/images/markers-soft@2x.png create mode 100644 OsmAnd/assets/server/scripts/leaflet.awesome-markers.js create mode 100644 OsmAnd/assets/server/scripts/leaflet.awesome-markers.min.js diff --git a/OsmAnd/assets/server/css/leaflet.awesome-markers.css b/OsmAnd/assets/server/css/leaflet.awesome-markers.css new file mode 100644 index 0000000000..266b57271e --- /dev/null +++ b/OsmAnd/assets/server/css/leaflet.awesome-markers.css @@ -0,0 +1,57 @@ +/* +Author: L. Voogdt +License: MIT +Version: 1.0 +*/ + +/* Marker setup */ +.awesome-marker { + margin-top:-42px; + margin-left: -17px; + position:absolute; + left:0; + top:0; + display: block; + text-align: center; +} + +.awesome-marker .material-icons { + font-size: 17px; +} + +.awesome-marker-shadow { + background: url('/images/markers-shadow.png') no-repeat 0 0; + width: 36px; + height: 16px; +} + +/* Retina displays */ +@media (min--moz-device-pixel-ratio: 1.5),(-o-min-device-pixel-ratio: 3/2), +(-webkit-min-device-pixel-ratio: 1.5),(min-device-pixel-ratio: 1.5),(min-resolution: 1.5dppx) { + .awesome-marker-shadow { + background-image: url('/images/markers-shadow@2x.png'); + background-size: 35px 16px; + } +} + +.awesome-marker i { + color: #333; + margin-top: 10px; + display: inline-block; + font-size: 14px; +} + +.awesome-marker .icon-white { + color: #fff; +} + +/* Colors */ + +.awesome-marker-background { + fill: #fff; +} + +.awesome-marker:hover { + top: 2px; + opacity: 0.9; +} diff --git a/OsmAnd/assets/server/go.html b/OsmAnd/assets/server/go.html index 779e306932..8837fdbcd2 100644 --- a/OsmAnd/assets/server/go.html +++ b/OsmAnd/assets/server/go.html @@ -17,57 +17,60 @@ + + +