From fb6a08f3791a4aa97f86b03abab2c750ca604b97 Mon Sep 17 00:00:00 2001 From: David Hickman Date: Wed, 30 Aug 2017 13:20:58 -0500 Subject: [PATCH] fixing retina basemap issue and popup scroll --- src/reducers/baseLayers.es | 2 +- src/sass/main.scss | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/reducers/baseLayers.es b/src/reducers/baseLayers.es index 50295a1e..b54c9c87 100644 --- a/src/reducers/baseLayers.es +++ b/src/reducers/baseLayers.es @@ -13,7 +13,7 @@ const initialState = { 'url': `https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}`, 'options': { 'attribution': 'Tiles © Esri — Source: Esri, DeLorme, NAVTEQ, USGS, Intermap, iPC, NRCAN, Esri Japan, METI, Esri China (Hong Kong), Esri (Thailand), TomTom, 2012', - 'detectRetina': true, + 'detectRetina': false, 'layerId': 'esri-world-streetmap' } }, diff --git a/src/sass/main.scss b/src/sass/main.scss index e0f7bfb9..75eee2d6 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -428,7 +428,8 @@ body { .leaflet-popup-content-wrapper { padding: 0 0 1px 0; border-radius: 0; - + max-height: 578px; + overflow-y: auto; .leaflet-popup-content { margin: 0 0 0 0; } @@ -448,8 +449,6 @@ body { } .popup__content { - max-height: 550px; - overflow-y: auto; padding-top: 47px; }