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
pull/30/head
Herman Õunapuu 7 years ago
parent 149f0ed5d3
commit 20bb489819
  1. 38
      _data/management.yml
  2. 38
      _data/mentors.yml
  3. 56
      _data/ourwork.yml
  4. 2
      _includes/header.html
  5. 1
      _includes/main_nav.html
  6. 14
      _sass/contact.scss
  7. 7
      _sass/header.scss
  8. 195
      _sass/helpdesk.scss
  9. 78
      _sass/mentors.scss
  10. 73
      _sass/ourwork.scss
  11. 18
      _sass/shared.scss
  12. 40
      _sass/student.scss
  13. 1
      assets/main.scss
  14. 54
      contact.html
  15. 54
      helpdesk.html
  16. 4
      index.html
  17. 124
      mentors.html
  18. 102
      ourwork.html
  19. 67
      student.html

@ -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

@ -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.

@ -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.

@ -1,7 +1,7 @@
<!-- header.scss --> <!-- header.scss -->
<nav class="navigation"> <nav class="navigation">
<a href="/" {% if page.url == '/' %}style="display: none;"{% endif %}> <a href="/" {% if page.url == '/' %}style="display: none;"{% endif %}>
<img class="logo" src="{{ "/assets/logo.svg " | relative_url }}"> <img id="header-logo" class="logo" src="{{ "/assets/logo.svg " | relative_url }}">
</a> </a>
<div class="menu"> <div class="menu">

@ -1,4 +1,5 @@
<li><a href="/student">Tudengile</a></li> <li><a href="/student">Tudengile</a></li>
<li><a href="/mentors">Mentorid</a></li>
<li><a href="/helpdesk">Helpdesk</a></li> <li><a href="/helpdesk">Helpdesk</a></li>
<li><a href="/ourwork">Ettevõttele</a></li> <li><a href="/ourwork">Ettevõttele</a></li>
<li><a href="/aboutus">Lapikutest</a></li> <li><a href="/aboutus">Lapikutest</a></li>

@ -25,13 +25,13 @@
#contact-management { #contact-management {
#contact-management-container { #container {
display : flex; display : flex;
flex-direction : row; flex-direction : row;
flex-wrap : wrap; flex-wrap : wrap;
justify-content : center; justify-content : center;
.contact-management-person { .person {
margin-left : 2rem; margin-left : 2rem;
margin-right : 2rem; margin-right : 2rem;
margin-bottom : 5rem; margin-bottom : 5rem;
@ -42,7 +42,17 @@
height : auto; height : auto;
} }
* {
margin: 0.2rem 0;
}
} }
}
}
#contact-main {
* {
margin: 0.2rem 0;
} }
} }

@ -9,11 +9,16 @@
max-width: 112.0rem; max-width: 112.0rem;
.logo { .logo {
height: 8rem; height: 32px;
vertical-align: middle; vertical-align: middle;
display: inline; display: inline;
} }
#header-logo {
height : 8rem;
}
.menu { .menu {
display: inline; display: inline;

@ -1,123 +1,138 @@
.page { #helpdesk-page {
display : flex;
flex-direction : column;
flex : 1;
width : 85vw;
max-width : 1200px;
margin : 5rem auto 0;
}
.page * { #helpdesk-banner {
margin-top : 5px; background : black;
margin-bottom : 5px; display : flex;
} flex-direction : row;
flex : 1;
justify-content : center;
align-items : center;
text-align : center;
margin : 3rem auto;
padding : 2rem;
h1, h3 {
color : white;
font-weight : 400;
}
#helpdesk-banner { .emphasis-text-bold {
//background-image : url("helpdesk-a-bg.jpg"); font-weight : bold;
background : black; }
display : flex;
flex-direction : row;
flex : 1;
justify-content : center;
align-items : center;
text-align : center;
h3, h5 {
color : white;
}
.emphasis-text-bold { .emphasis-text-color {
font-weight : bold; color : $color-primary;
} }
.emphasis-text-color { #helpdesk-logo {
color : $color-primary; display : block;
} width : 100%;
height : auto;
}
#helpdesk-banner-logo { #helpdesk-logo-container {
display : block; flex : 1;
width : 100%; padding : 25px;
height : auto;
}
#banner-image, #banner-text { }
width : 50%;
} #banner-text {
flex : 2;
}
#banner-image {
padding : 25px;
} }
} #maparea {
display : flex;
align-items : center;
justify-content : center;
#helpdesk-location-mapstuff { .siema, #map {
display : flex; width : 50%;
align-items : center; max-height : 300px;
justify-content : center; margin : 20px;
}
#map {
height : 60vh;
max-height : 300px;
}
}
.siema, #map { #pricing {
width : 50%; margin-bottom : 2rem;
max-height : 300px; p {
margin : 20px; margin : 1rem auto;
font-weight : bold;
}
table {
width : auto;
th td {
font-weight : bold;
}
tr:first-child {
max-width : 40%;
}
}
} }
#map {
height : 60vh; #location {
max-height : 300px; h4 {
margin : 0.1rem auto;
}
} }
}
#helpdesk-contacts { #contact {
display : flex; display : flex;
flex-direction : row; flex-direction : row;
.subtext { .subtext {
opacity : 0.7; opacity : 0.7;
} }
#opening-times, #contact-methods {
flex : 1;
padding : 15px;
}
#helpdesk-opening-times, #helpdesk-contactssss { #contact-methods {
flex : 1; h4 {
padding : 15px; margin : 0.1rem auto;
}
}
} }
} }
@media (max-width : 900px) { @media (max-width : 900px) {
#helpdesk-banner { #helpdesk-page {
flex-direction : column; #helpdesk-banner {
flex-direction : column;
#banner-image, #banner-text {
width : 100%;
} }
}
table { table {
tr:first-child { tr:first-child {
max-width : 30%; max-width : 30%;
}
td, th {
padding : 0.5rem 0.5rem;
}
} }
td, th {
padding : 0.5rem 0.5rem; #maparea {
flex-direction : column;
.siema, #map {
width : 100%;
}
} }
}
#helpdesk-location-mapstuff { #contact {
flex-direction : column; flex-direction : column;
.siema, #map {
width : 100%;
} }
} }
#helpdesk-contacts {
flex-direction : column;
}
} }
table {
th td {
font-weight : bold;
}
tr:first-child {
max-width : 40%;
}
}

@ -1,14 +1,74 @@
.mentors-page-container { #mentors {
.mentor { .mentor {
margin-bottom: 3rem; display : flex;
flex-direction : row;
.profile-img { margin : 4rem auto;
object-fit: cover;
width: 300px; .photo-container {
height: 350px; flex : 1;
float: left;
margin-right: 2rem; img {
display : block;
height : auto;
width : 100%;
margin-top : 2rem;
}
}
.description {
flex : 2;
display : flex;
flex-direction : row;
* {
margin : 0.1rem 0;
}
h1, h4 {
margin : 1rem 0;
}
.general {
flex : 2;
margin : 0 3rem;
}
.varia {
flex : 3;
margin : 1rem 3rem 0;
}
}
.mentor-info-text {
flex : 3;
display : flex;
flex-direction : column;
padding-left : 5rem;
padding-right : 3rem;
}
}
}
@media (max-width : 900px) {
#mentors {
.mentor {
flex-direction : column;
.description {
flex-direction : column;
.general, .varia {
margin : 0 auto;
}
}
.photo-container {
img {
max-height : 75vh;
}
}
} }
} }
} }

@ -1,29 +1,68 @@
#ourwork-banner { #ourwork-banner {
margin : 5rem 0; margin : 5rem 0;
}
.work-item { a {
padding : 1rem; display : flex;
display : flex; justify-content : center;
flex-direction : column;
justify-content : center;
align-items : center;
max-height : 75vh;
img {
display : block;
max-height : 50vh;
width : auto;
} }
h3, h5 {
text-align : center; }
#ourwork-done {
.work-item {
padding : 1rem;
margin : 7rem 0;
display : flex;
flex-direction : row;
max-height : 75vh;
.description {
flex : 2;
h3 {
white-space : nowrap;
overflow : hidden;
text-overflow : ellipsis;
}
}
.thumbnail {
flex : 3;
display : flex;
justify-content : center;
align-items : center;
}
img {
display : block;
width : auto;
height : auto;
max-height : 50vh;
}
h2, h3 {
text-align : center;
margin-bottom : 0.3rem;
}
} }
} }
@media (max-width: 900px){ @media (max-width : 900px) {
#ourwork-done {
.work-item {
flex-direction : column;
max-height : none;
}
}
#ourwork-banner { #ourwork-banner {
h1 { h1 {
font-size: 3.6rem; font-size : 3.6rem;
} }
} }
} }

@ -0,0 +1,18 @@
.banner {
background : #f0941d;
color : white;
font-weight : bold;
padding : 2rem;
border-radius : 8rem;
}
.page {
display : flex;
flex-direction : column;
flex : 1;
width : 85vw;
max-width : 1200px;
margin : 5rem auto 0;
}

@ -1,25 +1,27 @@
.mentor-info { .activities-info {
display : flex; display : flex;flex-direction: row;
margin: 3rem auto;
img { .desc {
flex : 1; flex: 1;
display : block;
max-height: 30rem; h2 {
max-width: 30rem;
height: auto; }
width: auto;
} }
.mentor-info-text { .promo-image {
flex : 3; flex: 1;
display : flex;
flex-direction: column;
padding-left: 5rem;
padding-right: 3rem; }
img {
display : block;
width: 100%;
height: auto;
}
}
} }
@media (max-width : 900px) {
.row { .activities-info {
display : flex; flex-direction: column;
flex-direction: row; }
} }

@ -28,3 +28,4 @@ h4 {
@import 'helpdesk'; @import 'helpdesk';
@import 'ourwork'; @import 'ourwork';
@import 'student'; @import 'student';
@import 'shared';

@ -17,46 +17,22 @@ layout: default
</div> </div>
<div id="contact-management"> <div id="contact-management">
<h2>Juhatus</h2> <h2>Juhatus</h2>
<div id="contact-management-container">
<div class="contact-management-person">
<img src="/assets/management-images/hannovene.jpg"> <div id="container">
<h4 class="centered-text">Hanno Vene</h4>
<p class="centered-text">Juhatuse esimees</p> {% for person in site.data.management %}
<p>E-post: <a href="mailto:hanno.vene@lapikud.ee">hanno.vene@lapikud.ee</a></p> <div class="person">
<p>Telefon: <a href="tel:+37256247690">+372 56 247 690</a></p> <img src="{{ "/assets/management-images/" | append: person.photo }}" alt="{{ person.name }}">
</div> <h4 class="centered-text">{{ person.name }}</h4>
<div class="contact-management-person"> <p class="centered-text">{{ person.role }}</p>
<img src="/assets/management-images/kaarelpartel.jpg"> <p class="centered-text">{{ person.subrole }}</p>
<h4 class="centered-text">Kaarel Pärtel</h4> <p>E-post:</p>
<p class="centered-text">Juhatuse liige</p> <a href="mailto:{{ person.email }}">{{ person.email }}</a>
<p class="centered-text">Helpdeski juht</p> <p>Telefon:</p>
<p>E-post: <a href="mailto:kaarel.partel@lapikud.ee"> kaarel.partel@lapikud.ee</a></p> <a href="tel:{{ person.phone }}">{{ person.phone }}</a>
<p>Telefon: <a href="tel:+37253665368">+372 53 665 368</a></p>
</div>
<div class="contact-management-person">
<img src="/assets/management-images/martinoblikas.jpg">
<h4 class="centered-text">Martin Oblikas</h4>
<p class="centered-text">Juhatuse liige</p>
<p class="centered-text">Tarkvara juht</p>
<p>E-post: <a href="mailto:martin.oblikas@lapikud.ee">martin.oblikas@lapikud.ee</a></p>
<p>Telefon: <a href="tel:+3725070459">+372 50 70 459</a></p>
</div>
<div class="contact-management-person">
<img src="/assets/management-images/ristoleesmae.jpg">
<h4 class="centered-text">Risto Leesmäe</h4>
<p class="centered-text">Juhatuse liige</p>
<p class="centered-text">Turunduse juht</p>
<p>E-post: <a href="mailto:risto.leesmae@lapikud.ee">risto.leesmae@lapikud.ee</a></p>
<p>Telefon: <a href="tel:+37253269529">+372 53 269 529</a></p>
</div>
<div class="contact-management-person">
<img src="/assets/management-images/askonarep.jpg">
<h4 class="centered-text">Asko Närep</h4>
<p class="centered-text">Juhatuse liige</p>
<p class="centered-text">Ürituste juht</p>
<p>E-post: <a href="mailto:hanno.vene@lapikud.ee">asko.narep@lapikud.ee</a></p>
<p>Telefon: <a href="tel:+37256236649">+372 56 236 649</a></p>
</div> </div>
{% endfor %}
</div> </div>
</div> </div>
<div id="contact-main"> <div id="contact-main">

@ -1,25 +1,25 @@
--- ---
layout: default layout: default
--- ---
<div class="page"> <div class="page" id="helpdesk-page">
<div id="helpdesk-banner"> <div id="helpdesk-banner">
<div id="banner-image"> <div id="helpdesk-logo-container">
<img id="helpdesk-banner-logo" src="/assets/helpdesk-on-black.png"> <img id="helpdesk-logo" src="/assets/helpdesk-on-black.png">
</div> </div>
<div id="banner-text"> <div id="banner-text">
<h3> <h1>
Anname sinu arvutile <span class="emphasis-text-color">uue elu</span>! Anname sinu arvutile <span class="emphasis-text-color">uue elu</span>!
</h3> </h1>
<h5> <h3>
<span class="emphasis-text-bold">HELPDESK</span> lahendab probleemid seoses arvuti ja muu elektroonikaga. <span class="emphasis-text-bold">HELPDESK</span> lahendab probleemid seoses arvuti ja muu elektroonikaga.
</h5> </h3>
</div> </div>
</div> </div>
<div id="helpdesk-description"> <div id="helpdesk-description">
<h3>Mis on HELPDESK?</h3> <h1>Mis on HELPDESK?</h1>
<p> <p>
HELPDESK on MTÜ Lapikute poolt pakutav arvutiabiteenus. Teenus on suunatud tudengitele, õppejõududele ning HELPDESK on MTÜ Lapikute poolt pakutav arvutiabiteenus. Teenus on suunatud tudengitele, õppejõududele ning
kõikidele huvilistele ka väljaspool TTÜ-d. Meie meeskond koosneb kogenud ja nutikatest TTÜ IT-tudengitest. kõikidele huvilistele ka väljaspool TTÜ-d. Meie meeskond koosneb kogenud ja nutikatest TTÜ IT-tudengitest.
@ -27,7 +27,7 @@ layout: default
</div> </div>
<div id="helpdesk-services"> <div id="helpdesk-services">
<h3>Mis teenuseid osutame?</h3> <h1>Mis teenuseid osutame?</h1>
<ul> <ul>
<li>Arvuti riistvara diagnostika ja remont</li> <li>Arvuti riistvara diagnostika ja remont</li>
<li>Arvuti riistvara hooldus</li> <li>Arvuti riistvara hooldus</li>
@ -37,8 +37,8 @@ layout: default
</ul> </ul>
</div> </div>
<div id="helpdesk-pricing"> <div id="pricing">
<h3>Hinnakiri</h3> <h1>Hinnakiri</h1>
<table> <table>
<thead> <thead>
<tr> <tr>
@ -115,13 +115,13 @@ layout: default
<p>Oma tudengisõbralike hindade ja personaalse lähenemisega pakume teenust, milles ei pea pettuma!</p> <p>Oma tudengisõbralike hindade ja personaalse lähenemisega pakume teenust, milles ei pea pettuma!</p>
</div> </div>
<div id="helpdesk-location"> <div id="location">
<div> <div>
<h3>Asukoht</h3> <h1>Asukoht</h1>
<h4>Akadeemia tee 5 ühiselamu</h4> <h4>Akadeemia tee 5 ühiselamu</h4>
<h4>ruum 008A</h4> <h4>ruum 008A</h4>
</div> </div>
<div id="helpdesk-location-mapstuff"> <div id="maparea">
<div id="map"></div> <div id="map"></div>
<div class="siema"> <div class="siema">
<img src="assets/carousel-images/1.jpg"> <img src="assets/carousel-images/1.jpg">
@ -133,24 +133,26 @@ layout: default
</div> </div>
</div> </div>
<div id="helpdesk-contacts"> <div id="contact">
<div id="helpdesk-opening-times"> <div id="opening-times">
<h3>Lahtiolekuajad:</h3> <h2>Lahtiolekuajad:</h2>
<h5>E – R 12-17*</h5> <h3>E – R 12-17*</h3>
<h6 class="subtext">* Tegu on ajaperioodiga, mil meid on kõige tõenäolisem tabada. Siiski ei saa garanteerida <h5 class="subtext">* Tegu on ajaperioodiga, mil meid on kõige tõenäolisem tabada. Siiski ei saa garanteerida
kohalolekut.</h6> kohalolekut.</h5>
</div> </div>
<div id="helpdesk-contactssss"> <div id="contact-methods">
<h3>Kontakt</h3> <h1>Kontakt</h1>
<div> <div>
<h4>E-mail: <a href="mailto:helpdesk@lapikud.ee">helpdesk@lapikud.ee</a></h4> <h4>E-mail: </h4>
<h4>Telefon: <a href="tel:+37258160799">+372 581 607 99</a></h4> <a href="mailto:helpdesk@lapikud.ee"><h4>helpdesk@lapikud.ee</h4></a>
<h4>Telefon: </h4>
<a href="tel:+37258160799"><h4>+372 581 607 99</h4></a>
</div> </div>
</div> </div>
<div class="fb-page" data-href="https://www.facebook.com/lapikudhelpdesk" data-width="300" data-small-header="false" <div class="fb-page" data-href="https://www.facebook.com/lapikudhelpdesk" data-width="260" data-small-header="false"
data-adapt-container-width="false" data-hide-cover="false" data-show-facepile="false"> data-adapt-container-width="false" data-hide-cover="false" data-show-facepile="false">
<blockquote cite="https://www.facebook.com/lapikudhelpdesk" class="fb-xfbml-parse-ignore"><a <blockquote cite="https://www.facebook.com/lapikudhelpdesk" class="fb-xfbml-parse-ignore"><a
href="https://www.facebook.com/lapikudhelpdesk">Lapikud Helpdesk</a></blockquote> href="https://www.facebook.com/lapikudhelpdesk">Lapikud Helpdesk</a></blockquote>
@ -184,7 +186,7 @@ layout: default
crossorigin=""></script> crossorigin=""></script>
<script> <script>
var map = L.map('map').setView([59.396342, 24.668718], 19); var map = L.map('map').setView([59.396342, 24.668718], 16);
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors' attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'

@ -22,7 +22,7 @@ layout: default
</div> </div>
<div class="column"> <div class="column">
<svg class=lg-icon height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"> <svg class=lg-icon height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"/> <path d="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.12.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"/>
</svg> </svg>
<div> <div>
<h3>Helpdesk</h3> <h3>Helpdesk</h3>
@ -32,7 +32,7 @@ layout: default
</div> </div>
<div class="column"> <div class="column">
<svg class=lg-icon height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"> <svg class=lg-icon height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.12.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"/> <path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"/>
</svg> </svg>
<div> <div>
<h3>Ettevõttele</h3> <h3>Ettevõttele</h3>

@ -1,112 +1,42 @@
--- ---
layout: default layout: default
--- ---
<div class="page"> <div class="page" id="mentors">
<h1>Mentorid</h1> <h1>Mentorid</h1>
<h3>Siin on meie mentorid. Kui leiad kellegi, kellega huvid kattuvad, võta temaga julgelt ühendust!</h3>
{% for mentor in site.data.mentors %}
<div class="mentor-info"> <div class="mentor">
<img <div class="photo-container">
src="https://img.purch.com/w/660/aHR0cDovL3d3dy5saXZlc2NpZW5jZS5jb20vaW1hZ2VzL2kvMDAwLzA5OS81OTgvb3JpZ2luYWwvZmxhdC1lYXJ0aC1OTy1SRVVTRS5qcGc="> <img src="{{ mentor.photo }}">
<div class="mentor-info-text">
<h3>Maa Lapik</h3>
<div class="row">
<div>
<p>Vanus: 2018</p>
<p>Eriala: kettaheide</p>
<p>Kursus: jah</p>
<p>Tiimid:</p>
<ul>
<li>Turundus</li>
<li>Üritused</li>
</ul>
<p>Kontakt:</p>
<p>Telefon: +372 12345678</p>
<p>E-mail: lappes@lapikud.ee</p>
</div>
<div>
<h4>Miks peaksid valima minu enda mentoriks?</h4>
<p>Vali mind, kui sind huvitab lapiku maa teooria.</p>
<h4>Millega tegelen väljaspool Lapikuid?</h4>
<p>Pöörlemine, tiirlemine, päikesevalguse peegeldamine.</p>
</div>
</div>
</div> </div>
<div class="description">
</div> <div class="general">
<h1>{{ mentor.name }}</h1>
<p>Vanus: {{ mentor.age }}</p>
<div class="mentor-info"> <p>Eriala: {{ mentor.specialty }}</p>
<img <p>Kursus: {{ mentor.term }}</p>
src="https://img.purch.com/w/660/aHR0cDovL3d3dy5saXZlc2NpZW5jZS5jb20vaW1hZ2VzL2kvMDAwLzA5OS81OTgvb3JpZ2luYWwvZmxhdC1lYXJ0aC1OTy1SRVVTRS5qcGc="> <p>Tiimid:</p>
<ul>
<div class="mentor-info-text"> {% for team in mentor.teams %}
<h3>Maa Lapik</h3> <li>{{ team }}</li>
{% endfor %}
<div class="row"> </ul>
<div> <p>Telefon: <a href="tel:{{ mentor.phone }}">{{ mentor.phone }}</a></p>
<p>Vanus: 2018</p> <p>E-mail: <a href="mailto: {{ mentor.email }}">{{ mentor.email }}</a></p>
<p>Eriala: kettaheide</p>
<p>Kursus: jah</p>
<p>Tiimid:</p>
<ul>
<li>Turundus</li>
<li>Üritused</li>
</ul>
<p>Kontakt:</p>
<p>Telefon: +372 12345678</p>
<p>E-mail: lappes@lapikud.ee</p>
</div>
<div>
<h4>Miks peaksid valima minu enda mentoriks?</h4>
<p>Vali mind, kui sind huvitab lapiku maa teooria.</p>
<h4>Millega tegelen väljaspool Lapikuid?</h4>
<p>Pöörlemine, tiirlemine, päikesevalguse peegeldamine.</p>
</div>
</div> </div>
<div class="varia">
<h4>Miks peaksid valima minu enda mentoriks?</h4>
<p>{{ mentor.description }}</p>
<h4>Millega tegelen väljaspool Lapikuid?</h4>
<p>{{ mentor.activities }}</p>
</div>
</div> </div>
</div> </div>
{% endfor %}
<div class="mentor-info">
<img
src="https://img.purch.com/w/660/aHR0cDovL3d3dy5saXZlc2NpZW5jZS5jb20vaW1hZ2VzL2kvMDAwLzA5OS81OTgvb3JpZ2luYWwvZmxhdC1lYXJ0aC1OTy1SRVVTRS5qcGc=">
<div class="mentor-info-text">
<h3>Maa Lapik</h3>
<div class="row">
<div>
<p>Vanus: 2018</p>
<p>Eriala: kettaheide</p>
<p>Kursus: jah</p>
<p>Tiimid:</p>
<ul>
<li>Turundus</li>
<li>Üritused</li>
</ul>
<p>Kontakt:</p>
<p>Telefon: +372 12345678</p>
<p>E-mail: lappes@lapikud.ee</p>
</div>
<div>
<h4>Miks peaksid valima minu enda mentoriks?</h4>
<p>Vali mind, kui sind huvitab lapiku maa teooria.</p>
<h4>Millega tegelen väljaspool Lapikuid?</h4>
<p>Pöörlemine, tiirlemine, päikesevalguse peegeldamine.</p>
</div>
</div>
</div>
</div>
</div> </div>

@ -4,95 +4,31 @@ layout: default
<div class="page"> <div class="page">
<div id="ourwork-banner"> <div id="ourwork-banner">
<h1 class="centered-text">Vajad head, kvaliteetset arendusteenust?</h1> <h1 class="centered-text">Vajad head, kvaliteetset arendusteenust?</h1>
<h1 class="centered-text"><a href="/contact">Võta meiega ühendust!</a></h1> <a href="/contact">
<h1 class="centered-text banner">
Võta meiega ühendust!
</h1>
</a>
</div> </div>
<h1 class="centered-text">Tehtud tööd:</h1> <h1 class="centered-text">Tehtud tööd:</h1>
<div id="ourwork-done"> <div id="ourwork-done">
<div class="siema">
<div class="work-item">
<h3>TTÜ Studentlife</h3>
<a href="http://studentlife.ee">
<h5>http://studentlife.ee</h5>
<img src="/assets/ourwork-images/studentlife.png">
</a>
</div>
<div class="work-item">
<h3>Eesti Üliõpilasesinduse Liit</h3>
<a href="http://sallivkool.ee/">
<h5>http://sallivkool.ee/</h5>
<img src="/assets/ourwork-images/sallivkool.png">
</a>
</div>
<div class="work-item">
<h3>Eesti Üliõpilaskondade Liit</h3>
<a href="http://www.isic.ee">
<h5>http://www.isic.ee</h5>
<img src="/assets/ourwork-images/isic.png">
</a>
</div>
<div class="work-item">
<h3>Eesti Jalgratta Virtuaalmuuseum</h3>
<a href="http://www.velomuseum.ee/">
<h5>http://www.velomuseum.ee/</h5>
<img src="/assets/ourwork-images/jalgrattaveeb.jpg">
</a>
</div>
<div class="work-item"> {% for work in site.data.ourwork %}
<h3>Meremeeste tööotsingu portaal</h3> <div class="work-item">
<h5>Tänaseks on portaali omanikud selle sulgenud.</h5> <div class="description">
<img src="/assets/ourwork-images/nauticalcrew.jpg"> <h2>{{ work.title }}</h2>
</div> <a href="{{ work.url }}">
<h3>{{ work.url }}</h3>
<div class="work-item">
<h3>Võti Tulevikku 2013 infoveeb</h3>
<img src="/assets/ourwork-images/votitulevikku.jpg">
</div>
<div class="work-item">
<h3>Ukseproff</h3>
<a href="http://www.ukseproff.ee/">
<h5>http://www.ukseproff.ee/</h5>
<img src="/assets/ourwork-images/ukseproff.jpg">
</a>
</div>
<div class="work-item">
<h3>Nõmme Tenniseklubi koduleht</h3>
<a href="http://www.nommetennis.ee/">
<h5>http://www.nommetennis.ee/</h5>
<img src="/assets/ourwork-images/nommetenniseklubi.jpg">
</a> </a>
<p>{{ work.description }}</p>
</div> </div>
<a class="thumbnail" href="{{ work.url }}">
<div class="work-item"> <img src="{{ "/assets/ourwork-images/" | append: work.photo }}" alt="{{ work.title }}">
<h3>Sporditrennid.ee trenni otsinguportaal</h3> </a>
<h5>Tänaseks on portaali omanikud selle sulgenud.</h5>
<img src="/assets/ourwork-images/sporditrennid.jpg">
</div>
</div> </div>
{% endfor %}
</div> </div>
</div>
<!--carousel support--> </div>
<script src="https://cdn.jsdelivr.net/npm/siema@1.5.1/dist/siema.min.js"></script>
<script>
const mySiema = new Siema({
selector: '.siema',
duration: 1500,
easing: 'ease-in-out',
perPage: 1,
startIndex: 0,
draggable: true,
multipleDrag: true,
threshold: 20,
loop: true,
});
// listen for keydown event
setInterval(() => mySiema.next(), 4000)
</script>

@ -3,22 +3,59 @@ layout: default
--- ---
<div class="page"> <div class="page">
<div id="student-what-we-do"> <div class="activities-info">
<h1>Mida me teeme?</h1> <div class="desc">
<p>"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."</p> <h1>Mida me teeme?</h1>
<p>"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore
magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
laborum."</p>
</div>
<div class="promo-image">
<img src="https://via.placeholder.com/1600x900">
</div>
</div> </div>
<div id="student-what-they-can-do"> <div class="activities-info">
<h1>Mida saad sina teha?</h1> <div class="activities-info">
<p>"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."</p> <div class="desc">
<h1>Mida saad sina teha?</h1>
<p>"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
dolore
magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
pariatur.
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
laborum."</p>
<a href="/mentors">
<h2 class="centered-text">Liitu meiega!</h2>
</a>
</div>
<a class="promo-image" href="#">
<img src="https://via.placeholder.com/1600x900">
</a>
</div>
</div> </div>
<div id="student-mentors-banner">
<a href="/mentors"> <div class="activities-info">
<h1 class="centered-text">Tutvu meie mentoritega!</h1> <div class="activities-info">
</a> <div class="desc">
</div> <h1>Mentorid</h1>
<div id="student-sign-up"> <p>"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
<a href="#"> dolore
<h1 class="centered-text">Liitu meiega!</h1> magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
</a> consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
pariatur.
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
laborum."
</p>
<a href="/mentors">
<h2 class="centered-text">Tutvu meie mentoritega!</h2>
</a>
</div>
<a class="promo-image" href="/mentors">
<img src="https://via.placeholder.com/1600x900">
</a>
</div>
</div> </div>
</div> </div>

Loading…
Cancel
Save