diff options
Diffstat (limited to 'site')
23 files changed, 114 insertions, 126 deletions
diff --git a/site/content/about.md b/site/content/about.md deleted file mode 100644 index df221a8..0000000 --- a/site/content/about.md +++ /dev/null @@ -1,5 +0,0 @@ -+++ -title = "Another Hugo Post" -type = "about" -page="/about.html" -+++ diff --git a/site/content/values.md b/site/content/values.md new file mode 100644 index 0000000..3dcd089 --- /dev/null +++ b/site/content/values.md @@ -0,0 +1,5 @@ ++++ +title = "Values" +type = "values" +page="/values.html" ++++ diff --git a/site/layouts/_default/li.html b/site/layouts/_default/li.html index d521ea0..916acb3 100644 --- a/site/layouts/_default/li.html +++ b/site/layouts/_default/li.html @@ -1,3 +1,9 @@ -<li> - Hello -</li> +<a href="{{ .Permalink }}" class="no-underline pa3 bg-grey-1 br1 mb2 db raise w-100"> + + <h2 class="f3 b lh-title mb1 primary">{{ .Title }}</h2 + > + <p class="mid-gray lh-title mb2">{{ .Date.Format "Mon, Jan 2, 2006" }}</p> + <p class="mb0">{{ .Summary }}</p> + <p class="link b dib black mb0">Read more →</p> + +</a> diff --git a/site/layouts/indexes/post.html b/site/layouts/_default/list.html index 84b9279..84b9279 100644 --- a/site/layouts/indexes/post.html +++ b/site/layouts/_default/list.html diff --git a/site/layouts/about/single.html b/site/layouts/about/single.html deleted file mode 100644 index daa30a3..0000000 --- a/site/layouts/about/single.html +++ /dev/null @@ -1,16 +0,0 @@ -{{ partial "header" . }} -{{ partial "nav" . }} -{{ partial "jumbotron" (dict "imageUrl" "/img/about/jumbotron.jpg" "title" "Values") }} - -<div class="mw7 center ph3 pt4"> - - {{ partial "media-block" (dict "heading" "Shade-grown coffee" "text" "Coffee is a small tree or shrub that grows in the forest understory in its wild form, and traditionally was grown commercially under other trees that provided shade. The forest-like structure of shade coffee farms provides habitat for a great number of migratory and resident species." "imageUrl" "/img/about/direct-sourcing.jpg") }} - - {{ partial "media-block-reverse" (dict "heading" "Shade-grown coffee" "text" "Coffee is a small tree or shrub that grows in the forest understory in its wild form, and traditionally was grown commercially under other trees that provided shade. The forest-like structure of shade coffee farms provides habitat for a great number of migratory and resident species." "imageUrl" "/img/about/reinvest-profits.jpg") }} - - {{ partial "media-block" (dict "heading" "Shade-grown coffee" "text" "Coffee is a small tree or shrub that grows in the forest understory in its wild form, and traditionally was grown commercially under other trees that provided shade. The forest-like structure of shade coffee farms provides habitat for a great number of migratory and resident species." "imageUrl" "/img/about/shade-grown.jpg") }} - - {{ partial "media-block-reverse" (dict "heading" "Shade-grown coffee" "text" "Coffee is a small tree or shrub that grows in the forest understory in its wild form, and traditionally was grown commercially under other trees that provided shade. The forest-like structure of shade coffee farms provides habitat for a great number of migratory and resident species." "imageUrl" "/img/about/single-origin.jpg") }} -</div> - -{{ partial "footer" . }} diff --git a/site/layouts/contact/single.html b/site/layouts/contact/single.html index 1e36be3..e145123 100644 --- a/site/layouts/contact/single.html +++ b/site/layouts/contact/single.html @@ -4,12 +4,16 @@ <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> + <h3 class="f4 b lh-title mb2">How can I get…?</h3> <p>You can also use the form below for any inquiries about coffee availability, monthly subscriptions and scheduling a 1-on-1 session with our baristas. Don’t be shy, drop us a line!</p> - <div class="flex-ns"> + <div class="flex-ns mb3"> + <div> <h4 class="f4 b lh-title mb2 primary">Location</h4> <p>3153 Lynn Avenue, South San Francisco, California 94080</p> @@ -19,41 +23,11 @@ <h4 class="f4 b lh-title mb2 primary">Working hours</h4> <p>Monday – Saturday: 9AM – 7PM We’re closed on Sundays</p> </div> - </div> - <!-- Contact --> - <div> - <h4 class="f3 b lh-title mb3 tc">Drop us a line below</h4> + </div> - <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> + {{ partial "contact-form" . }} - <!-- 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> </div> </div> diff --git a/site/layouts/index.html b/site/layouts/index.html index eec5318..158ddc6 100644 --- a/site/layouts/index.html +++ b/site/layouts/index.html @@ -8,7 +8,7 @@ {{ 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" "buttonLink" "/about") }} +{{ partial "text-and-image" (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 "blog" . }} 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/table-column.html index 2f009b2..f062e14 100644 --- a/site/layouts/partials/pricing-card.html +++ b/site/layouts/partials/table-column.html @@ -4,7 +4,7 @@ <h3 class="b f5 grey-3 tc lh-title mb3">{{.plan}}</h3> <!-- Price --> - <p class="primary f1 b tc lh-title"> + <p class="primary f1 b tc lh-title center"> <span class="f4">$</span>{{.price}} </p> 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/about.html b/site/layouts/partials/text-and-image.html index ff3bd7c..ff3bd7c 100644 --- a/site/layouts/partials/about.html +++ b/site/layouts/partials/text-and-image.html diff --git a/site/layouts/post/li.html b/site/layouts/post/li.html deleted file mode 100644 index de2d1da..0000000 --- a/site/layouts/post/li.html +++ /dev/null @@ -1,6 +0,0 @@ -<a href="{{ .Permalink }}" class="no-underline pa3 bg-grey-1 br1 mb2 db raise"> - <h3 class="f3 b lh-title mb1 primary">{{ .Title }}</h3> - <p class="mid-gray lh-title mb2">{{ .Date.Format "Mon, Jan 2, 2006" }}</p> - <p class="mb0">{{ .Summary }}</p> - <p class="link b dib black mb0">Read more →</p> -</a> diff --git a/site/layouts/post/list.html b/site/layouts/post/list.html deleted file mode 100644 index 5d13c7e..0000000 --- a/site/layouts/post/list.html +++ /dev/null @@ -1,14 +0,0 @@ -{{ partial "header" . }} -{{ partial "nav" . }} - -{{ partial "jumbotron" (dict "imageUrl" "img/2.jpg" "title" "post title goes here") }} - -<ul class="flex-l"> - {{ range .Data.Pages }} - <div> - {{ .Render "li"}} - </div> - {{ end }} -</ul> - -{{ partial "footer" . }} diff --git a/site/layouts/products/single.html b/site/layouts/products/single.html index 921763d..81bef18 100644 --- a/site/layouts/products/single.html +++ b/site/layouts/products/single.html @@ -15,11 +15,11 @@ <!-- Image grid --> {{ partial "image-grid" . }} -{{ partial "blockquote" (dict "quote" "A testimonial from someone who can’t live without this." "author" "A satisfied customer") }} +<div class="pb4"> + {{ partial "blockquote" (dict "quote" "“The first time I tried Kaldi’s coffee, I couldn’t even believe that was the same thing I’ve been drinking every morning.”" "author" "Elisabeth Kaurismäki") }} -{{ partial "blockquote" (dict "quote" "“The first time I tried Kaldi’s coffee, I couldn’t even believe that was the same thing I’ve been drinking every morning.”" "author" "Elisabeth Kaurismäki") }} - -{{ 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") }} + {{ 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") }} +</div> <!-- Full-width image --> <img src="/img/products/products-full-width.jpg" alt="" class="db w-100"> diff --git a/site/layouts/values/single.html b/site/layouts/values/single.html new file mode 100644 index 0000000..0add0a7 --- /dev/null +++ b/site/layouts/values/single.html @@ -0,0 +1,18 @@ +{{ partial "header" . }} +{{ partial "nav" . }} +{{ partial "jumbotron" (dict "imageUrl" "/img/about/jumbotron.jpg" "title" "Values") }} + +<div class="mw7 center ph3 pt4"> + + {{ partial "media-block" (dict "heading" "Shade-grown coffee" "text" "Coffee is a small tree or shrub that grows in the forest understory in its wild form, and traditionally was grown commercially under other trees that provided shade. The forest-like structure of shade coffee farms provides habitat for a great number of migratory and resident species." "imageUrl" "/img/about/shade-grown.jpg") }} + + {{ partial "media-block-reverse" (dict "heading" "Single origin" "text" "Single-origin coffee is coffee grown within a single known geographic origin. Sometimes, this is a single farm or a specific collection of beans from a single country. The name of the coffee is then usually the place it was grown to whatever degree available." "imageUrl" "/img/about/single-origin.jpg") }} + + {{ partial "media-block" (dict "heading" "Sustainable farming" "text" "Sustainable agriculture is farming in sustainable ways based on an understanding of ecosystem services, the study of relationships between organisms and their environment. What grows where and how it is grown are a matter of choice and careful consideration for nature and communities." "imageUrl" "/img/about/sustainable-farming.jpg") }} + + {{ partial "media-block-reverse" (dict "heading" "Direct sourcing" "text" "Direct trade is a form of sourcing practiced by some coffee roasters. Advocates of direct trade practices promote direct communication and price negotiation between buyer and farmer, along with systems that encourage and incentivize quality." "imageUrl" "/img/about/direct-sourcing.jpg") }} + + {{ partial "media-block" (dict "heading" "Reinvest profits" "text" "We want to truly empower the communities that bring amazing coffee to you. That’s why we reinvest 20% of our profits into farms, local businesses and schools everywhere our coffee is grown. You can see the communities grow and learn more about coffee farming on our blog." "imageUrl" "/img/about/reinvest-profits.jpg") }} +</div> + +{{ partial "footer" . }} diff --git a/site/static/admin/config.yml b/site/static/admin/config.yml index b374e60..5900477 100644 --- a/site/static/admin/config.yml +++ b/site/static/admin/config.yml @@ -15,13 +15,3 @@ collections: # A list of collections the CMS should be able to edit - {label: "Title", name: "title", widget: "string", tagname: "h1"} - {label: "Body", name: "body", widget: "markdown"} - {label: "Publish Date", name: "date", widget: "datetime"} - # - name: "settings" - # label: "Settings" - # files: - # - name: "general" - # label: "General settings" - # file: "_settings/general.json" - # fields: - # - {label: "Main site title", name: "site_title", widget: "string"} - # - {label: "Number of fronpage posts", name: "post_count", widget: "number"} - # - {label: "Site cover image", name: "cover", widget: "image"} diff --git a/site/static/img/blog posts/flavor wheel.jpg b/site/static/img/blog posts/flavor_wheel.jpg Binary files differindex dc2a87d..dc2a87d 100755 --- a/site/static/img/blog posts/flavor wheel.jpg +++ b/site/static/img/blog posts/flavor_wheel.jpg diff --git a/site/static/img/carriefisher.jpg b/site/static/img/carriefisher.jpg Binary files differdeleted file mode 100644 index bb48f53..0000000 --- a/site/static/img/carriefisher.jpg +++ /dev/null |
