diff --git a/src/js/_components/drivers/_map.google.js b/src/js/_components/drivers/_map.google.js index 31b3b68..75ab790 100755 --- a/src/js/_components/drivers/_map.google.js +++ b/src/js/_components/drivers/_map.google.js @@ -4,7 +4,7 @@ import $ from 'jquery'; import Events from '../../_events'; import MarkerUI from './_map.google.marker'; -const GoogleMapsDriver = (($) => { +const GoogleMapsDriver = ($ => { class GoogleMapsDriver { getName() { return 'GoogleMapsDriver'; @@ -39,13 +39,13 @@ const GoogleMapsDriver = (($) => { const zoom = config['mapZoom'] ? config['mapZoom'] : 10; const center = config['center'] ? { - lat: config['center'][1], - lng: config['center'][0], - } + lat: config['center'][1], + lng: config['center'][0], + } : { - lat: 0, - lng: 0, - }; + lat: 0, + lng: 0, + }; const style = config['style'] ? config['style'] : null; console.log(`${ui.getName()}: API is loaded`); @@ -122,7 +122,7 @@ const GoogleMapsDriver = (($) => { $popup.find('.mapboxgl-popup-content .html').html(content); - $popup.find('.mapboxgl-popup-close-button').on('click', (e) => { + $popup.find('.mapboxgl-popup-close-button').on('click', e => { e.preventDefault(); ui.hidePopup(); }); @@ -142,7 +142,9 @@ const GoogleMapsDriver = (($) => { const $popup = $(ui.popup.getDiv()); $popup.addClass('d-none'); - ui.restoreBounds(); + if (!ui.config['noRestoreBounds']) { + ui.restoreBounds(); + } ui.$el.trigger(Events.MAPPOPUPCLOSE); } @@ -205,7 +207,7 @@ const GoogleMapsDriver = (($) => { const bounds = new google.maps.LatLngBounds(); // add markers to map - config['geojson'].features.forEach((marker) => { + config['geojson'].features.forEach(marker => { const id = marker.id; const crds = marker.geometry.coordinates; const content = marker.properties.content; diff --git a/src/scss/_components/_ui.carousel.scss b/src/scss/_components/_ui.carousel.scss index 1c42710..9988244 100755 --- a/src/scss/_components/_ui.carousel.scss +++ b/src/scss/_components/_ui.carousel.scss @@ -10,7 +10,16 @@ } }*/ +$carousel-title-color: $white !default; +$carousel-slide-min-height: 4rem !default; +$carousel-text-shadow: 1px 1px $black !default; +$carousel-controls-font-size: 3rem; +$carousel-controls-zindex: 11 !default; +$carousel-controls-shadow: 1px 1px $black !default; +$carousel-controls-hover-bg: transparentize($black, 0.4) !default; + .carousel-slide { + min-height: $carousel-slide-min-height; display: flex; justify-content: center; align-items: flex-start; @@ -32,27 +41,25 @@ .carousel-control-prev, .carousel-control-next { - z-index: 2; - font-size: 3rem; - text-shadow: 1px 1px #000; + z-index: $carousel-controls-zindex; + font-size: $carousel-controls-font-size; + text-shadow: $carousel-controls-shadow; &:hover, &:focus { - background: rgba(0, 0, 0, 0.6); + background: $carousel-controls-hover-bg; } } .carousel-indicators li { box-shadow: none; - - // 1px 1px #000; } .carousel-title { - color: #fff; + color: $carousel-title-color; } .carousel-title, .carousel-content { - text-shadow: 1px 1px #000; + text-shadow: $carousel-text-shadow; }