diff options
| author | Olivier Fredon <the2ne@gmail.com> | 2016-10-08 19:43:55 +0300 |
|---|---|---|
| committer | Olivier Fredon <the2ne@gmail.com> | 2016-10-08 19:43:55 +0300 |
| commit | b7352004d130b60d64b6c3872a9700b464660f1e (patch) | |
| tree | 3ef196700d759abef7bc3e36e3d2329e58104d8e /layouts | |
| parent | a1e576b8c14740a8a9d3d58af99bc348f85dc44e (diff) | |
fix layout structure
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/_default/list.html | 25 | ||||
| -rw-r--r-- | layouts/_default/single.html | 49 | ||||
| -rw-r--r-- | layouts/partials/header.html | 2 | ||||
| -rw-r--r-- | layouts/partials/navigation.html | 6 | ||||
| -rw-r--r-- | layouts/partials/post-meta.html | 12 |
5 files changed, 56 insertions, 38 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 01e0294..8d13752 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,17 +1,26 @@ {{ partial "head" . }} <body class="list-template"> + <div class="page"> - {{ partial "header" . }} - {{ partial "navigation" . }} + <div class"wrapper"> + {{ partial "header" . }} + </div> - <main class="content" role="main" id="contenu-principal"> - {{ partial "post-list" . }} - {{ partial "pagination" . }} - </main> + {{ partial "navigation" . }} + + <main class="content wrapper" role="main" id="contenu-principal"> + {{ partial "post-list" . }} + {{ partial "pagination" . }} + </main> + + <div class"wrapper"> + {{ partial "social" . }} + {{ partial "footer" . }} + </div> + + </div> - {{ partial "social" . }} - {{ partial "footer" . }} {{ partial "konami" . }} </body> diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 22fa1ac..3e43079 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,25 +1,34 @@ {{ partial "head" . }} -<body class="post-template" itemscope itemtype="http://schema.org/Article"> - - {{ partial "header" . }} - {{ partial "navigation" . }} - - <main class="content" role="main" id="contenu-principal"> - <article class="post"> - <header> - <h1 class="post-title" itemprop="name" role="heading" arial-level="1">{{ .Title }}</h1> - </header> - - <section class="post-content" itemprop="articleBody"> - {{ .Content }} - </section> - {{ partial "post-meta" . }} - </article> - </main> - - {{ partial "social" . }} - {{ partial "footer" . }} +<body class="post-template"> + <div class="page"> + + <div class"wrapper"> + {{ partial "header" . }} + </div> + + {{ partial "navigation" . }} + + <main class="content wrapper" role="main" id="contenu-principal" itemscope itemtype="http://schema.org/Article"> + <article class="post"> + <header> + <h1 class="post-title" itemprop="name" role="heading" arial-level="1">{{ .Title }}</h1> + </header> + + <section class="post-content" itemprop="articleBody"> + {{ .Content }} + </section> + {{ partial "post-meta" . }} + </article> + </main> + + <div class"wrapper"> + {{ partial "social" . }} + {{ partial "footer" . }} + </div> + + </div> + {{ partial "konami" . }} </body> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index b813832..749c35a 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -5,7 +5,7 @@ {{ if .IsPage }}</a>{{ end }} </h1> <h2 class="headlines__baseline" itemprop="jobTitle" lang="en">UI Designer & <wbr>Front-End Developer</h2> - + <link itemprop="url" href="{{ .Site.BaseURL }}"> <link itemprop="email" href="mailto:hello@olivierfredon.com"> <link itemprop="worksFor" href="http://www.jechange.fr"> diff --git a/layouts/partials/navigation.html b/layouts/partials/navigation.html index 55b721b..528b8ab 100644 --- a/layouts/partials/navigation.html +++ b/layouts/partials/navigation.html @@ -1,8 +1,8 @@ {{ if .Site.Menus.main }} -<nav class="menu" role="navigation" id="menu-principal" aria-label="menu principal"> - <ul class="menu__wrapper"> +<nav class="menu wrapper" role="navigation" id="menu-principal" aria-label="menu principal"> + <ul class="menu__items"> {{ range .Site.Menus.main }} - <li class="nav nav-current"><a href="{{.URL}}">{{ .Name }}</a></li> + <li class="item"><a href="{{.URL}}">{{ .Name }}</a></li> {{ end }} </ul> </nav> diff --git a/layouts/partials/post-meta.html b/layouts/partials/post-meta.html index fb012e3..0704904 100644 --- a/layouts/partials/post-meta.html +++ b/layouts/partials/post-meta.html @@ -1,20 +1,20 @@ +{{ $baseurl := .Site.BaseURL }} <footer class="post-meta"> <section class="post-meta__date"> - <time datetime="{{ .Date.Format "02 January 2006" }}" itemprop="datePublished">{{ .Date.Format "02 January 2006" }}</time> + <time datetime="{{ .Date.Format "2006-01-02" }}" itemprop="datePublished">{{ .Date.Format "02 January 2006" }}</time> </section> <section class="post-meta__tags"> {{ range .Params.tags }} - <a href="{{ $.Site.BaseURL }}tags/{{ . }}">{{ . }} </a> + <a href="{{ $baseurl }}tags/{{ . }}">{{ . }} </a> {{ end }} </section> <section class="post-meta__categories"> {{ range .Params.categories }} - <a href="{{ $.Site.BaseURL }}/categories/{{ . | urlize }}">{{ . }}</a> + <a href="{{ $baseurl }}/categories/{{ . | urlize }}">{{ . }}</a> {{ end }} </section> <meta itemprop="url" content="{{ .Permalink }}"> <meta itemprop="author" content="{{ .Site.Params.author }}"> - <meta itemprop="publisher" content="{{ .Site.Params.author }}"> - <meta itemprop="headline" content="{{ .Description }}"> - <meta itemprop="image" content=""> + <meta itemprop="wordCount" content="{{ .WordCount }}" /> + <meta itemprop="timeRequired" content="{{ .ReadingTime }} Min" /> </footer> |