From 748564be8a54f07761eea87c1bb84009e16a8593 Mon Sep 17 00:00:00 2001 From: Darin Dimitroff Date: Tue, 3 Jan 2017 11:46:35 +0200 Subject: WIP Signed-off-by: Darin Dimitroff --- site/layouts/_default/li.html | 12 ++++++--- site/layouts/_default/list.html | 16 ++++++++++++ site/layouts/about/single.html | 16 ------------ site/layouts/contact/single.html | 42 ++++++------------------------- site/layouts/index.html | 2 +- site/layouts/indexes/post.html | 16 ------------ 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 ++++++++++++++++ site/layouts/post/li.html | 6 ----- site/layouts/post/list.html | 14 ----------- site/layouts/products/single.html | 8 +++--- site/layouts/values/single.html | 18 +++++++++++++ 21 files changed, 173 insertions(+), 175 deletions(-) create mode 100644 site/layouts/_default/list.html delete mode 100644 site/layouts/about/single.html delete mode 100644 site/layouts/indexes/post.html 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 delete mode 100644 site/layouts/post/li.html delete mode 100644 site/layouts/post/list.html create mode 100644 site/layouts/values/single.html (limited to 'site/layouts') 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 @@ -
  • - Hello -
    • + + +

    {{ .Title }}

    +

    {{ .Date.Format "Mon, Jan 2, 2006" }}

    +

    {{ .Summary }}

    +

    Read more →

    + +     diff --git a/site/layouts/_default/list.html b/site/layouts/_default/list.html new file mode 100644 index 0000000..84b9279 --- /dev/null +++ b/site/layouts/_default/list.html @@ -0,0 +1,16 @@ +{{ partial "header" . }} +{{ partial "nav" . }} + +{{ partial "jumbotron" (dict "imageUrl" "/img/post-index.jpg" "title" "Latests stories") }} + +
    +
      + {{ range .Data.Pages }} +
      + {{ .Render "li"}} +
      + {{ end }} +
    +
    + +{{ partial "footer" . }} 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") }} - -
    - - {{ 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") }} -
    - -{{ 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 @@
    + +

    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.

    +

    How can I get…?

    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!

    -
    +
    +

    Location

    3153 Lynn Avenue, South San Francisco, California 94080

    @@ -19,41 +23,11 @@

    Working hours

    Monday – Saturday: 9AM – 7PM We’re closed on Sundays

    -
    - -
    -

    Drop us a line below

    - -
    -
    - -
    -
    - - -
    -
    - -
    -
    - - -
    -
    -
    - - -
    - - -
    - -
    - -
    -
    + + {{ partial "contact-form" . }} +
    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/indexes/post.html b/site/layouts/indexes/post.html deleted file mode 100644 index 84b9279..0000000 --- a/site/layouts/indexes/post.html +++ /dev/null @@ -1,16 +0,0 @@ -{{ partial "header" . }} -{{ partial "nav" . }} - -{{ partial "jumbotron" (dict "imageUrl" "/img/post-index.jpg" "title" "Latests stories") }} - -
    -
      - {{ range .Data.Pages }} -
      - {{ .Render "li"}} -
      - {{ end }} -
    -
    - -{{ partial "footer" . }} 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 @@ -
    -
    - -
    -
    -

    {{.heading}}

    - -

    {{.text}}

    -
    - -
    - -
    -
    - -
    - {{.buttonText}} -
    - -
    -
    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 @@ -
    -
    -

    {{.quote}}

    - {{.author}} -
    +
    +
    +

    {{.quote}}

    + {{.author}} +
    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 @@

    Latests stories

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

    Drop us a line below

    + +
    +
    + +
    +
    + + +
    +
    + +
    +
    + + +
    +
    +
    + + +
    + + +
    + +
    + +
    +
    +
    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 @@
    - + Kaldi logo

    Newsletter subscribe

    Get awesome news from us in your inbox every two weeks. Be the first to learn about new products.

    @@ -15,22 +15,21 @@
    -

    List of links

    +

    Kaldi

    -

    Another list of links

    +

    Find out more

    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 @@
    - + A close-up of a paper filter filled with ground coffee
    - + A green cup of a coffee on a wooden table
    - + Coffee beans
    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 @@ -