Skip to content

Commit

Permalink
Merge pull request #2 from hiroxy/fix-build-error
Browse files Browse the repository at this point in the history
Fix build error
  • Loading branch information
dim0627 committed Jul 1, 2015
2 parents 1ea4bec + 3d07de1 commit 3f80d92
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion content/post/goisforlovers.md
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ so, such as in this example:
```
<nav class="recent">
<h1>Recent Posts</h1>
<ul>{{range first .Site.Params.SidebarRecentLimit .Site.Recent}}
<ul>{{range first .Site.Params.SidebarRecentLimit .Site.Pages}}
<li><a href="{{.RelPermalink}}">{{.Title}}</a></li>
{{end}}</ul>
</nav>
Expand Down
6 changes: 3 additions & 3 deletions layouts/_default/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h1 class="post-title">
</div>

<aside>
{{ $baseurl := .Site.BaseUrl }}
{{ $baseurl := .Site.BaseURL }}
<ul class="list-inline post-tags">
{{ range .Params.tags }}
<li>
Expand All @@ -39,7 +39,7 @@ <h3>Related Post</h3>
<ul class="post-rels">
{{ $page_link := .Permalink }}
{{ $tags := .Params.tags }}
{{ range .Site.Recent }}
{{ range .Site.Pages }}
{{ $page := . }}
{{ $has_common_tags := intersect $tags .Params.tags | len | lt 0 }}
{{ if and $has_common_tags (ne $page_link $page.Permalink) }}
Expand All @@ -61,7 +61,7 @@ <h3>Related Post</h3>
<li class="previous disabled"><a href="#"><span aria-hidden="true">&larr;</span> Older</a></li>
{{ end }}

<li><a href="{{ .Site.BaseUrl }}/post">All Posts</a></li>
<li><a href="{{ .Site.BaseURL }}/post">All Posts</a></li>

{{ if .Next }}
<li class="next"><a href="{{ .Next.Permalink }}">Newer <span aria-hidden="true">&rarr;</span></a></li>
Expand Down
2 changes: 1 addition & 1 deletion layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{{ end }}
<nav>
<ul class="pager">
<li><a href="{{ .Site.BaseUrl }}/post">All Posts</a></li>
<li><a href="{{ .Site.BaseURL }}/post">All Posts</a></li>
</ul>
</nav>

Expand Down
6 changes: 3 additions & 3 deletions layouts/partials/default_head.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ .Site.BaseUrl }}">{{ .Site.Title }}</a>
<a class="navbar-brand" href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
</div>

<div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav">
<li><a href="{{ .Site.BaseUrl }}/post">All Posts</a></li>
{{ range where .Site.Recent "Type" "page" }}
<li><a href="{{ .Site.BaseURL }}/post">All Posts</a></li>
{{ range where .Site.Pages "Type" "page" }}
<li><a href="{{ .Permalink }}">{{ .Title }}</a></li>
{{ end }}
</ul>
Expand Down
22 changes: 11 additions & 11 deletions layouts/partials/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<!-- Enable responsiveness on mobile devices-->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">

<meta property="og:url" content="{{ .Site.BaseUrl }}">
{{ if eq .Url "/" }}
<meta property="og:url" content="{{ .Site.BaseURL }}">
{{ if eq .URL "/" }}
<!-- Index -->
<meta property="og:type" content="website">
{{ range first 1 .Data.Pages }}
<meta property="og:title" content="{{ .Site.Title }}">
{{ end }}
{{ else if eq .Url "/post/" }}
{{ else if eq .URL "/post/" }}
<!-- Post -->
<meta property="og:title" content="All Entries &middot; {{ .Site.Title }}">
{{ else if in .Url "/tags/" }}
{{ else if in .URL "/tags/" }}
<!-- Category -->
<meta property="og:title" content="{{ .Site.Title }}">
{{ else }}
Expand All @@ -24,11 +24,11 @@
<meta property="og:site_name" content="{{ .Site.Title }}">

<title>
{{ if eq .Url "/" }}
{{ if eq .URL "/" }}
{{ .Site.Title }}
{{ else if eq .Url "/post/" }}
{{ else if eq .URL "/post/" }}
All Entries &middot; {{ .Site.Title }}
{{ else if in .Url "/tags/" }}
{{ else if in .URL "/tags/" }}
{{ .Site.Title }}
{{ else }}
{{ .Title }}
Expand All @@ -40,11 +40,11 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css">
<link rel="stylesheet" href="//yandex.st/highlightjs/8.0/styles/{{ .Site.Params.SyntaxHighlightTheme }}">
<link rel="stylesheet" href="{{ .Site.BaseUrl }}/css/styles.css">
<link rel="stylesheet" href="{{ .Site.BaseUrl }}/css/custom.css">
<link rel="stylesheet" href="{{ .Site.BaseURL }}/css/styles.css">
<link rel="stylesheet" href="{{ .Site.BaseURL }}/css/custom.css">

<!-- Icons -->
<link rel="shortcut icon" href="{{ .Site.BaseUrl }}/assets/favicon.ico">
<link rel="shortcut icon" href="{{ .Site.BaseURL }}/assets/favicon.ico">

<!-- RSS -->
<link rel="alternate" type="application/rss+xml" title="RSS" href="{{ .Site.BaseUrl }}/index.xml">
<link rel="alternate" type="application/rss+xml" title="RSS" href="{{ .Site.BaseURL }}/index.xml">
4 changes: 2 additions & 2 deletions layouts/partials/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<h2 class="panel-title">Recent Posts</h2>
</div>
<div class="list-group">
{{range first 10 .Site.Recent}}
{{range first 10 .Site.Pages}}
<a href="{{.RelPermalink}}" class="list-group-item">{{ .Title }}</a>
{{ end }}
</div>
Expand All @@ -21,7 +21,7 @@ <h2 class="panel-title">Recent Posts</h2>
<h2 class="panel-title">Tags</h2>
</div>
<div class="list-group">
{{ $baseurl := .Site.BaseUrl }}
{{ $baseurl := .Site.BaseURL }}
{{ range $name, $value := .Site.Taxonomies.tags }}
<!--a href="{{ $baseurl }}/tags/{{ $name | urlize }}" style="font-size: {{ add 8 (mul 3 $value.Count) }}px;"-->
<a href="{{ $baseurl }}/tags/{{ $name | urlize }}" class="list-group-item">
Expand Down

0 comments on commit 3f80d92

Please sign in to comment.