Font and Equipment update

Former-commit-id: 249a83eb7820b975b2997d91891f75c24483b19b [formerly 07801498886e55c8b1a9f456639ce441723ab650] [formerly bfab84c420aad5672dbfe0e88d357d0f4062aeba [formerly de24c50ee895c7ebb04bab51710c5f7eec5c58c6]]
Former-commit-id: 1d721851885366121bbbf8d2e9163e5b62aaaed0 [formerly 918feea48ddab4934bbd6dfe31b333ccff2a1414]
Former-commit-id: 0caa900919a082126e31c1acde7966cdcf1585ee
This commit is contained in:
L3D 2018-09-09 16:10:24 +02:00
parent 1c1ee034e2
commit bf74f595bb
12 changed files with 90 additions and 27 deletions

36
assets/css/font.css Normal file
View file

@ -0,0 +1,36 @@
@font-face {
font-family: 'Raleway';
font-style: normal;
font-weight: 200;
src: local('Raleway ExtraLight'), local('Raleway-ExtraLight'), url(/fonts/Raleway-ExtraLight.ttf) format('truetype');
}
@font-face {
font-family: 'Raleway';
font-style: normal;
font-weight: 700;
src: local('Raleway Bold'), local('Raleway-Bold'), url(/fonts/Raleway-Bold.ttf) format('truetype');
}
@font-face {
font-family: 'Source Sans Pro';
font-style: italic;
font-weight: 300;
src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightItalic'), url(/fonts/SourceSansPro-LightItalic.ttf) format('truetype');
}
@font-face {
font-family: 'Source Sans Pro';
font-style: italic;
font-weight: 600;
src: local('Source Sans Pro SemiBold Italic'), local('SourceSansPro-SemiBoldItalic'), url(/fonts/SourceSansPro-SemiBoldItalic.ttf) format('truetype');
}
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 300;
src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url(/fonts/SourceSansPro-Light.ttf) format('truetype');
}
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 600;
src: local('Source Sans Pro SemiBold'), local('SourceSansPro-SemiBold'), url(/fonts/SourceSansPro-SemiBold.ttf) format('truetype');
}

View file

@ -1,5 +1,5 @@
@import url(font-awesome.min.css);
@import url("https://fonts.googleapis.com/css?family=Raleway:200,700|Source+Sans+Pro:300,600,300italic,600italic");
@import url("font.css");
/*
Solid State by HTML5 UP

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

BIN
assets/images/map.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

View file

@ -3,7 +3,7 @@
@import 'libs/mixins';
@import 'libs/skel';
@import 'font-awesome.min.css';
@import url('https://fonts.googleapis.com/css?family=Raleway:200,700|Source+Sans+Pro:300,600,300italic,600italic');
@import 'font.css';
/*
Solid State by HTML5 UP

View file

@ -2,6 +2,8 @@
{% block expand_header %}
<link rel="stylesheet" href="/css/leaflet.css" integrity="sha512-puBpdR0798OZvTTbP4A8Ix/l+A4dHDD0DGqYW6RQ+9jxkRFclaxxQb/SJAWZfWAkuyeQUytO7+7N4QKrDh+drA==" crossorigin=""/>
<script src="/js/leaflet.js" integrity="sha512-nMMmRyTVoLYqjP9hrbed9S+FzjZHW5gY1TWCHA5ckwXZBadntCNs8kEqAWdrb9O7rxbCaA4lKTIWjDXZxflOcA==" crossorigin=""></script>
<link rel="stylesheet" href="https://toolbox.cyber.yt/css/spacestatus.css" />
<link rel="stylesheet" href="https://see-base.de/css/space_api.css" />
{% endblock %}
{% block title %}{{ this.title }}{% endblock %}
{% block body %}
@ -20,20 +22,59 @@
<h3 class="major">{{ this.subtitle }}</h3>
<!-- Content -->
<section id="content">
<div id="mapid" class="image fit" style="width: auto; height: 70vh; z-index: 1;"></div>
<div id="mapid" class="image fit" style="width: auto; height: 70vh; z-index: 1;"></div>
<script>
var mymap = L.map('mapid').setView([47.7123, 9.3995], 19);
var mymap = L.map('mapid').setView([47.7123, 9.3995], 9);
var greenIcon = L.icon({
iconUrl: '/images/map.png',
shadowUrl: '/images/map-shadow.png',
iconSize: [52, 60], // size of the icon
shadowSize: [60, 60], // size of the shadow
iconAnchor: [26, 62], // point of the icon which will correspond to marker's location
shadowAnchor: [2, 55], // the same for the shadow
popupAnchor: [-3, -76] // point from which the popup should open relative to the iconAnchor
});
L.tileLayer('https://tiles.ffbsee.de:9090/{z}/{x}/{y}.png', {
maxZoom: 19,
attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, ' +
'<a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' +
'Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
id: 'mapbox.streets'
'<a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a> '
}).addTo(mymap);
L.marker([47.71234, 9.39956]).addTo(mymap)
.bindPopup("<aside>Toolbox Bodensee e.V.<br /><a id='tb-closed' class='special button'>Vereinsheim geschlossen!</a><a id='tb-opened' class='special button' style='background-color: LimeGreen !important;'>Vereinsheim offen!</a></aside>").openPopup();
L.marker([47.71234, 9.39956], {icon: greenIcon}).addTo(mymap)
.bindPopup("<aside><h3 style='color: black;'>Waffellager Bodensee:</h3><img src='/equipment/eisen.jpg'></img><br/><center>Kleines Waffeleisen</center></aside>").openPopup();
L.marker([47.77243, 9.19943], {icon: greenIcon}).addTo(mymap)
.bindPopup("<aside><h3 style='color: black;'>Waffellager Bodensee:</h3><img src='/equipment/doppeleisen.jpg'></img><br/><center>Großes Waffeleisen</center></aside>").openPopup();
L.polygon([
[47.77244138, 9.19947267],
[47.77241975, 9.19938147],
[47.77244499, 9.19931710],
[47.77252791, 9.19920444],
[47.77259641, 9.19923663],
[47.77260001, 9.19926345],
[47.77249907, 9.19939756]],
{
color: '#5eba5e',
fillColor: '#5eba5e',
fillOpacity: 0.5
}).addTo(mymap).bindPopup("<aside><b>see-base</b><br /><a id='sb-closed' class='special button' style='background: FireBrick;'>Hackerspace geschlossen!</a><a id='sb-opened' class='special button' style='background-color: LimeGreen !important;'>Hackerspace offen!</a></aside>");
L.circle([47.77243191425533, 9.199432432651522], 2, {
color: 'blue',
fillColor: 'blue',
fillOpacity: 0.5
}).addTo(mymap).bindPopup("Eingang");
L.polygon([
[47.71242900, 9.39956546],
[47.71231350, 9.39980686],
@ -44,21 +85,7 @@
color: 'orange',
fillColor: 'orange',
fillOpacity: 0.5
}).addTo(mymap).bindPopup("Vereinsheim");
L.polygon([
[47.71208610, 9.39969957],
[47.71217273, 9.39950109],
[47.71220882, 9.39953864],
[47.71212220, 9.39973176]
]).addTo(mymap).bindPopup("Hier Parken");
L.polygon([
[47.71219800, 9.39945817],
[47.71224131, 9.39936161],
[47.71227379, 9.39939916],
[47.71223409, 9.39949036]
]).addTo(mymap).bindPopup("Hier Parken");
}).addTo(mymap).bindPopup("<aside><b>Toolbox Bodensee e.V.</b><br /><a id='tb-closed' class='special button' style='background: FireBrick;'>Vereinsheim geschlossen!</a><a id='tb-opened' class='special button' style='background-color: LimeGreen !important;'>Vereinsheim offen!</a></aside>");
L.circle([47.71229545, 9.39956009], 2, {
color: 'red',