diff options
| author | Keichi Takahashi <keichi.t@me.com> | 2015-07-10 17:15:17 +0300 |
|---|---|---|
| committer | Keichi Takahashi <keichi.t@me.com> | 2015-07-10 17:15:17 +0300 |
| commit | cfc3cd65024acb2851ea9185be777e30e31a644f (patch) | |
| tree | fc69effae312547b86e866b89c8ac5a483535c8e | |
| parent | cb1ad43e277b6dcbb70a14e7426406ea30824a18 (diff) | |
| parent | a76fda6810ad7f115bcc0ff099a7a045662dcf7a (diff) | |
Merge pull request #14 from mapitman/master
added ability to change the top image for each post
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | layouts/index.html | 3 | ||||
| -rw-r--r-- | layouts/partials/header.html | 2 | ||||
| -rw-r--r-- | layouts/partials/pagination.html | 9 | ||||
| -rw-r--r-- | static/css/main.css | 43 |
5 files changed, 55 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1377554 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.swp diff --git a/layouts/index.html b/layouts/index.html index 360647b..17de6dc 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,11 +1,12 @@ {{ partial "header.html" . }} <div class="article-list"> - {{ range $index, $page := .Site.Pages }} + {{ range $index, $page := .Paginator.Pages }} {{ if ne $index 0 }} <hr/> {{ end }} {{ .Render "li" }} {{ end }} </div> +{{ partial "pagination.html" .Paginator }} {{ partial "footer.html" . }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 8546a94..73c6011 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -41,7 +41,7 @@ {{ end }} </head> <body> - <header class="global-header"> + <header class="global-header" style="background-image:url({{ if isset .Params "image" }}{{ .Params.image }} {{ else }} /images/bg.jpg {{ end }})"> <section class="header-text"> <h1><a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a></h1> {{ with .Site.Params.subtitle }} diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html new file mode 100644 index 0000000..0eb437e --- /dev/null +++ b/layouts/partials/pagination.html @@ -0,0 +1,9 @@ +<nav class="pagination" role="navigation"> +{{if .HasPrev}} + <a class="newer-posts" href="{{ .Prev.URL }}">« Newer Posts</a> +{{end}} + <span class="page-number">Page {{ .PageNumber }} of {{.TotalPages}}</span> +{{if .HasNext}} + <a class="older-posts" href="{{ .Next.URL }}">Older Posts »</a> +{{end}} +</nav> diff --git a/static/css/main.css b/static/css/main.css index 2b2b8a7..b5fdc48 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -6,7 +6,7 @@ main { /* Header */ .global-header { - background-image: url(/images/bg.jpg); + background: #222 no-repeat center center; background-size: cover; } @@ -216,6 +216,47 @@ a.btn-back { color: rgba(255, 255, 255, 1.0); } +/* Pagination */ + +.pagination +{ + width: 720px; + text-align: center; +} + +.older-posts,.newer-posts +{ + display: inline!important; + border: 1px solid #ddd; + border-radius: 15px; + text-decoration: none; + transition: border .3s ease; + padding: 5px 14px; +} + +.page-number +{ + display: inline-block; + min-width: 100px; + padding: 2px 0; +} + +.newer-posts +{ + float: left; +} + +.older-posts +{ + float: right; +} + +.older-posts:hover,.newer-posts:hover +{ + color: #889093; + border-color: #98a0a4; +} + /* Override some of Bootstrap's styles */ pre { |