WIP

18 files changed, 78 insertions, 72 deletions

diff --git a/site/layouts/about/single.html b/site/layouts/about/single.html
index ddcdd5f..daa30a3 100644
--- a/site/layouts/about/single.html
+++ b/site/layouts/about/single.html
@@ -1,6 +1,6 @@
 {{ partial "header" . }}
 {{ partial "nav" . }}
-{{ partial "jumbotron" (dict "imageUrl" "/img/about/jumbotron.jpg" "title" "About us" "subtitle" "Our values") }}
+{{ partial "jumbotron" (dict "imageUrl" "/img/about/jumbotron.jpg" "title" "Values") }}
 
 <div class="mw7 center ph3 pt4">
 
diff --git a/site/layouts/contact/single.html b/site/layouts/contact/single.html
index e98f8d1..1e36be3 100644
--- a/site/layouts/contact/single.html
+++ b/site/layouts/contact/single.html
@@ -2,7 +2,7 @@
 
 {{ partial "nav" . }}
 
-<div class="bg-black white ph3">
+<div class="ph3 bg-off-white">
 	<div class="center mw6 pv3">
 		<img src="/img/logo.svg" alt="" class="db w4 center pv4">
 		<p>We’d love to get in touch with you and hear your ideas and questions. We strive to grow and improve constantly and your feedback is valuable for us.</p>
diff --git a/site/layouts/index.html b/site/layouts/index.html
index fa1b5cb..eec5318 100644
--- a/site/layouts/index.html
+++ b/site/layouts/index.html
@@ -6,10 +6,10 @@
 
 {{ partial "short-text" (dict "heading" "Why Kaldi?" "text" "Kaldi is the coffee store for everyone who believes that great coffee shouldn't just taste good, it should do good too. We source all of our beans directly from small scale sustainable farmers and make sure part of the profits are reinvested in their communities.")}}
 
-{{ partial "2-up" (dict "heading" "What we offer" "description" "Kaldi is the ultimate spot for coffee lovers who want to learn about their java’s origin and support the farmers that grew it. We take coffee production, roasting and brewing seriously and we’re glad to pass that knowledge to anyone." "svg1" "img/illustrations/coffee.svg" "text1" "We sell green and roasted coffee beans that are sourced directly from independent farmers and farm cooperatives. We’re proud to offer a variety of coffee beans grown with great care for the environment and local communities. Check our post or contact us directly for current availability." "svg2" "/img/illustrations/coffee-gear.svg" "text2" "We offer a small, but carefully curated selection of brewing gear and tools for every taste and experience level. No matter if you roast your own beans or just bought your first french press, you’ll find a gadget to fall in love with in our shop." "buttonText" "See all products"  ) }}
+{{ partial "2-up" (dict "heading" "What we offer" "description" "Kaldi is the ultimate spot for coffee lovers who want to learn about their java’s origin and support the farmers that grew it. We take coffee production, roasting and brewing seriously and we’re glad to pass that knowledge to anyone." "svg1" "img/illustrations/coffee.svg" "text1" "We sell green and roasted coffee beans that are sourced directly from independent farmers and farm cooperatives. We’re proud to offer a variety of coffee beans grown with great care for the environment and local communities. Check our post or contact us directly for current availability." "svg2" "/img/illustrations/coffee-gear.svg" "text2" "We offer a small, but carefully curated selection of brewing gear and tools for every taste and experience level. No matter if you roast your own beans or just bought your first french press, you’ll find a gadget to fall in love with in our shop." "buttonText" "See all products" "buttonLink" "/products"  ) }}
 
-{{ partial "about" (dict "heading" "Our values" "text" "Coffee is an amazing part of human culture but it has a dark side too – one of colonialism and mindless abuse of natural resources and human lives. We want to turn this around and return the coffee trade to the drink’s exhilarating, empowering and unifying nature." "buttonText" "Read more") }}
+{{ partial "about" (dict "heading" "Our values" "text" "Coffee is an amazing part of human culture but it has a dark side too – one of colonialism and mindless abuse of natural resources and human lives. We want to turn this around and return the coffee trade to the drink’s exhilarating, empowering and unifying nature." "buttonText" "Read more" "buttonLink" "/about") }}
 
-{{ partial "post" . }}
+{{ partial "blog" . }}
 
 {{ partial "footer" . }}
diff --git a/site/layouts/indexes/post.html b/site/layouts/indexes/post.html
index a60f513..84b9279 100644
--- a/site/layouts/indexes/post.html
+++ b/site/layouts/indexes/post.html
@@ -1,7 +1,7 @@
 {{ partial "header" . }}
 {{ partial "nav" . }}
 
-{{ partial "jumbotron" (dict "imageUrl" "/img/post-index.jpg" "title" "post") }}
+{{ partial "jumbotron" (dict "imageUrl" "/img/post-index.jpg" "title" "Latests stories") }}
 
 <div class="mw7 center">
   <ul class="flex-ns flex-wrap mhn1-ns pa3">
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>
diff --git a/site/layouts/products/single.html b/site/layouts/products/single.html
index 0124e39..921763d 100644
--- a/site/layouts/products/single.html
+++ b/site/layouts/products/single.html
@@ -22,7 +22,7 @@
 {{ partial "blockquote" (dict "quote" "“Kaldi is the place to go if you want the best quality coffee. I love their stance on empowering farmers and transparency.”" "author" "Philipp Trommler") }}
 
 <!-- Full-width image -->
-<img src="/img/products/products-full-width.jpg" alt="" class="db">
+<img src="/img/products/products-full-width.jpg" alt="" class="db w-100">
 
 {{ partial "table" (dict "heading" "Monthly subscriptions" "text" "We make it easy to make great coffee a part of your life. Choose one of our monthly subscription plans to receive great coffee at your doorstep each month. Contact us about more details and payment info.") }}
 
diff --git a/site/static/admin/config.yml b/site/static/admin/config.yml
index 657ec6d..0cff9c1 100644
--- a/site/static/admin/config.yml
+++ b/site/static/admin/config.yml
@@ -1,9 +1,9 @@
 backend:
   name: github
-  repo: owner/repo # Path to your Github repository
+  repo: darindimitroff/netlify-cms-template # Path to your Github repository
   branch: master # Branch to update (master by default)
 
-media_folder: "img/uploads" # Folder where user uploaded files should go
+media_folder: "/img/uploads" # Folder where user uploaded files should go
 
 collections: # A list of collections the CMS should be able to edit
   - name: "post" # Used in routes, ie.: /admin/collections/:slug/edit
diff --git a/site/static/admin/index.html b/site/static/admin/index.html
index 69d8a76..c085727 100644
--- a/site/static/admin/index.html
+++ b/site/static/admin/index.html
@@ -1,19 +1,16 @@
 <!doctype html>
 <html>
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-	<head>
-		<meta charset="utf-8" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-
-		<title>Content Manager</title>
-		<!-- Include the stylesheets from your site here -->
-		<link rel="stylesheet" href="https://unpkg.com/netlify-cms@^0.1/dist/cms.css" />
-		<!-- Include a CMS specific stylesheet here -->
-
-	</head>
-
-	<body>
-		<script src="https://unpkg.com/netlify-cms@^0.1/dist/cms.js"></script>
-	</body>
+  <title>Content Manager</title>
+  <!-- Include the stylesheets from your site here -->
+  <link rel="stylesheet" href="https://unpkg.com/netlify-cms@^0.1/dist/cms.css" />
+  <!-- Include a CMS specific stylesheet here -->
 
+</head>
+<body>
+  <script src="https://unpkg.com/netlify-cms@^0.1/dist/cms.js"></script>
+</body>
 </html>