From 20bb48981976da27452d13861aa9cd6ed8096d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herman=20=C3=95unapuu?= Date: Wed, 22 Aug 2018 03:56:10 +0300 Subject: [PATCH] Data binding and style fixes * added portfolio, mentors and management YAML files to be used in templating * fixed issue with landing page not working properly in mobile view * removed annoying page style that was applied to everything * improved text sizes in various views * reworked mentors view styles * rearranged landing page vector graphics to match their meaning more * code style improvements --- _data/management.yml | 38 ++++++++ _data/mentors.yml | 38 ++++++++ _data/ourwork.yml | 56 ++++++++++++ _includes/header.html | 2 +- _includes/main_nav.html | 1 + _sass/contact.scss | 14 ++- _sass/header.scss | 7 +- _sass/helpdesk.scss | 195 +++++++++++++++++++++------------------- _sass/mentors.scss | 78 ++++++++++++++-- _sass/ourwork.scss | 73 +++++++++++---- _sass/shared.scss | 18 ++++ _sass/student.scss | 40 +++++---- assets/main.scss | 1 + contact.html | 54 ++++------- helpdesk.html | 54 +++++------ index.html | 4 +- mentors.html | 124 ++++++------------------- ourwork.html | 102 ++++----------------- student.html | 67 ++++++++++---- 19 files changed, 565 insertions(+), 401 deletions(-) create mode 100644 _data/management.yml create mode 100644 _data/mentors.yml create mode 100644 _data/ourwork.yml create mode 100644 _sass/shared.scss diff --git a/_data/management.yml b/_data/management.yml new file mode 100644 index 0000000..b4c86a1 --- /dev/null +++ b/_data/management.yml @@ -0,0 +1,38 @@ +# Management contact info + + +- name: Hanno Vene + photo: hannovene.jpg + role: Juhatuse esimees + subrole: Meie suur juht + email: hanno.vene@lapikud.ee + phone: +372 56 247 690 + +- name: Kaarel Pärtel + photo: kaarelpartel.jpg + role: Juhatuse liige + subrole: Helpdeski juht + email: kaarel.partel@lapikud.ee + phone: +372 53 665 368 + +- name: Martin Oblikas + photo: martinoblikas.jpg + role: Juhatuse liige + subrole: Tarkvara juht + email: martin.oblikas@lapikud.ee + phone: +372 50 70 459 + +- name: Risto Leesmäe + photo: ristoleesmae.jpg + role: Juhatuse liige + subrole: Turunduse juht + email: risto.leesmae@lapikud.ee + phone: +372 53 269 529 + +- name: Asko Närep + photo: askonarep.jpg + role: Juhatuse liige + subrole: Ürituste juht + email: asko.narep@lapikud.ee + phone: +372 56 236 649 + diff --git a/_data/mentors.yml b/_data/mentors.yml new file mode 100644 index 0000000..a5953a2 --- /dev/null +++ b/_data/mentors.yml @@ -0,0 +1,38 @@ +# Mentors: example dataset + + +- name: Maa Lapik + age: 2018 + photo: https://static.independent.co.uk/s3fs-public/styles/article_small/public/thumbnails/image/2018/06/15/09/fe.jpg + specialty: kettaheide + term: 4 + teams: ['üritused', 'turundus'] + phone: +372 12345678 + email: lappes@lapikud.ee + description: Vali mind, kui sind huvitab lapiku maa teooria. + activities: Pöörlemine, tiirlemine, päikesevalguse peegeldamine. + + +- name: Maa Lapik + age: 2018 + photo: https://static.independent.co.uk/s3fs-public/styles/article_small/public/thumbnails/image/2018/06/15/09/fe.jpg + specialty: kettaheide + term: 4 + teams: ['üritused', 'turundus'] + phone: +372 12345678 + email: lappes@lapikud.ee + description: Vali mind, kui sind huvitab lapiku maa teooria. + activities: Pöörlemine, tiirlemine, päikesevalguse peegeldamine. + + +- name: Maa Lapik + age: 2018 + photo: https://static.independent.co.uk/s3fs-public/styles/article_small/public/thumbnails/image/2018/06/15/09/fe.jpg + specialty: kettaheide + term: 4 + teams: ['üritused', 'turundus'] + phone: +372 12345678 + email: lappes@lapikud.ee + description: Vali mind, kui sind huvitab lapiku maa teooria. + activities: Pöörlemine, tiirlemine, päikesevalguse peegeldamine. + diff --git a/_data/ourwork.yml b/_data/ourwork.yml new file mode 100644 index 0000000..c373146 --- /dev/null +++ b/_data/ourwork.yml @@ -0,0 +1,56 @@ +# Our work +# + + +- title: TTÜ Studentlife + photo: studentlife.png + url: http://studentlife.ee + description: Tegime ja lahe oli ja oli lahe ja lahe oli ja oli lahe ja lahe oli ja oli lahe ja lahe oli ja oli lahe + + +- title: Eesti Üliõpilasesinduse Liit + photo: sallivkool.png + url: http://sallivkool.ee/ + description: + + +- title: Eesti Üliõpilaskondade Liit + photo: isic.png + url: http://www.isic.ee + description: + + +- title: Eesti Jalgratta Virtuaalmuuseum + photo: jalgrattaveeb.jpg + url: http://www.velomuseum.ee/ + description: + + +- title: Meremeeste tööotsingu portaal + photo: nauticalcrew.jpg + url: + description: Tänaseks on portaali omanikud selle sulgenud. + + +- title: Võti Tulevikku 2013 infoveeb + photo: votitulevikku.jpg + url: + description: + + +- title: Ukseproff + photo: ukseproff.jpg + url: http://www.ukseproff.ee/ + description: + + +- title: Nõmme Tenniseklubi koduleht + photo: nommetenniseklubi.jpg + url: http://www.nommetennis.ee/ + description: + + +- title: Sporditrennid.ee trenni otsinguportaal + photo: sporditrennid.jpg + url: + description: Tänaseks on portaali omanikud selle sulgenud. diff --git a/_includes/header.html b/_includes/header.html index d0eccbb..a098e25 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,7 +1,7 @@