Merge pull request #25 from zo34/master

Post images now point to post folder rather than base site URL.

4 files changed, 20 insertions, 19 deletions

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index f7e4a17..7c9d6d4 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -9,7 +9,7 @@
     {{ if and (isset .Params "image") .Params.image }}
     <div class="post type-post status-publish format-standard has-post-thumbnail hentry category-design tag-design tag-standard-2 tag-tagalicious tag-travel entry full-without-featured odd excerpt-1">
 
-      <div class='featured-image lazy lazy-bg-image' data-background="{{ .Params.image | absURL }}">
+      <div class='featured-image lazy lazy-bg-image' data-background="{{ .Permalink }}{{ .Params.image }}">
       </div>
       {{ else }}
 
diff --git a/layouts/partials/category.html b/layouts/partials/category.html
index fe737f2..40c994e 100644
--- a/layouts/partials/category.html
+++ b/layouts/partials/category.html
@@ -1,6 +1,6 @@
 <div class="archive-header">
 	<h1>
-		Category: {{ .Title }} 
+		Category: {{ .Title }}
 		{{ if .Site.Params.social.rss }}
 		<a href="{{ .RSSLink }}" data-animate-hover="pulse" class="in-page-rss" target="_blank">
             <i class="fa fa-rss" title="rss"></i>
@@ -13,22 +13,19 @@
 <h1 class="screen-reader-text">Posts</h1>
 <div id="loop-container" class="loop-container">
   {{ range $index, $element := (where .Data.Pages "Section" "post") }}
-	{{ if and (isset .Params "image") .Params.image }}
-	{{ if eq (mod $index 2) 0 }}
-	<div class="post type-post status-publish format-standard has-post-thumbnail hentry category-design tag-memories tag-normal-post tag-standard-2 excerpt zoom full-without-featured odd excerpt">
-		{{ else }}
-		<div class="post type-post status-publish format-standard has-post-thumbnail hentry category-design tag-memories tag-normal-post tag-standard-2 excerpt zoom full-without-featured even excerpt">
-			{{ end }}
+		{{ if and (isset .Params "image") .Params.image }}
+			{{ if eq (mod $index 2) 0 }}
+				<div class="post type-post status-publish format-standard has-post-thumbnail hentry category-design tag-memories tag-normal-post tag-standard-2 excerpt zoom full-without-featured odd excerpt">
 			{{ else }}
-
+				<div class="post type-post status-publish format-standard has-post-thumbnail hentry category-design tag-memories tag-normal-post tag-standard-2 excerpt zoom full-without-featured even excerpt">
+			{{ end }}
+		{{ else }}
 			<div class="post type-post status-publish format-standard hentry category-standard category-travel excerpt zoom full-without-featured odd excerpt">
+		{{ end }}
 
-				{{ end }}
-
-				{{ if and (isset .Params "image") .Params.image }}
-				<a class="featured-image-link" href="{{ .Permalink }}"><div class='featured-image lazy lazy-bg-image'   data-background="{{ .Params.image | absURL }}"></div></a>
-
-				{{ end }}
+		{{ if and (isset .Params "image") .Params.image }}
+			<a class="featured-image-link" href="{{ .Permalink }}"><div class='featured-image lazy lazy-bg-image' data-background="{{ .Permalink }}{{ .Params.image }}"></div></a>
+		{{ end }}
 
 				<div class="excerpt-container">
 					<div class="excerpt-meta">
diff --git a/layouts/partials/portfolio.html b/layouts/partials/portfolio.html
index 511c6f5..42a8650 100644
--- a/layouts/partials/portfolio.html
+++ b/layouts/partials/portfolio.html
@@ -16,7 +16,7 @@
 				{{ end }}
 
 				{{ if and (isset .Params "image") .Params.image }}
-				<a class="featured-image-link" href="{{ .Permalink }}"><div class='featured-image lazy lazy-bg-image'   data-background="{{ .Params.image | absURL }}"></div></a>
+				<a class="featured-image-link" href="{{ .Permalink }}"><div class='featured-image lazy lazy-bg-image'   data-background="{{ .Permalink }}{{ .Params.image }}"></div></a>
 
 				{{ end }}
 				<div class="excerpt-container">
diff --git a/static/css/custom.css b/static/css/custom.css
index 5aafb1a..37e5fd7 100644
--- a/static/css/custom.css
+++ b/static/css/custom.css
@@ -165,7 +165,7 @@ ol {
   padding: 0;
   margin: 1.5em;
 }
-ul ul, ul ol, 
+ul ul, ul ol,
 ol ul,
 ol ol {
   margin: 0 1.5em;
@@ -232,7 +232,7 @@ th {
 .alignleft,
 .aligncenter,
 .alignnone,
-.size-auto, 
+.size-auto,
 .size-full,
 .size-large,
 .size-medium,
@@ -284,6 +284,11 @@ img {
   max-width: 100%;
 }
 
+article img {
+  max-height: 100%;
+  max-width: 100%;
+}
+
 .wp-caption-text {
   margin: 0;
   color: #8c8c8c;
@@ -2724,4 +2729,3 @@ li.pingback:first-child {
     width: 500px !important;
   }
 }
-