WIP

11 files changed, 58 insertions, 49 deletions

diff --git a/site/layouts/partials/2-up.html b/site/layouts/partials/2-up.html
index d4f30fe..06849f0 100644
--- a/site/layouts/partials/2-up.html
+++ b/site/layouts/partials/2-up.html
@@ -17,7 +17,7 @@
 
     {{ if .buttonText }}
       <div class="tc">
-        <a href="#" class="btn raise">{{.buttonText}}</a>
+        <a href="{{.buttonLink}}" class="btn raise">{{.buttonText}}</a>
       </div>
     {{ end }}
   </div>
diff --git a/site/layouts/partials/4-up.html b/site/layouts/partials/4-up.html
index dff48b4..dcfbbbf 100644
--- a/site/layouts/partials/4-up.html
+++ b/site/layouts/partials/4-up.html
@@ -29,7 +29,7 @@
 
 		{{ if .buttonText }}
 			<div class="tc">
-				<a href="#" class="btn raise">{{.buttonText}}</a>
+				<a href="{{.buttonLink}}" class="btn raise">{{.buttonText}}</a>
 			</div>
 		{{ end }}
 	</div>
diff --git a/site/layouts/partials/about.html b/site/layouts/partials/about.html
index 657aead..ff3bd7c 100644
--- a/site/layouts/partials/about.html
+++ b/site/layouts/partials/about.html
@@ -14,7 +14,7 @@
 		</div>
 
 		<div class="tc">
-			<a href="#" class="btn raise">{{.buttonText}}</a>
+			<a href="{{.buttonLink}}" class="btn raise">{{.buttonText}}</a>
 		</div>
 
 	</div>
diff --git a/site/layouts/partials/blog.html b/site/layouts/partials/blog.html
new file mode 100644
index 0000000..dd34f7d
--- /dev/null
+++ b/site/layouts/partials/blog.html
@@ -0,0 +1,22 @@
+<div class="bg-off-white pv4">
+	<div class="ph3 mw7 center">
+
+		<h2 class="f2 b lh-title mb3">Latests stories</h1>
+
+
+	  <div class="w-100 flex-ns mhn1-ns flex-wrap mb3">
+
+			{{ range where .Data.Pages "Type" "post" }}
+				<div class="ph1-ns w-50-ns flex">
+					{{ .Render "li" }}
+				</div>
+			{{ end }}
+
+	  </div>
+
+	  <div class="tc">
+	  	<a href="/post" class="btn raise">Read more</a>
+	  </div>
+
+	</div>
+</div>
diff --git a/site/layouts/partials/footer.html b/site/layouts/partials/footer.html
index 629e288..8c67d06 100644
--- a/site/layouts/partials/footer.html
+++ b/site/layouts/partials/footer.html
@@ -1,21 +1,19 @@
 <footer class="bg-black ph3 pv4 white">
 
 	<div class="mw7 center pt3">
+
 		<div class="measure-narrow center mb4">
+
 			<img src="/img/logo.svg" alt="" class="db w4 center mb4">
 			<p class="f3 lh-title light-gray b tc mb2">Newsletter subscribe</p>
 			<p>Get awesome news from us in your inbox every two weeks. Be the first to learn about new products.</p>
 
-			<form action="" class="flex-ns mb3">
-				<fieldset class="flex-auto mb2 mb0-ns mr2-ns">
-					<input type="text" id="email" placeholder="Your email" class="w-100">
-					<label for="email">Your email</label>
-				</fieldset>
-				<button class="btn mb3 w-100 w-auto-ns mb0-ns raise" type="submit">Submit</button>
-			</form>
+			{{ partial "newsletter-form" . }}
+
 		</div>
 
 		<div class="flex-ns justify-between">
+
 			<div>
 				<h3 class="f4 b lh-title mb1 primary">List of links</h3>
 				<ul class="mb3">
@@ -45,6 +43,7 @@
 					{{ partial "social-icon" (dict "link" "facebook.com" "svg" "Amazon") }}
 				</ul>
 			</div>
+
 		</div>
 	</div>
 
diff --git a/site/layouts/partials/media-block-reverse.html b/site/layouts/partials/media-block-reverse.html
index a7b8c18..9cd463d 100644
--- a/site/layouts/partials/media-block-reverse.html
+++ b/site/layouts/partials/media-block-reverse.html
@@ -1,10 +1,10 @@
-<div class="flex-ns mhn3-ns mb4">
+<div class="flex-m mhn3-m mb4">
 
-  <div class="ph3-ns w-50-ns order-last-ns">
+  <div class="ph3-m w-50-m order-last-m">
     <img src="{{.imageUrl}}" alt="" class="db mb2">
   </div>
 
-  <div class="ph3-ns w-50-ns">
+  <div class="ph3-m w-50-m">
     <h3 class="f3 b lh-title mb1">{{.heading}}</h3>
     <p>{{.text}}</p>
   </div>
diff --git a/site/layouts/partials/media-block.html b/site/layouts/partials/media-block.html
index db5f619..d00b1ee 100644
--- a/site/layouts/partials/media-block.html
+++ b/site/layouts/partials/media-block.html
@@ -1,10 +1,10 @@
-<div class="flex-ns mhn3-ns mb4">
+<div class="flex-m mhn3-m mb4">
 
-  <div class="ph3-ns w-50-ns">
+  <div class="ph3-m w-50-m">
     <img src="{{.imageUrl}}" alt="" class="db mb2">
   </div>
 
-  <div class="ph3-ns w-50-ns">
+  <div class="ph3-m w-50-m">
     <h3 class="f3 b lh-title mb1">{{.heading}}</h3>
     <p>{{.text}}</p>
   </div>
diff --git a/site/layouts/partials/nav.html b/site/layouts/partials/nav.html
index 8225a10..58c56de 100644
--- a/site/layouts/partials/nav.html
+++ b/site/layouts/partials/nav.html
@@ -1,12 +1,12 @@
 <nav class="overflow-x-scroll flex justify-between center bg-white divider">
-  <a href="/" class="pa3 dib mr4 flex-none">
-    <img src="/img/logo.svg" alt="" width="80px">
-  </a>
+	<a href="/" class="pa3 dib mr4 flex-none">
+		<img src="/img/logo.svg" width="80px" alt="Kaldi logo" class="br0"/>
+	</a>
 
-  <ul class="flex b grey-3">
-    <li><a href="/products" class="pa3 link db">Products</a></li>
-    <li><a href="/about" class="pa3 link db">About</a></li>
-    <li><a href="/post" class="pa3 link db">post</a></li>
-    <li><a href="/contact" class="pa3 link db">Contact</a></li>
-  </ul>
+	<ul class="flex b grey-3">
+		<li><a href="/products" class="pa3 link db">Products</a></li>
+		<li><a href="/about" class="pa3 link db">Values</a></li>
+		<li><a href="/post" class="pa3 link db">Blog</a></li>
+		<li><a href="/contact" class="pa3 link db">Contact</a></li>
+	</ul>
 </nav>
diff --git a/site/layouts/partials/newsletter-form.html b/site/layouts/partials/newsletter-form.html
new file mode 100644
index 0000000..990d74c
--- /dev/null
+++ b/site/layouts/partials/newsletter-form.html
@@ -0,0 +1,10 @@
+<form action="" class="flex-ns mb3">
+
+  <fieldset class="flex-auto mb2 mb0-ns mr2-ns" name="newsletter" action="newsletter-subscribe">
+    <input type="text" id="email" placeholder="Your email" class="w-100">
+    <label for="email">Your email</label>
+  </fieldset>
+
+  <button class="btn mb3 w-100 w-auto-ns mb0-ns raise" type="submit">Submit</button>
+
+</form>
diff --git a/site/layouts/partials/post.html b/site/layouts/partials/post.html
deleted file mode 100644
index c8f5ff1..0000000
--- a/site/layouts/partials/post.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="bg-off-white">
-	<div class="ph3 mw7 center mb4">
-
-		<h2 class="f2 b lh-title mb2">post section</h1>
-
-
-	  <div class="flex-l mhn1-l flex-wrap mb3">
-
-			{{ range where .Data.Pages "Type" "post" }}
-				<div class="ph1-l w-50-l flex">
-					{{ .Render "li" }}
-				</div>
-			{{ end }}
-
-	  </div>
-
-	  <div class="tc">
-	  	<a href="/post" class="btn mb3 raise">Read more</a>
-	  </div>
-
-	</div>
-</div>
diff --git a/site/layouts/partials/social-icon.html b/site/layouts/partials/social-icon.html
index 6d616be..a08ecd9 100644
--- a/site/layouts/partials/social-icon.html
+++ b/site/layouts/partials/social-icon.html
@@ -1,5 +1,5 @@
-<li class="dib ph2">
-  <a href="{{.link}}" class="link bg-white black db relative br-100 pa2 raise">
+<li class="dib ph2 raise">
+  <a href="{{.link}}" class="link bg-white black db relative br-100 pa2">
     <svg width="16px" height="16px" class="db">
       <use xlink:href="#{{.svg}}"></use>
     </svg>