diff options
| author | Zhe Zhang <neomana@gmail.com> | 2015-08-15 11:48:27 +0300 |
|---|---|---|
| committer | Zhe Zhang <neomana@gmail.com> | 2015-08-15 11:48:27 +0300 |
| commit | 895e33ae1ae9f36de2313017e4b394b1e5085165 (patch) | |
| tree | 76dddf03e0fa399dd4c83bc7064950c8da41a769 | |
| parent | ccdd0de582c4f36a51a05e2cb11c0a5f190cbe49 (diff) | |
| parent | 4d8254f472503a8f3b1be5812e2aa7e75e5ef7d4 (diff) | |
Merge pull request #1 from Bunker/master
added tags, summary or content to home page
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | layouts/_default/list.html | 46 | ||||
| -rw-r--r-- | layouts/_default/single.html | 2 | ||||
| -rw-r--r-- | layouts/index.html | 19 | ||||
| -rw-r--r-- | layouts/pages/single.html | 0 | ||||
| -rw-r--r-- | layouts/partials/head.html | 7 | ||||
| -rw-r--r-- | layouts/partials/header.html | 8 | ||||
| -rw-r--r-- | layouts/partials/pagination.html | 4 | ||||
| -rw-r--r-- | layouts/post/single.html | 4 | ||||
| -rw-r--r-- | static/css/slim.css | 33 |
10 files changed, 111 insertions, 18 deletions
@@ -25,6 +25,9 @@ You could add `params` into your site's `config.toml` file: GithubID = "Your Github ID" TwitterID = "Your Twitter ID" AnalyticsID = "Your Google Analytics tracking code" + Summary = true # takes true or false + Content = false # takes true or false + # if both are set to true, summary is shown. ``` if you use `config.yaml`, it could look like: @@ -35,6 +38,9 @@ params: GithubID: "Your Github ID" TwitterID: "Your Twitter ID" AnalyticsID: "Your Google Analytics tracking code" + Summary: true # takes true or false + Content: false # takes true or false + # if both are set to true, summary is shown ``` ## Build your site diff --git a/layouts/_default/list.html b/layouts/_default/list.html index e69de29..ef39b79 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -0,0 +1,46 @@ +<!DOCTYPE html> +<html lang="{{ .Site.LanguageCode }}"> + +<head> + {{ partial "head.html" . }} +</head> + +<body> + <div class="container"> + {{ partial "header.html" . }} + <div class="content"> + <div class="posts"> + {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }} {{ range $paginator.Pages }} + <div class="post"> + <h2 class="post-title"><a href="{{ .Permalink }}">{{ .Title }}</a></h2> + <span class="post-date">{{ .Date.Format "Jan 2, 2006" }}</span> + {{ if .Params.tags }} + <span class="post-tags"> + {{ range .Params.tags }} + #<a href="/tags/{{ . | urlize }}">{{ . }}</a> + {{ end }} + </span> + {{ end }} + {{ if .Site.Params.Summary }} + <div class="summary"> + {{ .Summary }} + <a class="read-more" href="{{.RelPermalink}}">…</a> + </div> + {{ else if .Site.Params.Content }} + <div class="content"> + {{ .Content }} + </div> + {{ end }} + </div> + {{ end }} + </div> + {{ partial "pagination.html" . }} + </div> + {{ partial "footer.html" . }} + </div> + <script src="{{ .Site.BaseURL }}js/slim.js"></script> + {{ with .Site.Params.AnalyticsID }}{{ partial "analytics.html" . }}{{ end }} + +</body> + +</html>
\ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index fa8d589..ad74982 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -18,7 +18,7 @@ </div> {{ partial "footer.html" . }} </div> - <script src="{{ .Site.BaseUrl }}/js/slim.js"></script> + <script src="{{ .Site.BaseURL }}/js/slim.js"></script> {{ with .Site.Params.AnalyticsID }}{{ partial "analytics.html" . }}{{ end }} </body> diff --git a/layouts/index.html b/layouts/index.html index da5754c..07331ed 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -14,6 +14,23 @@ <div class="post"> <h2 class="post-title"><a href="{{ .Permalink }}">{{ .Title }}</a></h2> <span class="post-date">{{ .Date.Format "Jan 2, 2006" }}</span> + {{ if .Params.tags }} + <span class="post-tags"> + {{ range .Params.tags }} + #<a href="/tags/{{ . | urlize }}">{{ . }}</a> + {{ end }} + </span> + {{ end }} + {{ if .Site.Params.Summary }} + <div class="summary"> + {{ .Summary }} + <a class="read-more" href="{{.RelPermalink}}">…</a> + </div> + {{ else if .Site.Params.Content }} + <div class="content"> + {{ .Content }} + </div> + {{ end }} </div> {{ end }} </div> @@ -21,7 +38,7 @@ </div> {{ partial "footer.html" . }} </div> - <script src="{{ .Site.BaseUrl }}js/slim.js"></script> + <script src="{{ .Site.BaseURL }}/js/slim.js"></script> {{ with .Site.Params.AnalyticsID }}{{ partial "analytics.html" . }}{{ end }} </body> diff --git a/layouts/pages/single.html b/layouts/pages/single.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/layouts/pages/single.html diff --git a/layouts/partials/head.html b/layouts/partials/head.html index ff8c638..771ce48 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -3,10 +3,9 @@ <title> {{ .Title }} · {{ .Site.Title }} </title> <!-- CSS --> -<link rel="stylesheet" href="{{ .Site.BaseUrl }}/css/slim.css"> -<link rel="stylesheet" href="{{ .Site.BaseUrl }}/css/highlight.min.css"> -<link href='http://fonts.useso.com/css?family=Open+Sans:400,700&subset=latin,latin-ext' rel='stylesheet' type='text/css'> - +<link rel="stylesheet" href="{{ .Site.BaseURL }}/css/slim.css"> +<link rel="stylesheet" href="{{ .Site.BaseURL }}/css/highlight.min.css"> +<link href='http://fonts.googleapis.com/css?family=Open+Sans:300,400,600&subset=latin,latin-ext' rel='stylesheet'> <!-- Icons --> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/apple-touch-icon-144-precomposed.png"> <link rel="shortcut icon" href="/favicon.ico"> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 57204a7..4cc3b20 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,5 +1,5 @@ <div class="header"> - <h1 class="site-title"><a href="{{ .Site.BaseUrl }}">{{ .Site.Title }}</a></h1> + <h1 class="site-title"><a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a></h1> <p class="site-tagline">{{ .Site.Params.Subtitle }}</p> <div class="nav"> <a class="nav-btn" href="#"> @@ -7,8 +7,10 @@ </a> <ul class="nav-list"> {{ range .Site.Menus.main }} - <li><a href="{{ .Url }}">{{ .Name }}</a></li> - {{end}} {{ with .Site.Params.GithubID }} + <li><a href="{{ .URL }}">{{ .Name }}</a></li> + {{end}} + <li class="spacer">∾</li> +{{ with .Site.Params.GithubID }} <li><a href="https://github.com/{{.}}">Github</a></li>{{ end }} {{ with .Site.Params.TwitterID }} <li><a href="https://twitter.com/{{.}}">Twitter</a></li>{{ end }} {{ with .Site.Params.LinkedInID }} <li><a href="http://linkedin.com/in/{{.}}">LinkedIn</a></li>{{ end }} diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html index c779702..b5b408a 100644 --- a/layouts/partials/pagination.html +++ b/layouts/partials/pagination.html @@ -1,5 +1,5 @@ <div class="pagination"> {{ if .Paginator.HasPrev }} - <a class="btn previous" href="{{ .Paginator.Prev.Url }}">Newer</a> {{ end }} {{ if .Paginator.HasNext }} - <a class="btn next" href="{{ .Paginator.Next.Url }}">Older</a> {{ end }} + <a class="btn previous" href="{{ .Paginator.Prev.URL }}">Newer</a> {{ end }} {{ if .Paginator.HasNext }} + <a class="btn next" href="{{ .Paginator.Next.URL }}">Older</a> {{ end }} </div>
\ No newline at end of file diff --git a/layouts/post/single.html b/layouts/post/single.html index 71d8419..479555f 100644 --- a/layouts/post/single.html +++ b/layouts/post/single.html @@ -25,8 +25,8 @@ </div> {{ partial "footer.html" . }} </div> - <script src="{{ .Site.BaseUrl }}/js/slim.js"></script> - <script src="{{ .Site.BaseUrl }}/js/highlight.min.js"></script> + <script src="{{ .Site.BaseURL }}/js/slim.js"></script> + <script src="{{ .Site.BaseURL }}/js/highlight.min.js"></script> <script> hljs.initHighlightingOnLoad(); </script> diff --git a/static/css/slim.css b/static/css/slim.css index 1e28750..b737996 100644 --- a/static/css/slim.css +++ b/static/css/slim.css @@ -14,7 +14,7 @@ a { img { max-width: 100%; - margin: 0 0 1rem; + margin: 1rem 0 0 1rem; border: 0; border-radius: 5px; } @@ -40,8 +40,8 @@ tbody tr:nth-child(odd) th { background-color: #f9f9f9; } body { - color: #333; - font-family: Merriweather, 'Hiragino Sans GB', 'Microsoft YaHei', 'WenQuanYi Micro Hei', Serif; + color: #555; + font-family: Verdana, 'Merriweather', 'Hiragino Sans GB', 'Microsoft YaHei', 'WenQuanYi Micro Hei', Serif; font-size: 100%; line-height: 1.85; letter-spacing: 0.01rem; } @@ -212,6 +212,10 @@ button, -webkit-transition: all 0.2s; transition: all 0.2s; } +.nav-list .spacer { + text-align: center; +} + .ci { display: inline-block; font-size: inherit; @@ -333,8 +337,27 @@ button, .post-date { color: #ccc; font-size: 14px; - position: absolute; - top: 45px; } + margin-top: -25px; + display:block; + position: relative; } .post-content { margin: 2rem 0; } + +/* styling for tags on homepage */ + +.post-tags { + color: #ccc; + display: block; + font-size: 14px; + position: relative; + margin-top: -25px; + margin-left: 125px; + text-align: right; + max-width: 525px; +} + +.post-tags a { + color: #ccc; +} + |