diff --git a/.gitignore b/.gitignore index dc3ddc3..60b22b0 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,5 @@ $RECYCLE.BIN/ *.msp *.lnk _site/feed.xml + +.idea/ \ No newline at end of file diff --git a/_config.yml b/_config.yml index 90727c4..0014264 100755 --- a/_config.yml +++ b/_config.yml @@ -22,4 +22,15 @@ address: # Build settings markdown: kramdown -permalink: pretty \ No newline at end of file +permalink: pretty + +collections: + events: + output: true + +defaults: +- scope: + path: "" + type: "events" + values: + layout: "event" \ No newline at end of file diff --git a/_data/collaborators.yml b/_data/collaborators.yml index 30c981d..8361a6c 100755 --- a/_data/collaborators.yml +++ b/_data/collaborators.yml @@ -1,25 +1,73 @@ logos: - - name: "UNIDO" - logo: unido-logo.png - url: "https://www.unido.org/" - - name: "Space10" - logo: space10-logo.png - url: "https://space10.io/" + - name: "Fab Lab BCN" + logo: iaac.png + url: "https://fablabbcn.org/" + - name: "P2P Lab" + logo: P2P-Lab-Logo1.png + url: "http://www.p2plab.gr/en/" + - name: "CBA" + logo: logoCBA.jpg + url: "http://cba.mit.edu/" + - name: "Fab Foundation" + logo: fabfoundation2.png + url: "http://fabfoundation.org/" + - name: "Dansk Design Center" + logo: ddc-logo.png + url: "https://danskdesigncenter.dk/" - name: "Paris City Council" logo: paris-logo.png url: "https://www.paris.fr/" + - name: "UNIDO" + logo: unido-logo.png + url: "https://www.unido.org/" - name: "Barcelona City Council" - logo: ajuntament-barcelona.svg + logo: ajuntament-barcelona.png url: "https://ajuntament.barcelona.cat/ca/" - - name: "Dansk Design Center" - logo: ddc-logo.png - url: "https://danskdesigncenter.dk/" - - name: "Fab Foundation" - logo: fabfoundation.svg - url: "http://fabfoundation.org/" + - name: "Fab City Grand Paris" + logo: fabcity-grandparis.png + url: "http://fabcity.paris/en/home/" + - name: "Fab Lab Santiago" + logo: fablab-santiago.png + url: "http://fablabsantiago.org/" + - name: "Materiom" + logo: materiom.png + url: "https://materiom.org/" + - name: "Metabolic" + logo: metabolic_logo.png + url: "https://www.metabolic.nl/" - name: "Pakhuis de Zwijger" logo: pakhuis-de-zwijger-logo.jpg url: "https://dezwijger.nl/" + - name: "Machines Room" + logo: machinesroom.jpg + url: "https://machinesroom.co.uk/" + - name: "Under Broen" + logo: under-broen.png + url: "http://underbroen.com/" + - name: "Polifactory" + logo: polifactory.png + url: "http://www.polifactory.polimi.it/" - name: "Waag" - logo: waag-logo.png - url: "https://waag.org/en/home" \ No newline at end of file + logo: waag-logo.png + url: "https://waag.org/en/home" + - name: "Communautique" + logo: communautique.jpg + url: "https://www.communautique.quebec/" + - name: "Space10" + logo: space10-logo.png + url: "https://space10.io/" + - name: "Copenhagen Maker" + logo: maker.png + url: "http://www.copenhagenmaker.com/" + - name: "Seeed" + logo: seeed-logo.png + url: "https://www.seeedstudio.com/" + - name: "Szoil" + logo: SZOIL-logo.png + url: "https://www.szoil.org/" + - name: "Seoul Innovation Park" + logo: seoul-logo.png + url: "https://en.innovationpark.xyz/" + - name: "Urbanization" + logo: urbanization-logo.png + url: "http://urbanization.org/" \ No newline at end of file diff --git a/_data/events-old.yml b/_data/events-old.yml new file mode 100755 index 0000000..b657b46 --- /dev/null +++ b/_data/events-old.yml @@ -0,0 +1,30 @@ +id: "events" +orientation: inverted +sectioncolor: 'red' +hascolorbg: true +image: 'uploads/events.jpg' +imgwidth: '428' +imgheight: '358' +haslargetitle: false +largetitle: '' +hassmalltitle: true +smalltitle: 'Events' +hasdescription: true +description: "Local and global Fab City events are hosted the world over. Find a local event or host one." +hasbutton: true +buttonaction: "Fab City" +buttontitle: "Summit" +buttonlink: "https://summit.fabcity.paris/" +hasdownload: false +filename: +haslogos: false +logostitle: +logos: + - name: "" + logo: '' + url: "" +hasextraaction: false +extraaction: '' +extraactionlink: '' +hasdivisionline: false +hasleftcolorblock: false \ No newline at end of file diff --git a/_data/events.yml b/_data/events.yml old mode 100755 new mode 100644 index b657b46..a92b4ad --- a/_data/events.yml +++ b/_data/events.yml @@ -1,30 +1,23 @@ -id: "events" -orientation: inverted -sectioncolor: 'red' -hascolorbg: true -image: 'uploads/events.jpg' -imgwidth: '428' -imgheight: '358' -haslargetitle: false -largetitle: '' -hassmalltitle: true -smalltitle: 'Events' -hasdescription: true -description: "Local and global Fab City events are hosted the world over. Find a local event or host one." -hasbutton: true -buttonaction: "Fab City" -buttontitle: "Summit" -buttonlink: "https://summit.fabcity.paris/" -hasdownload: false -filename: -haslogos: false -logostitle: -logos: - - name: "" - logo: '' - url: "" -hasextraaction: false -extraaction: '' -extraactionlink: '' -hasdivisionline: false -hasleftcolorblock: false \ No newline at end of file +- title: Fab City Campus at 5th Fab Asia Network Conference + location: Seoul City + start_date: "06" + end_date: "11" + month: May + year: 2019 + url: "https://www.fan5.kr/" +- title: Fab City Summit at We Make The City + location: Amsterdam Metropolian Region + start_date: "20" + end_date: "21" + month: June + year: 2019 + url: "https://wemakethe.city/en/" +- title: Fab City Track at Fab15 - El Gouna + location: El Gouna, Red Sea + start_date: "28" + end_date: "02" + month: July - August + year: 2019 + url: "http://fab15.fabevent.org/" + + diff --git a/_data/global-initiative.yml b/_data/global-initiative.yml index 80fb414..eb22229 100755 --- a/_data/global-initiative.yml +++ b/_data/global-initiative.yml @@ -17,6 +17,7 @@ cities: org: "Fab Lab Barcelona | IAAC | Barcelona City Council" joined: 2014 coordinates: "41.3851°N 2.1734°" + webpresence: "" - name: "Zagreb" place: left id: "zagreb" @@ -26,15 +27,17 @@ cities: org: "" joined: 2018 coordinates: "45.8150°N 15.9819°E" - - name: "Bhutan" + webpresence: "" + - name: "Thimphu" place: left - id: "bhutan" + id: "thimphu" country: Bhutan strategicfocus: "" orgtype: "Consortium" - org: "Ministry of Education | Ministry of Labour and Human Resources | Royal University of Bhutan | Ministry of Agriculture | Fablab Bhutan" + org: "Ministry of Education | Ministry of Labour and Human Resources | Royal University of Bhutan | Ministry of Agriculture | Fab Lab Bhutan" joined: 2016 coordinates: "27.5142°N, 90.4336°E" + webpresence: "http://www.fablab.bt/" - name: "Shenzhen" place: left id: "shenzhen" @@ -44,15 +47,17 @@ cities: org: "Shenzhen Open Innovation Lab | Shenzhen Industrial Design Association" joined: 2015 coordinates: "22.5431°N, 114.0579°E" + webpresence: "http://szoil.org" - name: "Georgia" place: left id: "georgia" country: Georgia strategicfocus: "" - orgtype: "Consortium" - org: "LEPL. Georgia's innovation and technology agency" + orgtype: "Government Agency" + org: "LEPL. Georgia's Innovation and Technology Agency" joined: 2015 - coordinates: "32.1656°N, 82.9001°W" + coordinates: "42.3154°N, 43.3569°E" + webpresence: "http://fablab.gov.ge" - name: "Curitiba" place: left id: "Curitiba" @@ -62,6 +67,7 @@ cities: org: "Agência Curitiba | We Fab | Curitiba City Hall | iCities" joined: 2017 coordinates: "25.4809°S, 49.3044°W" + webpresence: "http://www.agencia.curitiba.pr.gov.br/" - name: "Occitanie Region" place: left id: "occitanie" @@ -71,6 +77,7 @@ cities: org: "" joined: 2017 coordinates: "43.8927°N, 3.2828°E" + webpresence: "" - name: "Puebla" place: left id: "puebla" @@ -80,6 +87,7 @@ cities: org: "" joined: 2018 coordinates: "19.0414°N, 98.2063°W" + webpresence: "" - name: "Mexico City" place: left id: "mexico-df" @@ -89,6 +97,7 @@ cities: org: "" joined: 2018 coordinates: "19.4326°N, 99.1332°W" + webpresence: "" - name: "Auvergne-Rhône-Alpes" place: left id: "auvergne" @@ -98,6 +107,7 @@ cities: org: "" joined: 2018 coordinates: "45.4471°N, 4.3853°E" + webpresence: "" - name: "Amsterdam" place: left id: "amsterdam" @@ -107,6 +117,7 @@ cities: org: "Waag Society | Fab Lab Amsterdam | Pakhuis de Zwijger | Metabolic" joined: 2016 coordinates: "52.3680°N, 4.9036°E" + webpresence: "" - name: "Cambridge" place: left id: "cambridge" @@ -116,6 +127,7 @@ cities: org: "" joined: 2015 coordinates: "42.3736°N, 71.1097°W" + webpresence: "" - name: "Kerala" place: left id: "kerala" @@ -125,6 +137,7 @@ cities: org: "Kerala Startup Mission" joined: 2015 coordinates: "10.8505°N, 76.2711°E" + webpresence: "" - name: "Sacramento" place: left id: "sacramento" @@ -134,6 +147,7 @@ cities: org: "" joined: 2016 coordinates: "38.5816°N, 121.4944°W" + webpresence: "" - name: "Belo-Horizonte" place: right id: "belohorizonte" @@ -143,6 +157,7 @@ cities: org: "" joined: 2018 coordinates: "19.9173°S, 43.9346°W" + webpresence: "" - name: "Ekurhuleni" place: right id: "ekurhuleni" @@ -152,6 +167,7 @@ cities: org: "" joined: 2015 coordinates: "26.1777°S, 28.3462°E" + webpresence: "" - name: "Brest" place: right id: "Brest" @@ -159,8 +175,9 @@ cities: strategicfocus: "" orgtype: "Consortium" org: "Brest Métropol | ADEUPa | UBO Open Factory" - joined: + joined: 2017 coordinates: "48.3904°N, 4.4861°W" + webpresence: "https://twitter.com/fabcitybrest" - name: "Boston" place: right id: "boston" @@ -170,6 +187,7 @@ cities: org: "" joined: 2015 coordinates: "42.3601°N, 71.0589°W" + webpresence: "" - name: "Toulouse" place: right id: "toulouse" @@ -179,6 +197,7 @@ cities: org: "" joined: coordinates: "43.6047°N, 1.4442°E" + webpresence: "" - name: "Paris" place: right id: "paris" @@ -186,9 +205,10 @@ cities: strategicfocus: "" orgtype: "Consortium" org: "Fab City Grand Paris Association | City Council of Paris" - joined: + joined: 2016 coordinates: "48.8566°N, 2.3522°E" - - name: "Santiago de Chile" + webpresence: "http://fabcity.paris/en/home/" + - name: "Santiago" place: right id: "santiago" country: Chile @@ -197,6 +217,7 @@ cities: org: "Fab Lab Santiago | SE Santiago | Escuela de Diseño UC | Distributed Design Foundation" joined: 2016 coordinates: "33.4489°S, 70.6693°W" + webpresence: "https://fablabsantiago.org/fab-city-campus-barrio-italia/" - name: "Velsen" place: right id: "velsen" @@ -206,6 +227,7 @@ cities: org: "" joined: coordinates: "52.4521°N, 4.6306°E" + webpresence: "" - name: "Seoul" place: right id: "seoul" @@ -215,6 +237,7 @@ cities: org: "" joined: 2018 coordinates: "37.5665°N, 126.9780°E" + webpresence: "" - name: "Oakland" place: right id: "oakland" @@ -224,15 +247,17 @@ cities: org: "" joined: 2018 coordinates: "37.8044°N, 122.2711°W" + webpresence: "" - name: "Somerville" place: right id: "somerville" country: USA strategicfocus: "" - orgtype: "Consortium" + orgtype: "Government Agency" org: "FabVille" joined: 2015 coordinates: "42.3876°N, 71.0995°W" + webpresence: "https://www.fabville.net/" - name: "Detroit" place: right id: "detroit" @@ -242,6 +267,7 @@ cities: org: "" joined: 2016 coordinates: "42.3314°N, 83.0458°W" + webpresence: "" - name: "Kamakura" place: right id: "kamakura" @@ -251,6 +277,7 @@ cities: org: "" joined: 2018 coordinates: "35.3192°N, 139.5467°E" + webpresence: "" - name: "Sorocaba" place: right id: "sorocaba" @@ -259,4 +286,5 @@ cities: orgtype: "Consortium" org: "" joined: 2018 - coordinates: "23.4557°S, 47.4883°W" \ No newline at end of file + coordinates: "23.4557°S, 47.4883°W" + webpresence: "" \ No newline at end of file diff --git a/_includes/css/main.css b/_includes/css/main.css index 8b02d72..01711fc 100644 --- a/_includes/css/main.css +++ b/_includes/css/main.css @@ -44,6 +44,12 @@ body { padding: 30px 0px 0px; border: solid 4px #{{ site.data.template.color.reds }}; } + +.container-top-separator { + padding: 30px 0px 0px; + border-top: solid 1px black; +} + section { position:relative; z-index: 100; @@ -915,6 +921,7 @@ section .section-small-title { line-height: 35px; font-family: {{ site.data.template.font.primary }}; } + section .intro-line { float: left; left: 0px; @@ -1597,6 +1604,15 @@ footer .footer-title { font-family: {{ site.data.template.font.primary }}; color: #{{ site.data.template.color.whites }}; } + +footer .footer-sub-header { + font-size: 42px; + font-weight: 400; + margin-bottom: 20px; +font-family: {{ site.data.template.font.primary }}; +color: #{{ site.data.template.color.whites }}; +} + footer .footer-link { font-size: 21px; font-family: {{ site.data.template.font.primary }}; @@ -1692,8 +1708,35 @@ body { #intro { /*padding-top: 00px;*/ } + .event-group{ + display: block; + } +} + +@media (min-width: 992px) { + .event-group{ + display: flex; + } +} + +@media (min-width: 1200px) { + .event-group{ + display: flex; + } } #fabcity-challenge{ margin-top: 100px; } + +.event-box{ + padding-left: 10px; + padding-right: 10px; + padding-bottom: 15px; + margin-bottom: 5px; + margin-right: 5px; +} + +.fa-margin { + margin-right: 5px; +} diff --git a/_includes/fixed/approaches.html b/_includes/fixed/approaches.html new file mode 100644 index 0000000..d5d62c2 --- /dev/null +++ b/_includes/fixed/approaches.html @@ -0,0 +1,66 @@ +
+
+
+
+
+
+

Prototype the city

+
+
+
+
+

We engage in action-research directly in the city by prototyping and deploying strategies across localities in our network.


+

Read about the prototyping method

+
+
+
+
+
+
+
+
+ +
+
+
+

Common knowledge

+
+
+
+
+

As a global network, we are connected through the knowledge we share, across common tools and platforms.


+

See the handbook

+
+
+
+
+
+
+
+
+ +
+
+
+

Documentation

+
+
+
+
+

Findings from prototyping and action-research are documented and shared within the network.


+

Read the blog or join our social media channels

+
+
+
+
+ + + + +
+
+
+ +
+
+
diff --git a/_includes/fixed/events.html b/_includes/fixed/events.html new file mode 100644 index 0000000..8a7ca99 --- /dev/null +++ b/_includes/fixed/events.html @@ -0,0 +1,29 @@ +
+
+
+
+

Events

+
+
+
+ {% for event in site.data.events %} +
+
+
+

{{event.title}}

+

{{event.location}}

+
+
+
    +

  • {{event.start_date}}

    • +

  • - {{event.end_date}}

    • +
  • {{event.month}}
    • +
  • {{event.year}}
    • +
+
+
+
+ {% endfor %} +
+
+
diff --git a/_includes/fixed/footer.html b/_includes/fixed/footer.html index 5f20aaa..5a8bdd2 100755 --- a/_includes/fixed/footer.html +++ b/_includes/fixed/footer.html @@ -1,5 +1,23 @@