From 8050ab77ee1c56ec257225097193c6ecc7f91e43 Mon Sep 17 00:00:00 2001
From: "Mart-Erki.Noumees" <mart-erki.noumees@ttu.ee>
Date: Mon, 1 Oct 2018 21:49:01 +0300
Subject: [PATCH 1/6] Contact page OpenStreetMap

---
 _sass/contact.scss | 31 +++++++++++++++++++++++++++++--
 contact.html       | 37 ++++++++++++++++++++++++++++++-------
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/_sass/contact.scss b/_sass/contact.scss
index c63277d..0ee91a7 100644
--- a/_sass/contact.scss
+++ b/_sass/contact.scss
@@ -52,11 +52,38 @@
     }
   }
 
+  #main-wrapper {
+    width           : 100%;
+    margin-top      : 40px;
+    display         : flex;
+    flex-direction  : row;
+    flex-wrap       : wrap;
+  }
+
+  #maparea {
+    margin        : 0 20px 0px auto;
+    min-width     : 50%;
+    flex          : 1;
+
+    #map {
+      width      : 100%;
+      margin     : 0px auto;
+      height     : 60vh;
+      max-height : 300px;
+    }
+  }
+
   #main {
-    margin : 2rem 0;
+    margin            : 2rem 0;
+    padding-right     : 40px;
+
+    p{
+      padding-bottom  : 5px;
+    }
   }
+
   * {
-    margin : 0.2rem 0;
+    margin            : 0.2rem 0;
   }
 
 }
diff --git a/contact.html b/contact.html
index 488ce89..adb8ee2 100644
--- a/contact.html
+++ b/contact.html
@@ -17,15 +17,21 @@ title: Kontakt - Lapikud
     </div>
   </div>
 
-  <div id="main">
-    <h2>MTÜ Lapikud</h2>
-    <p>Aadress: Akadeemia tee 5, Tallinn, Eesti</p>
-    <p>E-post: <a href="mailto:lapikud@lapikud.ee">lapikud@lapikud.ee</a></p>
-    <p>Telefon: <a href="tel:+372 58 160 799">+372 58 160 799</a></p>
-    <p>Reg. kood: 801 67 145</p>
-    <p>Swedbank EE812200221019551756</p>
+  <div id="main-wrapper">
+    <div id="main">
+      <h2>MTÜ Lapikud</h2>
+      <p>Aadress: Akadeemia tee 5, Tallinn, Eesti</p>
+      <p>E-post: <a href="mailto:lapikud@lapikud.ee">lapikud@lapikud.ee</a></p>
+      <p>Telefon: <a href="tel:+372 58 160 799">+372 58 160 799</a></p>
+      <p>Reg. kood: 801 67 145</p>
+      <p>Swedbank EE812200221019551756</p>
+      </div>
+    <div id="maparea">
+      <div id="map"></div>
+    </div>
   </div>
 
+
   <div id="management">
     <h2>Juhatus</h2>
     <div id="container">
@@ -44,3 +50,20 @@ title: Kontakt - Lapikud
     </div>
   </div>
 </div>
+
+
+<!-- leafletjs map styles -->
+<script src="https://unpkg.com/leaflet@1.3.3/dist/leaflet.js"
+        integrity="sha512-tAGcCfR4Sc5ZP5ZoVz0quoZDYX5aCtEm/eu1KhSLj2c9eFrylXZknQYmxUssFaVJKvvc0dJQixhGjG2yXWiV9Q=="
+        crossorigin=""></script>
+
+<script>
+    var map = L.map('map').setView([59.396342, 24.668718], 16);
+
+    L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+    }).addTo(map);
+
+    L.marker([59.396342, 24.668718]).addTo(map)
+        .openPopup();
+</script>

From 681de344df07de561f7f4d96ea64368304dd3970 Mon Sep 17 00:00:00 2001
From: "Mart-Erki.Noumees" <mart-erki.noumees@ttu.ee>
Date: Tue, 2 Oct 2018 12:36:12 +0300
Subject: [PATCH 2/6] Contact map fixed. Banner moved to the right.

---
 _sass/contact.scss | 7 +++++--
 contact.html       | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/_sass/contact.scss b/_sass/contact.scss
index 0ee91a7..b36a329 100644
--- a/_sass/contact.scss
+++ b/_sass/contact.scss
@@ -54,19 +54,22 @@
 
   #main-wrapper {
     width           : 100%;
-    margin-top      : 40px;
+    margin-top      : 2rem;
     display         : flex;
     flex-direction  : row;
     flex-wrap       : wrap;
+    justify-content : center;
+    align-items     : center;
   }
 
   #maparea {
-    margin        : 0 20px 0px auto;
+    margin        : 0 2rem 0 2rem;
     min-width     : 50%;
     flex          : 1;
 
     #map {
       width      : 100%;
+      float      : right;
       margin     : 0px auto;
       height     : 60vh;
       max-height : 300px;
diff --git a/contact.html b/contact.html
index adb8ee2..91cbf87 100644
--- a/contact.html
+++ b/contact.html
@@ -7,14 +7,14 @@ title: Kontakt - Lapikud
 
   <h2>Helpdesk</h2>
   <div id="helpdesk">
-    <a id="helpdesk-banner-container" href="/helpdesk">
-      <img id="helpdesk-banner" src="/assets/helpdesk-on-black.png">
-    </a>
     <div id="helpdesk-info">
       <h4>E-mail: <a href="mailto:helpdesk@lapikud.ee">helpdesk@lapikud.ee</a></h4>
       <h4>Telefon: <a href="tel:+37258160799">+372 581 607 99</a></h4>
       <h4>Facebook: <a href="https://www.facebook.com/lapikudhelpdesk/">Lapikud Helpdesk</a></h4>
     </div>
+    <a id="helpdesk-banner-container" href="/helpdesk">
+      <img id="helpdesk-banner" src="/assets/helpdesk-on-black.png">
+    </a>
   </div>
 
   <div id="main-wrapper">

From 94f7c2a682185c94112ef78f945332b82a1ac5c8 Mon Sep 17 00:00:00 2001
From: "Mart-Erki.Noumees" <mart-erki.noumees@ttu.ee>
Date: Tue, 2 Oct 2018 13:53:48 +0300
Subject: [PATCH 3/6] Fixed differing styles of helpdesk and contact blocks.

---
 _sass/contact.scss | 10 ++++------
 contact.html       | 14 +++++++-------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/_sass/contact.scss b/_sass/contact.scss
index b36a329..77c0bfc 100644
--- a/_sass/contact.scss
+++ b/_sass/contact.scss
@@ -54,7 +54,6 @@
 
   #main-wrapper {
     width           : 100%;
-    margin-top      : 2rem;
     display         : flex;
     flex-direction  : row;
     flex-wrap       : wrap;
@@ -70,17 +69,17 @@
     #map {
       width      : 100%;
       float      : right;
-      margin     : 0px auto;
+      margin     : 0 auto;
       height     : 60vh;
       max-height : 300px;
     }
   }
 
   #main {
-    margin            : 2rem 0;
-    padding-right     : 40px;
+    margin            : 0 2rem;
 
-    p{
+
+    h4{
       padding-bottom  : 5px;
     }
   }
@@ -90,7 +89,6 @@
   }
 
 }
-
 @media (max-width : 900px) {
 
   #contact {
diff --git a/contact.html b/contact.html
index 91cbf87..cfa3817 100644
--- a/contact.html
+++ b/contact.html
@@ -17,15 +17,15 @@ title: Kontakt - Lapikud
     </a>
   </div>
 
+  <h2>MTÜ Lapikud</h2>
   <div id="main-wrapper">
     <div id="main">
-      <h2>MTÜ Lapikud</h2>
-      <p>Aadress: Akadeemia tee 5, Tallinn, Eesti</p>
-      <p>E-post: <a href="mailto:lapikud@lapikud.ee">lapikud@lapikud.ee</a></p>
-      <p>Telefon: <a href="tel:+372 58 160 799">+372 58 160 799</a></p>
-      <p>Reg. kood: 801 67 145</p>
-      <p>Swedbank EE812200221019551756</p>
-      </div>
+      <h4>Aadress: Akadeemia tee 5, Tallinn, Eesti</h4>
+      <h4>E-post: <a href="mailto:lapikud@lapikud.ee">lapikud@lapikud.ee</a></h4>
+      <h4>Telefon: <a href="tel:+372 58 160 799">+372 58 160 799</a></h4>
+      <h4>Reg. kood: 801 67 145</h4>
+      <h4>Swedbank EE812200221019551756</h4>
+    </div>
     <div id="maparea">
       <div id="map"></div>
     </div>

From 77b99047b6f2d2f0f92f0d60b511afcf2e5a68a3 Mon Sep 17 00:00:00 2001
From: "Mart-Erki.Noumees" <mart-erki.noumees@ttu.ee>
Date: Tue, 2 Oct 2018 23:07:31 +0300
Subject: [PATCH 4/6] Added air between helpdesk banner and helpdesk info.

---
 _sass/contact.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/_sass/contact.scss b/_sass/contact.scss
index 77c0bfc..612cdb7 100644
--- a/_sass/contact.scss
+++ b/_sass/contact.scss
@@ -95,7 +95,10 @@
     #helpdesk {
       flex-direction : column;
 
-      #helpdesk-banner-container, #helpdesk-info {
+      #helpdesk-banner-container {
+        margin : 2rem 0 0 0;
+      }
+      #helpdesk-info {
         margin : 0;
       }
     }

From aa681e6aa79d4bb21037c646695c2927299e1ef7 Mon Sep 17 00:00:00 2001
From: "Mart-Erki.Noumees" <mart-erki.noumees@ttu.ee>
Date: Tue, 2 Oct 2018 23:09:06 +0300
Subject: [PATCH 5/6] Air between helpdesk banner and MTU Lapikud heading

---
 _sass/contact.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_sass/contact.scss b/_sass/contact.scss
index 612cdb7..e711f62 100644
--- a/_sass/contact.scss
+++ b/_sass/contact.scss
@@ -96,7 +96,7 @@
       flex-direction : column;
 
       #helpdesk-banner-container {
-        margin : 2rem 0 0 0;
+        margin : 2rem 0;
       }
       #helpdesk-info {
         margin : 0;

From baf5d9dae26ccbc6e35f32ccd38c7781c1405d78 Mon Sep 17 00:00:00 2001
From: "Mart-Erki.Noumees" <mart-erki.noumees@ttu.ee>
Date: Wed, 3 Oct 2018 11:23:57 +0300
Subject: [PATCH 6/6] Margin for map on mobile mode. Also should wrap
 simultaneously with helpdesk banner.

---
 _sass/contact.scss | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/_sass/contact.scss b/_sass/contact.scss
index e711f62..52cd947 100644
--- a/_sass/contact.scss
+++ b/_sass/contact.scss
@@ -62,8 +62,8 @@
   }
 
   #maparea {
-    margin        : 0 2rem 0 2rem;
-    min-width     : 50%;
+    margin        : 0 2rem;
+    min-width     : 44.55%;
     flex          : 1;
 
     #map {
@@ -102,5 +102,12 @@
         margin : 0;
       }
     }
+    #main-wrapper{
+      #maparea{
+        flex-direction: column;
+        margin: 2rem;
+      }
+    }
   }
 }
+