From 748564be8a54f07761eea87c1bb84009e16a8593 Mon Sep 17 00:00:00 2001
From: Darin Dimitroff <d@thecrazyones.agency>
Date: Tue, 3 Jan 2017 11:46:35 +0200
Subject: WIP

Signed-off-by: Darin Dimitroff <d@thecrazyones.agency>
---
 site/layouts/partials/about.html          | 21 --------------------
 site/layouts/partials/blockquote.html     | 10 +++++-----
 site/layouts/partials/blog.html           | 13 +++++-------
 site/layouts/partials/contact-form.html   | 33 +++++++++++++++++++++++++++++++
 site/layouts/partials/footer.html         | 15 +++++++-------
 site/layouts/partials/image-grid.html     |  6 +++---
 site/layouts/partials/nav.html            | 19 ++++++++++++------
 site/layouts/partials/pricing-card.html   | 27 -------------------------
 site/layouts/partials/table-column.html   | 27 +++++++++++++++++++++++++
 site/layouts/partials/table.html          |  6 +++---
 site/layouts/partials/text-and-image.html | 21 ++++++++++++++++++++
 11 files changed, 117 insertions(+), 81 deletions(-)
 delete mode 100644 site/layouts/partials/about.html
 create mode 100644 site/layouts/partials/contact-form.html
 delete mode 100644 site/layouts/partials/pricing-card.html
 create mode 100644 site/layouts/partials/table-column.html
 create mode 100644 site/layouts/partials/text-and-image.html

(limited to 'site/layouts/partials')

diff --git a/site/layouts/partials/about.html b/site/layouts/partials/about.html
deleted file mode 100644
index ff3bd7c..0000000
--- a/site/layouts/partials/about.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="bg-grey-1 pv4">
-	<div class="ph3 mw7 center">
-
-		<div class="flex-l mhn2-l">
-			<div class="w-40-l ph2-l">
-				<h2 class="f2 b lh-title mb2">{{.heading}}</h1>
-
-				<p>{{.text}}</p>
-			</div>
-
-			<div class="w-60-l ph2-l">
-				<img src="img/home/about-section.jpg" alt="" class="mb3">
-			</div>
-		</div>
-
-		<div class="tc">
-			<a href="{{.buttonLink}}" class="btn raise">{{.buttonText}}</a>
-		</div>
-
-	</div>
-</div>
diff --git a/site/layouts/partials/blockquote.html b/site/layouts/partials/blockquote.html
index 6f432bd..85920f0 100644
--- a/site/layouts/partials/blockquote.html
+++ b/site/layouts/partials/blockquote.html
@@ -1,6 +1,6 @@
-<div class="mw6 center mb3">
-  <blockquote class="bg-grey-1 primary pa3 mb3 br1 b">
-    <p class="f4 mb0">{{.quote}}</p>
-    <cite class="tr db grey-3">{{.author}}</cite>
-  </blockquote>
+<div class="center mb3 ph3">
+	<blockquote class="bg-grey-1 primary pa3 mb3 br1 b mw6 center">
+		<p class="f4 mb0">{{.quote}}</p>
+		<cite class="tr db grey-3">{{.author}}</cite>
+	</blockquote>
 </div>
diff --git a/site/layouts/partials/blog.html b/site/layouts/partials/blog.html
index dd34f7d..0661929 100644
--- a/site/layouts/partials/blog.html
+++ b/site/layouts/partials/blog.html
@@ -3,20 +3,17 @@
 
 		<h2 class="f2 b lh-title mb3">Latests stories</h1>
 
-
-	  <div class="w-100 flex-ns mhn1-ns flex-wrap mb3">
-
+		<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>
-
-	  <div class="tc">
-	  	<a href="/post" class="btn raise">Read more</a>
-	  </div>
+		<div class="tc">
+			<a href="/post" class="btn raise">Read more</a>
+		</div>
 
 	</div>
 </div>
diff --git a/site/layouts/partials/contact-form.html b/site/layouts/partials/contact-form.html
new file mode 100644
index 0000000..449a52d
--- /dev/null
+++ b/site/layouts/partials/contact-form.html
@@ -0,0 +1,33 @@
+<!-- Contact -->
+<div class="mb4">
+  <h4 class="f3 b lh-title mb3 tc">Drop us a line below</h4>
+
+  <form action="">
+    <div class="flex-l mhn1-l">
+          <!-- Name -->
+      <div class="ph1-l w-50-l">
+        <fieldset>
+          <input type="text" id="name" placeholder="Name" class="w-100 mb2">
+          <label for="name">Name</label>
+        </fieldset>
+      </div>
+          <!-- Email -->
+      <div class="ph1-l w-50-l">
+        <fieldset>
+          <input type="email" id="email" placeholder="Email" class="w-100 mb2">
+          <label for="email">Email</label>
+        </fieldset>
+      </div>
+    </div>
+
+        <!-- Message -->
+    <fieldset>
+      <textarea name="name" placeholder="Your message" rows="8" cols="80" id="message" class="w-100"></textarea>
+      <label for="message">Your message</label>
+    </fieldset>
+        <!-- Button -->
+    <div class="tc">
+      <button type="submit" class="btn w-100 w-auto-ns raise">Submit</button>
+    </div>
+  </form>
+</div>
diff --git a/site/layouts/partials/footer.html b/site/layouts/partials/footer.html
index 8c67d06..41928f9 100644
--- a/site/layouts/partials/footer.html
+++ b/site/layouts/partials/footer.html
@@ -4,7 +4,7 @@
 
 		<div class="measure-narrow center mb4">
 
-			<img src="/img/logo.svg" alt="" class="db w4 center mb4">
+			<img src="/img/logo.svg" alt="Kaldi logo" class="db w4 center mb4 br0">
 			<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>
 
@@ -15,22 +15,21 @@
 		<div class="flex-ns justify-between">
 
 			<div>
-				<h3 class="f4 b lh-title mb1 primary">List of links</h3>
+				<h3 class="f4 b lh-title mb1 primary">Kaldi</h3>
 				<ul class="mb3">
 					<li><a href="/" class="link">Home</a></li>
 					<li><a href="/products" class="link">Our products</a></li>
-					<li><a href="/about" class="link">About us</a></li>
-					<li><a href="/post" class="link">post</a></li>
+					<li><a href="/values" class="link">About</a></li>
+					<li><a href="/post" class="link">Blog</a></li>
 					<li><a href="/contact" class="link">Contact</a></li>
 				</ul>
 			</div>
 
 			<div>
-				<h3 class="f4 b lh-title mb1 primary">Another list of links</h3>
+				<h3 class="f4 b lh-title mb1 primary">Find out more</h3>
 				<ul class="mb3">
-					<li><a href="#" class="link">Latest offer</a></li>
-					<li><a href="#" class="link">Our locations</a></li>
-					<li><a href="#" class="link">Our partners</a></li>
+					<li><a href="/post/jamaica-blue/" class="link">Latest offers</a></li>
+					<li><a href="/contact" class="link">Schedule and appointment</a></li>
 				</ul>
 			</div>
 
diff --git a/site/layouts/partials/image-grid.html b/site/layouts/partials/image-grid.html
index 25bf701..726be38 100644
--- a/site/layouts/partials/image-grid.html
+++ b/site/layouts/partials/image-grid.html
@@ -2,15 +2,15 @@
 
 	<div class="flex flex-wrap mhn1">
 		<div class="w-100 w-50-ns ph1-ns">
-			<img src="/img/products/products-grid3.jpg" alt="">
+			<img src="/img/products/products-grid3.jpg" alt="A close-up of a paper filter filled with ground coffee">
 		</div>
 
 		<div class="w-100 w-50-ns ph1-ns">
-			<img src="/img/products/products-grid2.jpg" alt="">
+			<img src="/img/products/products-grid2.jpg" alt="A green cup of a coffee on a wooden table">
 		</div>
 
 		<div class="w-100 ph1-ns">
-			<img src="/img/products/products-grid1.jpg" alt="">
+			<img src="/img/products/products-grid1.jpg" alt="Coffee beans">
 		</div>
 	</div>
 
diff --git a/site/layouts/partials/nav.html b/site/layouts/partials/nav.html
index 58c56de..fe722c2 100644
--- a/site/layouts/partials/nav.html
+++ b/site/layouts/partials/nav.html
@@ -1,12 +1,19 @@
-<nav class="overflow-x-scroll flex justify-between center bg-white divider">
+<nav class="overflow-x-scroll overflow-x-visible-ns flex justify-between items-center center bg-white divider-grey">
+
+	<!-- Logo -->
 	<a href="/" class="pa3 dib mr4 flex-none">
-		<img src="/img/logo.svg" width="80px" alt="Kaldi logo" class="br0"/>
+		<img src="/img/logo.svg" width="90px" alt="Kaldi logo" class="br0 db"/>
 	</a>
 
+	<!-- Primary Nav -->
 	<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>
+		<li><a href="/products" class="pa3 no-underline db">Products</a></li>
+
+		<li><a href="/values" class="pa3 no-underline db">Values</a></li>
+
+		<li><a href="/post" class="pa3 no-underline db">Blog</a></li>
+
+		<li><a href="/contact" class="pa3 no-underline db">Contact</a></li>
 	</ul>
+
 </nav>
diff --git a/site/layouts/partials/pricing-card.html b/site/layouts/partials/pricing-card.html
deleted file mode 100644
index 2f009b2..0000000
--- a/site/layouts/partials/pricing-card.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="ph2">
-
-	<!-- Title -->
-	<h3 class="b f5 grey-3 tc lh-title mb3">{{.plan}}</h3>
-
-	<!-- Price -->
-	<p class="primary f1 b tc lh-title">
-		<span class="f4">$</span>{{.price}}
-	</p>
-
-	<!-- Description -->
-	<p class="b">{{.description}}</p>
-
-	<!-- Features -->
-	<ul>
-		<li>
-			<p class="pb2 mb2 divider">{{.item1}}</p>
-		</li>
-		<li>
-			<p class="pb2 mb2 divider">{{.item2}}</p>
-		</li>
-		<li>
-			<p>{{.item3}}</p>
-		</li>
-	</ul>
-
-</div>
diff --git a/site/layouts/partials/table-column.html b/site/layouts/partials/table-column.html
new file mode 100644
index 0000000..f062e14
--- /dev/null
+++ b/site/layouts/partials/table-column.html
@@ -0,0 +1,27 @@
+<div class="ph2">
+
+	<!-- Title -->
+	<h3 class="b f5 grey-3 tc lh-title mb3">{{.plan}}</h3>
+
+	<!-- Price -->
+	<p class="primary f1 b tc lh-title center">
+		<span class="f4">$</span>{{.price}}
+	</p>
+
+	<!-- Description -->
+	<p class="b">{{.description}}</p>
+
+	<!-- Features -->
+	<ul>
+		<li>
+			<p class="pb2 mb2 divider">{{.item1}}</p>
+		</li>
+		<li>
+			<p class="pb2 mb2 divider">{{.item2}}</p>
+		</li>
+		<li>
+			<p>{{.item3}}</p>
+		</li>
+	</ul>
+
+</div>
diff --git a/site/layouts/partials/table.html b/site/layouts/partials/table.html
index 66da24c..bc736c4 100644
--- a/site/layouts/partials/table.html
+++ b/site/layouts/partials/table.html
@@ -7,15 +7,15 @@
 
 		<div class="flex-l mhn2-l mw7">
 
-			<div class="w-33-l ph2">{{ partial "pricing-card" (dict "plan" "Small" "price" "50" "description" "Perfect for the drinker who likes to enjoy 1-2 cups per day." "item1" "3 lbs of coffee per month" "item2" "Green or roasted beans" "item3" "One or two varieties of beans") }}
+			<div class="w-33-l ph2">{{ partial "table-column" (dict "plan" "Small" "price" "50" "description" "Perfect for the drinker who likes to enjoy 1-2 cups per day." "item1" "3 lbs of coffee per month" "item2" "Green or roasted beans" "item3" "One or two varieties of beans") }}
 			</div>
 
 			<div class="w-33-l ph2">
-				{{ partial "pricing-card" (dict "plan" "Big" "price" "80" "description" "Great for avid drinkers, java-loving couples and bigger crowds" "item1" "6 lbs of coffee per month" "item2" "Green or roasted beans" "item3" "Up to 4 different varieties of beans") }}
+				{{ partial "table-column" (dict "plan" "Big" "price" "80" "description" "Great for avid drinkers, java-loving couples and bigger crowds" "item1" "6 lbs of coffee per month" "item2" "Green or roasted beans" "item3" "Up to 4 different varieties of beans") }}
 			</div>
 
 			<div class="w-33-l ph2">
-				{{ partial "pricing-card" (dict "plan" "Small" "price" "80" "description" "Want a few tiny batches from different varieties? Try our custom plan" "item1" "However little or much you need" "item2" "Green or roasted beans" "item3" "Unlimited varieties") }}
+				{{ partial "table-column" (dict "plan" "Custom" "price" "?" "description" "Want a few tiny batches from different varieties? Try our custom plan" "item1" "However little or much you need" "item2" "Green or roasted beans" "item3" "Unlimited varieties") }}
 			</div>
 
 		</div>
diff --git a/site/layouts/partials/text-and-image.html b/site/layouts/partials/text-and-image.html
new file mode 100644
index 0000000..ff3bd7c
--- /dev/null
+++ b/site/layouts/partials/text-and-image.html
@@ -0,0 +1,21 @@
+<div class="bg-grey-1 pv4">
+	<div class="ph3 mw7 center">
+
+		<div class="flex-l mhn2-l">
+			<div class="w-40-l ph2-l">
+				<h2 class="f2 b lh-title mb2">{{.heading}}</h1>
+
+				<p>{{.text}}</p>
+			</div>
+
+			<div class="w-60-l ph2-l">
+				<img src="img/home/about-section.jpg" alt="" class="mb3">
+			</div>
+		</div>
+
+		<div class="tc">
+			<a href="{{.buttonLink}}" class="btn raise">{{.buttonText}}</a>
+		</div>
+
+	</div>
+</div>
-- 
cgit v1.3