Merge remote-tracking branch 'midgard/master' into master

This commit is contained in:
redfast00 2020-08-01 22:56:03 +02:00
commit 2bf5bbf066
3 changed files with 17 additions and 2 deletions

View file

@ -3,11 +3,18 @@ html, body {
padding: 0px;
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
}
.notice {
padding: 0.5em;
background: linear-gradient(#fdfdfd 75%, #ececec);
}
#map {
width: 100%;
height: 100%;
flex-grow: 1;
}
.leaflet-popup-content-wrapper,
@ -165,3 +172,9 @@ a.img-and-text-link:hover span {
max-height: 150px;
}
}
@media (min-width: 800px) and (min-height: 500px) {
.notice {
padding: 2em;
}
}

View file

@ -29,6 +29,8 @@
<script type="text/javascript" src="js/map.js"></script>
</head>
<body>
<div class="notice">We zijn druk in de weer om Blokmap klaar te stomen voor de herexamens. De komende dagen verschijnt er misschien nog een locatie in je buurt!</div>
<div id="map"></div>
<script id="popup-template" type="text/x-handlebars-template">

View file

@ -54,7 +54,7 @@ $(document).ready(function() {
var map = L.map("map").setView([50.702, 4.335], 9);
var osm = L.tileLayer("//tile.osm.be/osmbe-nl/{z}/{x}/{y}.png", {
attribution: 'Achtergrondkaart © <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>-bijdragers, tiles courtesy of <a href="https://geo6.be/">GEO-6</a>. | <span lang="en">Made with ❤ by <a href="https://zeus.gent/">Zeus WPI</a></span>',
attribution: 'Achtergrondkaart © <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>-bijdragers, <span lang="en">tiles courtesy of <a href="https://geo6.be/">GEO-6</a></span>. | <span lang="en">Made with ❤ by <a href="https://zeus.gent/">Zeus WPI</a></span> | <a href="https://zeus.gent/about/privacy/">Privacybeleid</a>',
maxZoom: 18
}).addTo(map);