| -rw-r--r-- | config/config.local.yaml | 7 | ||||
| -rw-r--r-- | config/config.prod.yaml | 7 | ||||
| -rw-r--r-- | config/config.stage.yaml | 8 | ||||
| -rw-r--r-- | static/input.css | 6 | ||||
| -rw-r--r-- | views/layouts/general-page.html | 1 | ||||
| -rw-r--r-- | views/pages/blog-page.html | 8 | ||||
| -rw-r--r-- | views/pages/global-map.html | 10 |
7 files changed, 17 insertions, 30 deletions
diff --git a/config/config.local.yaml b/config/config.local.yaml index 80eb8f7..d3e2e33 100644 --- a/config/config.local.yaml +++ b/config/config.local.yaml @@ -70,12 +70,9 @@ photoStorage: thumbnail320p: baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp320/%s.webp homePageGifs: - baseUrl: https://cdn.saya.uz/static/home-page-gifs/otter-%s.gif + baseUrl: https://storage.yandexcloud.kz/sayauz-static/home-page-gifs/otter-%s.gif indexes: ["1", "2", "3"] staticStorage: - baseUrl: https://cdn.saya.uz/static -mapStorage: - baseUrl: https://cdn.saya.uz/map + baseUrl: https://storage.yandexcloud.kz/sayauz-static allowOrigins: - https://storage.yandexcloud.kz - - https://cdn.saya.uz diff --git a/config/config.prod.yaml b/config/config.prod.yaml index ad4864a..e5785f8 100644 --- a/config/config.prod.yaml +++ b/config/config.prod.yaml @@ -73,12 +73,9 @@ photoStorage: thumbnail320p: baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp320/%s.webp homePageGifs: - baseUrl: https://cdn.saya.uz/static/home-page-gifs/otter-%s.gif + baseUrl: https://storage.yandexcloud.kz/sayauz-static/home-page-gifs/otter-%s.gif indexes: ["1", "2", "3"] staticStorage: - baseUrl: https://cdn.saya.uz/static -mapStorage: - baseUrl: https://cdn.saya.uz/map + baseUrl: https://storage.yandexcloud.kz/sayauz-static allowOrigins: - https://storage.yandexcloud.kz - - https://cdn.saya.uz diff --git a/config/config.stage.yaml b/config/config.stage.yaml index 4b46c6c..c2e337b 100644 --- a/config/config.stage.yaml +++ b/config/config.stage.yaml @@ -70,13 +70,9 @@ photoStorage: thumbnail320p: baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp320/%s.webp homePageGifs: - baseUrl: https://cdn.saya.uz/static/home-page-gifs/otter-%s.gif + baseUrl: https://storage.yandexcloud.kz/sayauz-static/home-page-gifs/otter-%s.gif indexes: ["1", "2", "3"] staticStorage: - baseUrl: https://cdn.saya.uz/static -mapStorage: - baseUrl: https://cdn.saya.uz/map + baseUrl: https://storage.yandexcloud.kz/sayauz-static allowOrigins: - https://storage.yandexcloud.kz - - https://cdn.saya.uz - diff --git a/static/input.css b/static/input.css index 602b5d9..8b18579 100644 --- a/static/input.css +++ b/static/input.css @@ -851,8 +851,10 @@ form.crossable.htmx-request input { background-color: var(--color-background-medium) !important; } -.leaflet-popup-content-wrapper, .leaflet-popup-tip { - color: var(--color-main-medium) !important; +@media (prefers-color-scheme: dark) { + .leaflet-tile { + filter: invert(1) hue-rotate(190deg) contrast(1.1) brightness(1.2) !important; + } } .home-page-heart { diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html index e380ef3..3392ff7 100644 --- a/views/layouts/general-page.html +++ b/views/layouts/general-page.html @@ -421,7 +421,6 @@ <script src="{{ .StaticStorageBaseUrl }}/libs/htmx/2.0.6/htmx.min.js"></script> <script src="{{ .StaticStorageBaseUrl }}/libs/leaflet/1.9.4/leaflet.js"></script> - <script src="{{ .StaticStorageBaseUrl }}/libs/protomaps-leaflet/5.0.0/dist/protomaps-leaflet.js"></script> <script src="{{ .StaticStorageBaseUrl }}/libs/imagesloaded/5.0.0/imagesloaded.pkgd.min.js"></script> <script src="{{ .StaticStorageBaseUrl }}/libs/packery/3.0.0/dist/packery.pkgd.min.js"></script> diff --git a/views/pages/blog-page.html b/views/pages/blog-page.html index 4d8ba06..5f964e6 100644 --- a/views/pages/blog-page.html +++ b/views/pages/blog-page.html @@ -46,11 +46,9 @@ function initLocationMap(id, x, y, relativeErrorMeters = 0) { map = L.map(id).setView([x, y], 8); - protomapsL.leafletLayer({ - url: 'https://cdn.saya.uz/map/global.pmtiles', - maxZoom: 15, - flavor: window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light', - lang: '{{ .Lang }}' + L.tileLayer('https://tiles.stadiamaps.com/tiles/outdoors/{z}/{x}/{y}{r}.png', { + maxZoom: 20, + attribution: '© <a href="https://stadiamaps.com/" target="_blank">Stadia Maps</a>, © <a href="https://openmaptiles.org/" target="_blank">OpenMapTiles</a> © <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>', }).addTo(map); if (relativeErrorMeters != 0) { diff --git a/views/pages/global-map.html b/views/pages/global-map.html index f460d95..0a7b941 100644 --- a/views/pages/global-map.html +++ b/views/pages/global-map.html @@ -223,7 +223,6 @@ <script src="{{ .StaticStorageBaseUrl }}/libs/htmx/2.0.6/htmx.min.js"></script> <script src="{{ .StaticStorageBaseUrl }}/libs/leaflet/1.9.4/leaflet.js"></script> - <script src="{{ .StaticStorageBaseUrl }}/libs/protomaps-leaflet/5.0.0/dist/protomaps-leaflet.js"></script> <script src="{{ .StaticStorageBaseUrl }}/libs/leaflet.markercluster/1.4.1/leaflet.markercluster.js"></script> <script> @@ -396,11 +395,10 @@ function initLocationMap() { map = L.map('map-container').setView([{{ .MapLocationLat }}, {{ .MapLocationLong }}], 4); - protomapsL.leafletLayer({ - url: 'https://cdn.saya.uz/map/global.pmtiles', - maxZoom: 15, - flavor: window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light', - lang: '{{ .Lang }}' + L.tileLayer('https://tiles.stadiamaps.com/tiles/outdoors/{z}/{x}/{y}{r}.png', { + maxZoom: 20, + attribution: '© <a href="https://stadiamaps.com/" target="_blank">Stadia Maps</a>, © <a href="https://openmaptiles.org/" target="_blank">OpenMapTiles</a> © <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>', + zoomControl: false }).addTo(map); L.control.zoom({ |