Fix #9 and other design updates

layouts/_default/single.html

@@ -4,7 +4,9 @@
         <header>
             <h1>{{ .Title }}</h1>
         </header>
-
+        <div class="content">
+            {{ .Content }}
+        </div>
         <div class="article-info">
             {{ if .Params.date }}
             <div class="article-date">{{ .Params.date.Format "2006-01-02" }}</div>
@@ -27,8 +29,6 @@
             </ul>
             {{ end }}
         </div>
-
-        {{ .Content }}
     </article>
     {{ if .Site.DisqusShortname }}
         {{ template "_internal/disqus.html" . }}

layouts/index.html

@@ -8,6 +8,14 @@
             </h1>
         </header>
 
+        <div class="content">
+            {{ .Summary | safeHTML }}
+        </div>
+<!--         {{ if .Truncated }}
+            <div class="read-more">
+                <a href="{{ .RelPermalink }}">{{ i18n "readMore" | humanize }}</a>
+            </div>
+        {{ end }} -->
         <div class="article-info">
             {{ if .Params.date }}
             <div class="article-date">{{ .Params.date.Format "2006-01-02" }}</div>
@@ -30,15 +38,6 @@
             </ul>
             {{ end }}
         </div>
-        <div class="content">
-            {{ .Summary | safeHTML }}
-        </div>
-        {{ if .Truncated }}
-            <div class="read-more">
-                <a href="{{ .RelPermalink }}">{{ i18n "readMore" | humanize }}</a>
-            </div>
-        {{ end }}
-
     </article>
     {{ end }}
     {{ partial "pagination.html" . }}

layouts/partials/head.html

@@ -12,7 +12,7 @@
 <link rel="icon" type="image/x-icon" href="/favicon.ico">
 <link rel="apple-touch-icon-precomposed" href="/favicon.png">
 
-<link rel="stylesheet" href="{{ "/css/style.css" | relURL }}" />
+<link rel="stylesheet" href="{{ "/css/style.css" | relURL }}?rnd={{ now.Unix }}" />
 
 {{ template "_internal/opengraph.html" . }}
 {{ template "_internal/twitter_cards.html" . }}

layouts/partials/header.html

@@ -1,4 +1,4 @@
-<h1>
+<h1 class="site-header">
     <a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
 </h1>
 <nav>

layouts/partials/pagination.html

@@ -2,22 +2,18 @@
     {{ $toNewPostsMessage := i18n "toNewPosts" | humanize }}
     {{ $toOldPostsMessage := i18n "toOldPosts" | humanize }}
     <div class="pagination">
-        <div class="left">
+        <div class="left pagination-item {{ if not .Paginator.HasPrev }}disabled{{ end }}">
             {{ if .Paginator.HasPrev }}
                 {{ if eq .Paginator.PageNumber 2 }}
-                <a class="pagination-item" href="{{ .Site.BaseURL }}{{ .Site.LanguagePrefix }}">{{ $toNewPostsMessage }}</a>
+                <a href="{{ .Site.BaseURL }}{{ .Site.LanguagePrefix }}">{{ $toNewPostsMessage }}</a>
                 {{ else }}
-                <a class="pagination-item" href="{{ .Paginator.Prev.URL }}">{{ $toNewPostsMessage }}</a>
+                <a href="{{ .Paginator.Prev.URL }}">{{ $toNewPostsMessage }}</a>
                 {{ end }}
-            {{ else }}
-            <span class="pagination-item disabled">{{ $toNewPostsMessage }}</span>
             {{ end }}
-            </div>
-        <div class="right">
+        </div>
+        <div class="right pagination-item {{ if not .Paginator.HasNext }}disabled{{ end }}">
             {{ if .Paginator.HasNext }}
-            <a class="pagination-item" href="{{ .Paginator.Next.URL }}">{{ $toOldPostsMessage }}</a>
-            {{ else }}
-            <span class="pagination-item disabled">{{ $toOldPostsMessage }}</span>
+            <a href="{{ .Paginator.Next.URL }}">{{ $toOldPostsMessage }}</a>
             {{ end }}
         </div>
     </div>

layouts/taxonomy/category.html

@@ -12,19 +12,19 @@
             </h1>
         </header>
 
+        <div class="content">
+            {{ .Summary }}
+        </div>
         <div class="article-info">
             {{ if .Params.date }}
             <div class="article-date">{{ .Params.date.Format "2006-01-02" }}</div>
             {{ end }}
         </div>
-        <div class="content">
-            {{ .Summary }}
-        </div>
-        {{ if .Truncated }}
+      <!--   {{ if .Truncated }}
             <div class="read-more">
                 <a href="{{ .RelPermalink }}">{{ i18n "readMore" | humanize }}</a>
             </div>
-        {{ end }}
+        {{ end }} -->
     </article>
     {{ end }}
 

layouts/taxonomy/tag.html

@@ -11,20 +11,19 @@
                 <a href="{{ .RelPermalink }}">{{ .Title }}</a>
             </h1>
         </header>
-
+        <div class="content">
+            {{ .Summary }}
+        </div>
         <div class="article-info">
             {{ if .Params.date }}
             <div class="article-date">{{ .Params.date.Format "2006-01-02" }}</div>
             {{ end }}
         </div>
-        <div class="content">
-            {{ .Summary }}
-        </div>
-        {{ if .Truncated }}
+<!--         {{ if .Truncated }}
             <div class="read-more">
                 <a href="{{ .RelPermalink }}">{{ i18n "readMore" | humanize }}</a>
             </div>
-        {{ end }}
+        {{ end }} -->
 
     </article>
     {{ end }}