From 20d33818a838a7c022456d5620d255283531ba97 Mon Sep 17 00:00:00 2001 From: Darin Dimitroff Date: Mon, 2 Jan 2017 16:09:21 +0200 Subject: WIP --- site/layouts/about/single.html | 2 +- site/layouts/contact/single.html | 2 +- site/layouts/index.html | 6 +- site/layouts/indexes/post.html | 2 +- site/layouts/partials/2-up.html | 2 +- site/layouts/partials/4-up.html | 2 +- site/layouts/partials/about.html | 2 +- site/layouts/partials/blog.html | 22 +++ site/layouts/partials/footer.html | 13 +- site/layouts/partials/media-block-reverse.html | 6 +- site/layouts/partials/media-block.html | 6 +- site/layouts/partials/nav.html | 18 +-- site/layouts/partials/newsletter-form.html | 10 ++ site/layouts/partials/post.html | 22 --- site/layouts/partials/social-icon.html | 4 +- site/layouts/products/single.html | 2 +- site/static/admin/config.yml | 4 +- site/static/admin/index.html | 25 ++-- src/css/imports/_border-radius.css | 190 +++++++++++-------------- src/css/imports/_border-widths.css | 24 ++-- src/css/imports/_buttons.css | 3 +- src/css/imports/_cms.css | 93 +++++++++++- src/css/imports/_code.css | 13 +- src/css/imports/_colors.css | 4 +- src/css/imports/_coordinates.css | 64 ++++----- src/css/imports/_forms.css | 22 ++- src/css/imports/_heights.css | 8 +- src/css/imports/_hovers.css | 86 ----------- src/css/imports/_images.css | 16 +-- src/css/imports/_max-widths.css | 8 +- src/css/imports/_media-queries.css | 2 +- src/css/imports/_outlines.css | 11 -- src/css/imports/_reset.css | 2 +- src/css/imports/_spacing.css | 72 ++-------- src/css/imports/_states.css | 83 +++++++++++ src/css/imports/_tables.css | 43 +++--- src/css/imports/_type-scale.css | 64 ++------- src/css/imports/_typography.css | 41 ++++-- src/css/imports/_variables.css | 11 ++ src/css/imports/_widths.css | 8 +- src/css/main.css | 2 +- src/site/static/img/icons/svg.html | 0 42 files changed, 491 insertions(+), 529 deletions(-) create mode 100644 site/layouts/partials/blog.html create mode 100644 site/layouts/partials/newsletter-form.html delete mode 100644 site/layouts/partials/post.html delete mode 100755 src/css/imports/_hovers.css create mode 100755 src/css/imports/_states.css delete mode 100644 src/site/static/img/icons/svg.html 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") }}
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" . }} -
+

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.

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") }}
    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 }} {{ end }}
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 }} {{ end }}
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 @@
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 @@ +
+
+ +

Latests stories

+ + +
+ + {{ range where .Data.Pages "Type" "post" }} +
+ {{ .Render "li" }} +
+ {{ end }} + +
+ +
+ Read more +
+ +
+
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 @@