diff options
-rw-r--r-- | layouts/_default/baseof.html | 2 | ||||
-rw-r--r-- | layouts/_default/single.html | 35 | ||||
-rw-r--r-- | static/css/style.css | 8 |
3 files changed, 25 insertions, 20 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index b525b04..3e886a9 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -12,7 +12,7 @@ <body> <nav> - <ul class="menu"> + <ul> {{ range .Site.Menus.main }} <li><a href="{{ .URL | relURL }}">{{ .Name }}</a></li> {{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index fc7edb3..9fbe403 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,19 +1,24 @@ {{ define "main" }} -<div class="article-meta"> -<h1><span class="title">{{ .Title | markdownify }}</span></h1> -{{ with .Params.author }}<h2 class="author">{{ . }}</h2>{{ end }} -{{ if (gt .Params.date 0) }}<h2 class="date">{{ .Date.Format "2006-01-02" }}</h2>{{ end }} -<p class="terms"> - {{ range $i := (slice "categories" "tags") }} - {{ with ($.Param $i) }} - {{ $i | title }}: {{ range $k := . }}<a href="{{ relURL (print "/" $i "/" $k | urlize) }}">{{$k}}</a> {{ end }} - {{ end }} - {{ end }} -</p> -</div> +<article> + <header> + <h1><span class="title">{{ .Title | markdownify }}</span></h1> + {{ with .Params.author }}<h2 class="author">{{ . }}</h2>{{ end }} + {{ if (gt .Params.date 0) }}<h2 class="date">{{ .Date.Format "2006-01-02" }}</h2>{{ end }} + <p class="terms"> + {{ range $i := (slice "categories" "tags") }} + {{ with ($.Param $i) }} + {{ $i | title }}: {{ range $k := . }}<a href="{{ relURL (print "/" $i "/" $k | urlize) }}">{{$k}}</a> {{ end }} + {{ end }} + {{ end }} + </p> + </header> -<main> -{{ .Content }} -</main> + <main> + {{ .Content }} + </main> + <footer> + + </footer> +</article> {{- end }} diff --git a/static/css/style.css b/static/css/style.css index 23c0912..76658fe 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -7,16 +7,16 @@ body { } /* header and footer areas */ -.menu { padding: 0; } -.menu li { display: inline-block; } -.article-meta, .menu a { +nav > ul { padding: 0; } +nav > ul > li { display: inline-block; } +article > header, nav > ul a { background: #eee; border-radius: 5px; padding: 5px; text-decoration: none; } -.menu, .article-meta, footer { text-align: center; } .terms { font-size: .9em; } +nav > ul, article > header, footer { text-align: center; } .title { font-size: 1.1em; } footer a { text-decoration: none; } hr { |