Correct spacing and remove extraneous </div>

Removed extraneous </div> in layouts\_default\list.html
This commit is contained in:
Michael Romero 2017-03-06 13:36:42 -08:00
parent 6670f5efb7
commit 40b3eb3691
13 changed files with 158 additions and 165 deletions

View File

@ -7,17 +7,14 @@
{{ partial "nav.html" . }} {{ partial "nav.html" . }}
<div role="main" class="container main-content"> <div role="main" class="container main-content">
<div class="text-center">
<div class="text-center"> <h1>Whoops, this page doesn't exist.</h1>
<h1>Whoops, this page doesn't exist.</h1> <h1>Move along. (404 error)</h1>
<h1>Move along. (404 error)</h1> <br/>
<br/> <img src="{{ .Site.BaseURL }}/img/404-southpark.jpg" />
</div>
<img src="{{ .Site.BaseURL }}/img/404-southpark.jpg" /> </div>
</div>
</div>
{{ partial "footer.html" . }} {{ partial "footer.html" . }}

View File

@ -22,42 +22,41 @@
</header> </header>
<div class="container" role="main"> <div class="container" role="main">
{{ $pag := .Paginate (where .Data.Pages "Type" "post") }} {{ $pag := .Paginate (where .Data.Pages "Type" "post") }}
{{ range $pag.Pages }} {{ range $pag.Pages }}
<article class="post-preview"> <article class="post-preview">
<a href="{{ .Permalink }}"> <a href="{{ .Permalink }}">
<h2 class="post-title">{{ .Title }}</h2> <h2 class="post-title">{{ .Title }}</h2>
{{ if .Params.subtitle }} {{ if .Params.subtitle }}
<h3 class="post-subtitle"> <h3 class="post-subtitle">
{{ .Params.subtitle }} {{ .Params.subtitle }}
</h3> </h3>
{{ end }} {{ end }}
</a> </a>
<p class="post-meta"> <p class="post-meta">
Posted on {{ .Date.Format "January 2, 2006" }} Posted on {{ .Date.Format "January 2, 2006" }}
</p> </p>
<div class="post-entry"> <div class="post-entry">
{{ if .Truncated }} {{ if .Truncated }}
{{ .Summary }} {{ .Summary }}
<a href="{{ .Permalink }}" class="post-read-more">[Read&nbsp;More]</a> <a href="{{ .Permalink }}" class="post-read-more">[Read&nbsp;More]</a>
{{ else }} {{ else }}
{{ .Content }} {{ .Content }}
{{ end }}
</div>
{{ if .Params.tags }}
<span class="post-meta">
{{ range .Params.tags }}
#<a href="/tags/{{ . | urlize }}">{{ . }}</a>&nbsp;
{{ end }}
</span>
{{ end }}
</article>
{{ end }} {{ end }}
</div> </div>
{{ if .Params.tags }}
<span class="post-meta">
{{ range .Params.tags }}
#<a href="/tags/{{ . | urlize }}">{{ . }}</a>&nbsp;
{{ end }}
</span>
{{ end }}
</article>
{{ end }}
</div> </div>
{{ partial "footer.html" . }} {{ partial "footer.html" . }}

View File

@ -32,54 +32,54 @@
<div class="posts-list"> <div class="posts-list">
{{ $pag := .Paginate (where .Data.Pages "Type" "post") }} {{ $pag := .Paginate (where .Data.Pages "Type" "post") }}
{{ range $pag.Pages }} {{ range $pag.Pages }}
<article class="post-preview"> <article class="post-preview">
<a href="{{ .Permalink }}"> <a href="{{ .Permalink }}">
<h2 class="post-title">{{ .Title }}</h2> <h2 class="post-title">{{ .Title }}</h2>
{{ if .Params.subtitle }} {{ if .Params.subtitle }}
<h3 class="post-subtitle"> <h3 class="post-subtitle">
{{ .Params.subtitle }} {{ .Params.subtitle }}
</h3> </h3>
{{ end }} {{ end }}
</a> </a>
<p class="post-meta"> <p class="post-meta">
Posted on {{ .Date.Format "January 2, 2006" }} Posted on {{ .Date.Format "January 2, 2006" }}
</p> </p>
<div class="post-entry"> <div class="post-entry">
{{ if .Truncated }} {{ if .Truncated }}
{{ .Summary }} {{ .Summary }}
<a href="{{ .Permalink }}" class="post-read-more">[Read&nbsp;More]</a> <a href="{{ .Permalink }}" class="post-read-more">[Read&nbsp;More]</a>
{{ else }} {{ else }}
{{ .Content }} {{ .Content }}
{{ end }} {{ end }}
</div> </div>
{{ if .Params.tags }} {{ if .Params.tags }}
<span class="post-meta"> <span class="post-meta">
{{ range .Params.tags }} {{ range .Params.tags }}
#<a href="/tags/{{ . | urlize }}">{{ . }}</a>&nbsp; #<a href="/tags/{{ . | urlize }}">{{ . }}</a>&nbsp;
{{ end }} {{ end }}
</span> </span>
{{ end }} {{ end }}
</article> </article>
{{ end }} {{ end }}
</div> </div>
{{ if or (.Paginator.HasPrev) (.Paginator.HasNext) }} {{ if or (.Paginator.HasPrev) (.Paginator.HasNext) }}
<ul class="pager main-pager"> <ul class="pager main-pager">
{{ if .Paginator.HasPrev }} {{ if .Paginator.HasPrev }}
<li class="previous"> <li class="previous">
<a href="{{ .URL }}page/{{ .Paginator.Prev.PageNumber }}">&larr; Newer Posts</a> <a href="{{ .URL }}page/{{ .Paginator.Prev.PageNumber }}">&larr; Newer Posts</a>
</li> </li>
{{ end }} {{ end }}
{{ if .Paginator.HasNext }} {{ if .Paginator.HasNext }}
<li class="next"> <li class="next">
<a href="{{ .URL }}page/{{ .Paginator.Next.PageNumber }}">Older Posts &rarr;</a> <a href="{{ .URL }}page/{{ .Paginator.Next.PageNumber }}">Older Posts &rarr;</a>
</li> </li>
{{ end }} {{ end }}
</ul> </ul>
{{ end }} {{ end }}
</div> </div>
</div> </div>

View File

@ -1,5 +1,5 @@
{{ if .Site.DisqusShortname }} {{ if .Site.DisqusShortname }}
<div class="comments"> <div class="comments">
{{ template "_internal/disqus.html" . }} {{ template "_internal/disqus.html" . }}
</div> </div>
{{ end }} {{ end }}

View File

@ -43,7 +43,7 @@
</a> </a>
</li> </li>
{{ end }} {{ end }}
{{ if .Site.Author.twitter }} {{ if .Site.Author.twitter }}
<li> <li>
<a href="https://twitter.com/{{ .Site.Author.twitter }}" title="Twitter"> <a href="https://twitter.com/{{ .Site.Author.twitter }}" title="Twitter">
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
@ -63,7 +63,7 @@
</a> </a>
</li> </li>
{{ end }} {{ end }}
{{ if .Site.Author.linkedin }} {{ if .Site.Author.linkedin }}
<li> <li>
<a href="https://linkedin.com/in/{{ .Site.Author.linkedin }}" title="LinkedIn"> <a href="https://linkedin.com/in/{{ .Site.Author.linkedin }}" title="LinkedIn">
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
@ -83,7 +83,7 @@
</a> </a>
</li> </li>
{{ end }} {{ end }}
{{ if .Site.Author.stackoverflow }} {{ if .Site.Author.stackoverflow }}
<li> <li>
<a href="https://stackoverflow.com/{{ .Site.Author.stackoverflow }}" title="StackOverflow"> <a href="https://stackoverflow.com/{{ .Site.Author.stackoverflow }}" title="StackOverflow">
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
@ -164,31 +164,31 @@
</li> </li>
{{ end }} {{ end }}
{{ if .Site.Params.rss }} {{ if .Site.Params.rss }}
<li> <li>
<a href="{{ .Site.BaseURL}}index.xml" title="RSS"> <a href="{{ .Site.BaseURL}}index.xml" title="RSS">
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-rss fa-stack-1x fa-inverse"></i> <i class="fa fa-rss fa-stack-1x fa-inverse"></i>
</span> </span>
</a> </a>
</li> </li>
{{ end }} {{ end }}
</ul> </ul>
<p class="credits copyright text-muted"> <p class="credits copyright text-muted">
{{ .Site.Author.name }} {{ .Site.Author.name }}
&nbsp;&bull;&nbsp; &nbsp;&bull;&nbsp;
{{ .Site.LastChange.Format "2006" }} {{ .Site.LastChange.Format "2006" }}
{{ if .Site.Title }} {{ if .Site.Title }}
&nbsp;&bull;&nbsp; &nbsp;&bull;&nbsp;
<a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a> <a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
{{ end }} {{ end }}
</p> </p>
<!-- Please don't remove this, keep my open source work credited :) --> <!-- Please don't remove this, keep my open source work credited :) -->
<p class="credits theme-by text-muted"> <p class="credits theme-by text-muted">
<a href="http://gohugo.io">Hugo v{{ .Hugo.Version }}</a> powered &nbsp;&bull;&nbsp; Theme by <a href="http://deanattali.com/beautiful-jekyll/">Beautiful Jekyll</a> adapted to <a href="https://github.com/halogenica/beautifulhugo">Beautiful Hugo</a> <a href="http://gohugo.io">Hugo v{{ .Hugo.Version }}</a> powered &nbsp;&bull;&nbsp; Theme by <a href="http://deanattali.com/beautiful-jekyll/">Beautiful Jekyll</a> adapted to <a href="https://github.com/halogenica/beautifulhugo">Beautiful Hugo</a>
{{ with .Site.Params.commit }}&nbsp;&bull;&nbsp;[<a href="{{.}}{{ getenv "GIT_COMMIT_SHA" }}">{{ getenv "GIT_COMMIT_SHA_SHORT" }}</a>]{{ end }} {{ with .Site.Params.commit }}&nbsp;&bull;&nbsp;[<a href="{{.}}{{ getenv "GIT_COMMIT_SHA" }}">{{ getenv "GIT_COMMIT_SHA_SHORT" }}</a>]{{ end }}
</p> </p>
</div> </div>
</div> </div>
</div> </div>

View File

@ -3,18 +3,18 @@
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1"> <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<div class="{{ .Type }}-heading"> <div class="{{ .Type }}-heading">
<h1>{{ if .Title }}{{ .Title }}{{ else }}<br/>{{ end }}</h1> <h1>{{ if .Title }}{{ .Title }}{{ else }}<br/>{{ end }}</h1>
{{ if .Params.subtitle }} {{ if .Params.subtitle }}
{{ if eq .Type "page" }} {{ if eq .Type "page" }}
<hr class="small"> <hr class="small">
<span class="{{ .Type }}-subheading">{{ .Params.subtitle }}</span> <span class="{{ .Type }}-subheading">{{ .Params.subtitle }}</span>
{{ else }} {{ else }}
<h2 class="{{ .Type }}-subheading">{{ .Params.subtitle }}</h2> <h2 class="{{ .Type }}-subheading">{{ .Params.subtitle }}</h2>
{{ end }} {{ end }}
{{ end }} {{ end }}
{{ if eq .Type "post" }} {{ if eq .Type "post" }}
<span class="post-meta">Posted on {{ .Date.Format "January 2, 2006" }}</span> <span class="post-meta">Posted on {{ .Date.Format "January 2, 2006" }}</span>
{{ end }} {{ end }}
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,21 +1,18 @@
<!-- TODO this file has become a mess, refactor it -->
{{ if or .Params.bigimg .Title }} {{ if or .Params.bigimg .Title }}
{{ if .Params.bigimg }} {{ if .Params.bigimg }}
<div id="header-big-imgs" data-num-img=1 data-img-src-1="{{.Params.bigimg}}"></div> <div id="header-big-imgs" data-num-img=1 data-img-src-1="{{.Params.bigimg}}"></div>
{{ end }} {{ end }}
<header class="header-section {{ if .Params.bigimg }}has-img{{ end }}"> <header class="header-section {{ if .Params.bigimg }}has-img{{ end }}">
{{ if .Params.bigimg }} {{ if .Params.bigimg }}
<div class="big-img intro-header"> <div class="big-img intro-header">
{{ partial "header.html" . }}
<span class='img-desc'></span>
</div>
{{ end }}
<div class="intro-header no-img">
{{ partial "header.html" . }} {{ partial "header.html" . }}
<span class='img-desc'></span>
</div> </div>
{{ end }}
<div class="intro-header no-img">
{{ partial "header.html" . }}
</div>
</header> </header>
{{ else }} {{ else }}
<div class="intro-header"></div> <div class="intro-header"></div>

View File

@ -12,34 +12,34 @@
<div class="collapse navbar-collapse" id="main-navbar"> <div class="collapse navbar-collapse" id="main-navbar">
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
{{ range .Site.Menus.main.ByWeight }} {{ range .Site.Menus.main.ByWeight }}
{{ if .HasChildren }} {{ if .HasChildren }}
<li class="navlinks-container"> <li class="navlinks-container">
<a class="navlinks-parent" href="javascript:void(0)">{{ .Name }}</a> <a class="navlinks-parent" href="javascript:void(0)">{{ .Name }}</a>
<div class="navlinks-children"> <div class="navlinks-children">
{{ range .Children }} {{ range .Children }}
<a href="{{ .URL }}">{{ .Name }}</a> <a href="{{ .URL }}">{{ .Name }}</a>
{{ end }} {{ end }}
</div> </div>
</li> </li>
{{ else }} {{ else }}
<li> <li>
<a title="{{ .Name }}" href="{{ .URL }}">{{ .Name }}</a> <a title="{{ .Name }}" href="{{ .URL }}">{{ .Name }}</a>
</li> </li>
{{ end }} {{ end }}
{{ end }} {{ end }}
</ul> </ul>
</div> </div>
<div class="avatar-container"> <div class="avatar-container">
<div class="avatar-img-border"> <div class="avatar-img-border">
{{ if isset .Site.Params "logo" }} {{ if isset .Site.Params "logo" }}
<a title="{{ .Site.Title }}" href="{{ .Site.BaseURL }}"> <a title="{{ .Site.Title }}" href="{{ .Site.BaseURL }}">
<img class="avatar-img" src="{{ .Site.BaseURL }}/{{ .Site.Params.logo }}" alt="{{ .Site.Title }}" /> <img class="avatar-img" src="{{ .Site.BaseURL }}/{{ .Site.Params.logo }}" alt="{{ .Site.Title }}" />
</a> </a>
{{ end }} {{ end }}
</div> </div>
</div> </div>
</div> </div>
</nav> </nav>

View File

@ -4,7 +4,7 @@
{{ .Content }} {{ .Content }}
{{ if .Site.DisqusShortname }} {{ if .Site.DisqusShortname }}
<div class="disqus-comments"> <div class="disqus-comments">
{{ template "_internal/disqus.html" . }} {{ template "_internal/disqus.html" . }}
</div> </div>
{{ end }} {{ end }}
</div> </div>

View File

@ -2,26 +2,26 @@
<div class="row"> <div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1"> <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<article role="main" class="blog-post"> <article role="main" class="blog-post">
{{ .Content }} {{ .Content }}
</article> </article>
<ul class="pager blog-pager"> <ul class="pager blog-pager">
{{ if .PrevInSection }} {{ if .PrevInSection }}
<li class="previous"> <li class="previous">
<a href="{{ .PrevInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .PrevInSection.Title }}">&larr; Previous Post</a> <a href="{{ .PrevInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .PrevInSection.Title }}">&larr; Previous Post</a>
</li> </li>
{{ end }} {{ end }}
{{ if .NextInSection }} {{ if .NextInSection }}
<li class="next"> <li class="next">
<a href="{{ .NextInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .NextInSection.Title }}">Next Post &rarr;</a> <a href="{{ .NextInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .NextInSection.Title }}">Next Post &rarr;</a>
</li> </li>
{{ end }} {{ end }}
</ul> </ul>
{{ if .Site.DisqusShortname }} {{ if .Site.DisqusShortname }}
<div class="disqus-comments"> <div class="disqus-comments">
{{ template "_internal/disqus.html" . }} {{ template "_internal/disqus.html" . }}
</div> </div>
{{ end }} {{ end }}
</div> </div>