diff --git a/README.md b/README.md index f4e3063..51e42ae 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Our department head (Geert-Jan Houben) has a different [layout](_layouts/content `[domain]/[lastname]` or `[domain]/[lastname1-lastname2]`. - [Assets folder](assets) containing: - css - - [style file](assets/css/style.css) + - [style file](assets/css/styles.css) - images - [WIS members images](assets/img/people) - [images used in the research themes](assets/img/theme) diff --git a/_config.yml b/_config.yml index f6fb72e..475b6b9 100644 --- a/_config.yml +++ b/_config.yml @@ -22,7 +22,7 @@ url: "" # the base hostname & protocol for your site, e.g. http://example.com company_name: Data-Intensive Systems building: Building 28 building_url: https://iamap.tudelft.nl/poi/elektrotechniek-wiskunde-informatica/ -room: West 3rd floor +room: West 1st floor street: Van Mourik Broekmanweg 6 zipcode: 2628 XE Delft country: The Netherlands @@ -57,7 +57,7 @@ defaults: path: "" type: "details" values: - layout: "content" + layout: "content" - scope: path: "" values: @@ -74,7 +74,8 @@ plugins: # Exclude from processing. # The following items will not be processed, by default. Create a custom list # to override the default setting. -# exclude: +exclude: + - .idea - Gemfile - Gemfile.lock # - node_modules diff --git a/_includes/filter-people.html b/_includes/filter-people.html index cd6963a..a859732 100644 --- a/_includes/filter-people.html +++ b/_includes/filter-people.html @@ -30,14 +30,15 @@ {% assign animationType = 'zoomIn' %} {% endif %} - {% if colum_counter == 2 %} + {% if column_counter == 2 %} {% assign animationType = 'fadeInRight' %} {% endif %}
- -
+ {% assign people_slug = people.url | slugify %} +
{% if people.image contains 'http://' or people.image contains 'https://' %} @@ -57,20 +58,20 @@

{{people.office}}

- + {% assign empty_linkedin = people.linkedin | strip %} {% unless empty_linkedin == '' %} | + class="icon-link" target="_blank" title="LinkedIn"> - + {% endunless %} {% assign empty_github = people.github | strip %} {% unless empty_github == '' %} | + class="icon-link" target="_blank" title="GitHub"> - + {% endunless %}

@@ -99,4 +100,29 @@

{% if forloop.last and row_counter != 0%}

{% endif %} -{% endfor %} \ No newline at end of file +{% endfor %} + + diff --git a/_includes/footer.html b/_includes/footer.html index eac67e5..6c3ddbf 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,50 +1,54 @@ - + + \ No newline at end of file diff --git a/_includes/head.html b/_includes/head.html index 0ef968e..f0a9700 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -24,7 +24,7 @@ integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous"> - + {% feed_meta %} {% seo %} diff --git a/_includes/header.html b/_includes/header.html index f9d8da8..b89e3b8 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,4 +1,10 @@ - + + +
-
- DIS Logo +
+
+ +
+
+ Distributed Machine-learning Systems +
+
Machine Learning & AI Systems
+

Researching the principles and practices for enabling machine learning in large-scale + distributed & federated systems.

+ Learn More +
+
+
+ +
+
+ Cooperative Systems +
+
Resilient Systems & Blockchain
+

Understand and designing decentralized & fault-tolerant systems and consensus-free blockchain.

+ Learn More +
+
+
+ +
+
+ Cooperative Systems +
+
Data Management
+

Reearsh in data-intensive systems, and data integration.

+ Learn More +
+
+
+
+ +
+
+ + + diff --git a/people.html b/people.html index a926edf..f976bf4 100644 --- a/people.html +++ b/people.html @@ -6,8 +6,8 @@
-
-

OUR TEAM

+
+

People

diff --git a/vacancies.html b/vacancies.html index aa16b63..17dc21a 100644 --- a/vacancies.html +++ b/vacancies.html @@ -9,20 +9,12 @@

{{page.title}}

-
+ No vacancies at this point. + + +