Merge branch 'dev'v0.6.3

5 files changed, 43 insertions, 21 deletions

diff --git a/layouts/_default/li.html b/layouts/_default/li.html
index 8e47819..b453b13 100644
--- a/layouts/_default/li.html
+++ b/layouts/_default/li.html
@@ -10,20 +10,25 @@
       </div>
     </div>
   </header>
-  <div>
-    {{ if (isset .Params "summary") }}
-      {{ markdownify .Params.Summary }}
-    {{ else }}
-      {{ .Summary }}
-    {{ end }}
-  </div>
-  <footer>
-    <div class="read-more-container">
-      <a class="btn btn-primary" href="{{ .Permalink }}">
-        <div>
+
+  {{ if (isset .Params "summary") }}
+    <div class="li-content">
+      <div class="summary-container">
+        <p>{{ markdownify .Params.Summary }}</p>
+        <a class="btn btn-primary" href="{{ .Permalink }}">
           {{ i18n "readMore" }} <span aria-hidden="true">&rarr;</span>
-        </div>
-      </a>
+        </a>
+      </div>
+      {{ if (isset .Params "images") }}
+        <a href="{{ .Permalink }}">
+          <img class="embedded-image" src="{{ index .Params.images 0 | absLangURL }}"/>
+        </a>
+      {{ end }}
+    </div>
+  {{ else }}
+    <div>
+        NOT FOUND
+      {{ .Summary }}
     </div>
-  </footer>
+  {{ end }}
 </article>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 15d8107..910d6b6 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -21,9 +21,11 @@
     {{ end }}
     <div class="pull-right">
       {{ range .Params.tags }}
-        {{ with $.Site.GetPage "taxonomy" ( print "/tags/" ( . | urlize ) ) }}
-          <span class="post-tag small"><a href="{{ .Permalink }}">#{{ .Name }}</a></span>
-        {{ end }}
+        <span class="post-tag small">
+          <a href="{{ ($.Site.GetPage "taxonomy" ( print "/tags/" ( . ) ) ).Permalink }}">
+            #{{ . }}
+          </a>
+        </span>
       {{ end }}
     </div>
   </div>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index ff54542..086cf40 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -11,7 +11,7 @@
   <meta property="og:url" content="{{ .Permalink }}" />
   {{ with .Params.images }}
     {{ range first 5 . }}
-      <meta property="og:image" content="{{ . }}" />
+      <meta property="og:image" content="{{ . | absLangURL }}" />
     {{ end }}
   {{ end }}
   {{ if .IsPage }}
diff --git a/layouts/shortcodes/imgScale.html b/layouts/shortcodes/imgScale.html
index fb7816e..9684c5a 100644
--- a/layouts/shortcodes/imgScale.html
+++ b/layouts/shortcodes/imgScale.html
@@ -23,7 +23,7 @@
 	<figcaption>
 		<h4>
 			<center>
-				{{ $subtitle }} ({{ printf "%.*f" 2 (div (len $originalImage.Content) 1000000.0) }}MB)
+				{{ markdownify $subtitle }} ({{ printf "%.*f" 2 (div (len $originalImage.Content) 1000000.0) }}MB)
 			</center>
 		</h4>
 	</figcaption>
diff --git a/static/css/main.css b/static/css/main.css
index e7debbe..29e846f 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -7,6 +7,7 @@ main {
 
 .global-header {
     background-size: cover;
+    background-position-x: center;
     min-height: 350px;
 }
 
@@ -139,6 +140,7 @@ main {
 }
 
 .post-tag a {
+    margin-left: 10px;
     padding: 0 10px;
     border-radius: 12px;
     text-decoration: none;
@@ -188,8 +190,21 @@ main {
     margin-bottom: 6px;
 }
 
-.read-more-container {
-    margin-top: 10px;
+.li-content {
+    display: flex;
+}
+
+.li-content img {
+    width: 250px;
+    margin-left: 20px;
+}
+
+.summary-container {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: flex-start;
 }
 
 /* Tag list */