From 6f3c9328911ab711a4d933cb4235840b1737371e Mon Sep 17 00:00:00 2001
From: Thomas Schwery <thomas@inf3.ch>
Date: Sun, 24 Feb 2019 19:53:56 +0100
Subject: [PATCH] Changes from Christophe feedback

---
 site/config.toml                       |  1 +
 site/content/entrainements.md          |  1 +
 site/content/post/_index.md            |  1 +
 site/layouts/page/single.html          |  2 +-
 site/layouts/partials/page-header.html |  2 +-
 site/layouts/partials/site-header.html | 30 ++++++++++++--------------
 site/static/css/custom.css             |  5 +++++
 7 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 site/static/css/custom.css

diff --git a/site/config.toml b/site/config.toml
index 491d0b9..4c714ab 100644
--- a/site/config.toml
+++ b/site/config.toml
@@ -32,3 +32,4 @@ enableRobotsTXT = true
   cover_dimming_class = "bg-black-30"
   featured_image = "/images/banner.jpg"
   logo_image = "/images/logo.png"
+  custom_css = [ "css/custom.css" ]
diff --git a/site/content/entrainements.md b/site/content/entrainements.md
index 0412875..f13f8f6 100644
--- a/site/content/entrainements.md
+++ b/site/content/entrainements.md
@@ -1,5 +1,6 @@
 ---
 title: "Entrainements"
+featured_image: "images/banner4.jpg"
 omit_header_text: true
 type: page
 menu:
diff --git a/site/content/post/_index.md b/site/content/post/_index.md
index 4c610b8..4f7ff30 100644
--- a/site/content/post/_index.md
+++ b/site/content/post/_index.md
@@ -1,5 +1,6 @@
 ---
 title: "Nouvelles du Club"
+featured_image: "images/banner3.jpg"
 omit_header_text: true
 ---
 
diff --git a/site/layouts/page/single.html b/site/layouts/page/single.html
index 65893db..5273c8e 100644
--- a/site/layouts/page/single.html
+++ b/site/layouts/page/single.html
@@ -1,7 +1,7 @@
 {{ define "header" }}{{ partial "page-header.html" . }}{{ end }}
 {{ define "main" }}
   <div class="flex-l mt2 mw8 center">
-    <article class="center cf ph3 ph4-ns mw7">
+    <article class="center cf ph3 ph4-ns mw7 mid-gray">
       <header>
         <p class="f6 b helvetica tracked">
           {{ humanize .Section | upper  }}
diff --git a/site/layouts/partials/page-header.html b/site/layouts/partials/page-header.html
index 080a2e9..eef9ee2 100644
--- a/site/layouts/partials/page-header.html
+++ b/site/layouts/partials/page-header.html
@@ -1,7 +1,7 @@
 {{ $featured_image := .Params.featured_image }}
 {{ if $featured_image }}
   {{ $featured_image := (trim $featured_image "/") | absURL }}
-  <header class="cover bg-top" style="background-image: url('{{ $featured_image }}');">
+  <header class="cover bg-center" style="background-image: url('{{ $featured_image }}');">
     <div class="pb3-m {{ .Site.Params.cover_dimming_class | default "bg-black-60" }}">
       {{ partial "site-navigation.html" . }}
       <div class="tc-l pv6 ph3 ph4-ns">
diff --git a/site/layouts/partials/site-header.html b/site/layouts/partials/site-header.html
index d88eee9..eabc088 100644
--- a/site/layouts/partials/site-header.html
+++ b/site/layouts/partials/site-header.html
@@ -4,24 +4,22 @@
   {{ $featured_image := (trim $featured_image "/") | absURL }}
   {{ $logo_image := (trim $logo_image "/") }}
   <header class="cover bg-top" style="background-image: url('{{ $featured_image }}');">
+    {{ if $logo_image }}
+    <div class="{{ .Site.Params.cover_dimming_class | default "bg-black-60" }} main-logo" style="background-image: url('{{ $logo_image }}');">
+    {{ else }}
     <div class="{{ .Site.Params.cover_dimming_class | default "bg-black-60" }}">
+    {{ end }}
       {{ partial "site-navigation.html" .}}
-      {{ with $logo_image }}
-        <div class="tc-l pv4 ph3 ph4-ns">
-          <h2 class="fw1 f5 f3-l white-80 measure-wide-l center mt3">
-            <img src="{{ $logo_image }}" />
-          </h2>
-      {{ else }}
-        <div class="tc-l pv4 pv6-l ph3 ph4-ns">
+      <div class="pv6 ph3 ph4-ns"></div>
+      <h1 class="tc-l f2 f-subheadline-l fw2 pl2 white-90 mb0 lh-title">
+        {{ .Title | default .Site.Title }}
+      </h1>
+      {{ with .Params.description }}
+        <h2 class="fw1 f5 f3-l white-80 measure-wide-l center mt3">
+          {{ . }}
+        </h2>
       {{ end }}
-        <h1 class="f2 f-subheadline-l fw2 white-90 mb0 lh-title">
-          {{ .Title | default .Site.Title }}
-        </h1>
-        {{ with .Params.description }}
-          <h2 class="fw1 f5 f3-l white-80 measure-wide-l center mt3">
-            {{ . }}
-          </h2>
-        {{ end }}
+      <div class="pv3 ph3 ph4-ns"></div>
       </div>
     </div>
   </header>
@@ -29,7 +27,7 @@
   <header>
     <div class="pb3-m pb6-l {{ .Site.Params.background_color_class | default "bg-black" }}">
       {{ partial "site-navigation.html" . }}
-      <div class="tc-l pv3 ph3 ph4-ns">
+      <div class="pv3 ph3 ph4-ns">
         <h1 class="f2 f-subheadline-l fw2 light-silver mb0 lh-title">
           {{ .Title | default .Site.Title }}
         </h1>
diff --git a/site/static/css/custom.css b/site/static/css/custom.css
new file mode 100644
index 0000000..33c6662
--- /dev/null
+++ b/site/static/css/custom.css
@@ -0,0 +1,5 @@
+.main-logo {
+    background-repeat: no-repeat;
+    background-position: 95% 95%;
+    background-size: 200px;
+}