Refactor partials, layout and sass files

2018-09-11 16:51:27 +02:00
parent 43974d0908
commit 628a4df0df
18 changed files with 95 additions and 68 deletions
@@ -1,25 +1,31 @@
 <!DOCTYPE html>
 <html>
 <head>
-  {{ partial "book-html-head" . }}
-  <title>{{ .Site.Title }}</title>
+  {{ partial "book/html-head" . }}
+  <title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
 </head>

 <body>
  <div class="pure-g">
+
    <div class="pure-u book-nav">
-        {{ partial "book-nav" . }}
+      {{ partial "book/nav" . }}
    </div>
    <div class="pure-u book-content">
      <div class="pure-g">
+
        <div class="pure-u book-page markdown">
          {{ block "main" . }}{{ end }}
        </div>
+        {{ if and (default true .Site.Params.BookShowTOC) (.Page.TableOfContents) }}
        <div class="pure-u book-toc">
-          {{ partial "book-toc" . }}
+          {{ partial "book/toc" . }}
        </div>
+        {{ end }}
+
      </div>
    </div>
+
  </div>
 </body>
 </html>
@@ -1,7 +0,0 @@
-{{ define "title" }}
-  {{ .Title }} &ndash; {{ .Site.Title }}
-{{ end }}
-
-{{ define "main" }}
-  <div>{{ .Content }}</div>
-{{ end }}
@@ -1,7 +1,7 @@
-{{ define "title" }}
-  {{ .Title }} &ndash; {{ .Site.Title }}
+{{- define "title" -}}
+  {{ .Site.Title }}
 {{ end }}

-{{ define "main" }}
+{{- define "main" -}}
  <div>{{ .Content }}</div>
 {{ end }}
@@ -1,3 +1,7 @@
-{{ define "main" }}
+{{- define "title" -}}
+  {{ .Site.Title }}
+{{ end }}
+
+{{- define "main" -}}
  <div>{{ .Content }}</div>
 {{ end }}