diff --git a/_config.yml b/_config.yml index 1f5e244..08e5da3 100644 --- a/_config.yml +++ b/_config.yml @@ -47,4 +47,3 @@ defaults: values: layout: technology forum: https://community.coops.tech/ -mapbox_access_token: pk.eyJ1IjoiY290ZWNoIiwiYSI6ImNpemgxbzhwODAwMHMzM28zdXF3cGxyYmwifQ.9nPExuEUqwblCCl-6gyFXA diff --git a/_includes/head.html b/_includes/head.html index 4d10e4b..d8df8dc 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -69,7 +69,4 @@ - diff --git a/_layouts/service.html b/_layouts/service.html index 8f1635c..11184b8 100644 --- a/_layouts/service.html +++ b/_layouts/service.html @@ -19,7 +19,7 @@

Coops that offer {{ page.name }}

{% if page.description %}

{{ page.description }}

-{% endif %} +{% endif %} @@ -27,59 +27,18 @@
-
- -
- -
- -
-
- {% for coop in site.coops %} - {% if coop.services contains page.slug %} -
- - {{ coop.name }} - -
- {% endif %} - {% endfor %} +
+
+ {% for coop in site.coops %} + {% if coop.services contains page.slug %} + + {% endif %} + {% endfor %}
- - - -
-
-
- -
-
-
diff --git a/_layouts/technology.html b/_layouts/technology.html index dfa4adb..79b59ce 100644 --- a/_layouts/technology.html +++ b/_layouts/technology.html @@ -19,67 +19,25 @@

Coops that use {{ page.name }}

{% if page.description %}

{{ page.description }}

-{% endif %} +{% endif %}
- -
- -
- -
- -
-
- {% for coop in site.coops %} - {% if coop.technologies contains page.slug %} -
- - {{ coop.name }} - -
- {% endif %} - {% endfor %} +
+
+ {% for coop in site.coops %} + {% if coop.technologies contains page.slug %} + + {% endif %} + {% endfor %}
- - - -
-
-
- -
-
-
diff --git a/assets/css/images/marker-icon-2x.png b/assets/css/images/marker-icon-2x.png deleted file mode 100644 index e4abba3..0000000 Binary files a/assets/css/images/marker-icon-2x.png and /dev/null differ diff --git a/assets/css/images/marker-icon.png b/assets/css/images/marker-icon.png deleted file mode 100644 index 950edf2..0000000 Binary files a/assets/css/images/marker-icon.png and /dev/null differ diff --git a/assets/css/images/marker-shadow.png b/assets/css/images/marker-shadow.png deleted file mode 100644 index 9fd2979..0000000 Binary files a/assets/css/images/marker-shadow.png and /dev/null differ diff --git a/assets/js/app.js b/assets/js/app.js index ebe03f6..1b70cd4 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -1,56 +1,6 @@ $(document).foundation(); -$('#coops-view-tabs').on('change.zf.tabs', function() { - window.app.createMapMultiMarker('map-coops', 54.7, -4.2, 6, window.app.mapEntries); -}); - var elem = new Foundation.Sticky($('.top-bar')); -var app = window.app || {}; - -var mapboxAccessToken = window.mapboxAccessToken || ''; - -app.apiUrl = 'https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token=' + mapboxAccessToken; - -app.tileLayerOptions = { - maxZoom: 18, - attribution: 'Map data © OpenStreetMap contributors, ' + 'CC-BY-SA, ' + 'Imagery © Mapbox', - id: 'mapbox/streets-v12', - token: window.mapboxAccessToken -}; - -app.map = null; - -app.createMap = function(mapId, lat, lng, zoom) { - window.app.map = L.map(mapId).setView([lat, lng], zoom); -} - -app.createMapSingleMarker = function(mapId, lat, lng, zoom, markerText) { - if (!window.app.map) { - window.app.createMap(mapId, lat, lng, zoom); - var myMap = window.app.map; - - L.tileLayer(window.app.apiUrl, window.app.tileLayerOptions).addTo(myMap); - - var marker = L.marker([lat - 0.0005, lng]).addTo(myMap); - marker.bindPopup(markerText).openPopup(); - } - return window.app.map; -} - -app.createMapMultiMarker = function(mapId, lat, lng, zoom, markersArray) { - if (!window.app.map) { - window.app.createMap(mapId, lat, lng, zoom); - var myMap = window.app.map; - - L.tileLayer(window.app.apiUrl, window.app.tileLayerOptions).addTo(myMap); - - markersArray.forEach(function (markerVar) { - var marker = L.marker([markerVar.lat, markerVar.lng]).addTo(myMap); - marker.bindPopup(markerVar.markerText); - }); - } - return window.app.map; -}; //# sourceMappingURL=app.js.map $('#client-list .column').shuffle(); diff --git a/index.html b/index.html index 11a7ae0..7143c12 100644 --- a/index.html +++ b/index.html @@ -50,55 +50,21 @@ layout: home

Members

Take a look at who is part of the CoTech network

-
- -
- -
- - -
-
- {% for coop in site.coops %} -
- -
-
-
- {% endfor %} - +
+
+ {% for coop in site.coops %} +
+ +
+
+
+ {% endfor %} +
- - - -
-
-
- -
-
- -