IMPROVEMENT: ui.carousel variables

This commit is contained in:
Tony Air 2020-02-18 00:38:23 +07:00
parent afbb62a35c
commit 826bd0c75b
2 changed files with 27 additions and 18 deletions

View File

@ -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';
@ -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');
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;

View File

@ -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;
}