From 68e2014c8489a388fccd32181126c6d93541f48a Mon Sep 17 00:00:00 2001 From: Sandeep Chivukula Date: Thu, 1 Aug 2013 22:39:13 -0700 Subject: [PATCH 1/7] Added Image Credit --- _layouts/post.html | 2 +- assets/css/main.css | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/_layouts/post.html b/_layouts/post.html index f836f500cd..3017e6785a 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -14,7 +14,7 @@
- {% if page.image.feature %}{{ page.title }}{% endif %} + {% if page.image.feature %}{{ page.title }}{% if page.image.credit %}

Photo Credit: {{page.image.credit}}{% endif %}{% endif %}

{% for tag in page.tags %}{% unless forloop.last %} • {% endunless %}{% endfor %} diff --git a/assets/css/main.css b/assets/css/main.css index 5229692f1c..fc83643781 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -627,3 +627,6 @@ span+.entry-title{margin-top:0;} #goog-wm-qt{width:auto;margin-right:10px;} #goog-wm-sb{display:inline-block;padding:8px 20px;background-color:#000000;color:#ffffff;border:2px solid #000000 !important;-webkit-border-radius:20px;-moz-border-radius:20px;border-radius:20px;}#goog-wm-sb:visited{color:#ffffff;} #goog-wm-sb:hover{background-color:#ffffff;color:#000000;} + +.image-credit{font-size:0.8rem; color: #999; margin-top:-40px;text-transform:uppercase} +.image-credit a{font-size:0.8rem; color: #999;} \ No newline at end of file From b4488c82ace23890ff8a6f2a8401dc1f0c3bdb1c Mon Sep 17 00:00:00 2001 From: Sandeep Chivukula Date: Sat, 3 Aug 2013 11:59:49 -0700 Subject: [PATCH 2/7] Wrapped image.creditlink in quotes; Extended Feature Image Credit to Page Layout as well. --- _layouts/page.html | 2 +- _layouts/post.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/page.html b/_layouts/page.html index ee85b10325..93f48a6a84 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -14,7 +14,7 @@
- {% if page.image.feature %}{{ page.title }}{% endif %} + {% if page.image.feature %}{{ page.title }}{% if page.image.credit %}

Photo Credit: {{page.image.credit}}{% endif %}{% endif %}

{% if page.headline %}{{ page.headline }}{% else %}{{ page.title }}

{% endif %} diff --git a/_layouts/post.html b/_layouts/post.html index 3017e6785a..d2bc7a71d0 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -14,7 +14,7 @@
- {% if page.image.feature %}{{ page.title }}{% if page.image.credit %}

Photo Credit: {{page.image.credit}}{% endif %}{% endif %} + {% if page.image.feature %}{{ page.title }}{% if page.image.credit %}

Photo Credit: {{page.image.credit}}{% endif %}{% endif %}

{% for tag in page.tags %}{% unless forloop.last %} • {% endunless %}{% endfor %} From 6c1556eb3649035bbb8252b3ee3e313834cdab56 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 5 Aug 2013 11:59:05 -0400 Subject: [PATCH 3/7] Style feature image credit caption --- assets/css/main.css | 8 ++++---- assets/less/page.less | 2 +- assets/less/typography.less | 26 ++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/assets/css/main.css b/assets/css/main.css index 8349b8f982..8b9e04f644 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -38,6 +38,9 @@ a:hover{color:#000000;} a:focus{outline:thin dotted;color:#000000;} a:hover,a:active{outline:0;} figcaption{padding-top:10px;font-size:14px;font-size:0.875rem;line-height:1.7143;line-height:1.3;color:#3c3c3c;} +.image-credit{margin:0 auto;max-width:440px;padding-top:5px;padding-right:20px;padding-left:20px;text-align:right;font-size:14px;font-size:0.875rem;line-height:1.7143;line-height:1.3;color:#6f6f6f;*zoom:1;}.image-credit:before,.image-credit:after{display:table;content:"";line-height:0;} +.image-credit:after{clear:both;} +@media only screen and (min-width: 48em){.image-credit{max-width:760px;padding-right:60px;padding-left:60px;}}@media only screen and (min-width: 62.5em){.image-credit{max-width:960px;}}.image-credit a{color:#6f6f6f;} .notice{margin-top:1.5em;padding:.5em 1em;text-indent:0;font-size:16px;font-size:1rem;background-color:#f2f2f2;border:1px solid #e6e6e6;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} blockquote{font-family:'volkhov',serif;font-style:italic;font-size:24px;font-size:1.5rem;line-height:1;margin-bottom:24px;margin-bottom:1.5rem;padding-left:20px;border-left:8px solid #000000;} .footnotes{font-size:14px;font-size:0.875rem;line-height:1.7143;font-family:'source-sans-pro',sans-serif;} @@ -594,7 +597,7 @@ body{margin:0;padding:0;width:100%;background-color:#ffffff;border-top:5px solid #main:after{clear:both;} .entry,.hentry{*zoom:1;border-bottom:1px solid #cccccc;border-bottom:1px solid rgba(0, 0, 0, 0.1);}.entry:before,.hentry:before,.entry:after,.hentry:after{display:table;content:"";line-height:0;} .entry:after,.hentry:after{clear:both;} -.entry-feature-image{margin:20px 0 40px;width:100%;}@media only screen and (min-width: 48em){.entry-feature-image{margin-top:-75px;}}@media only screen and (min-width: 62.5em){.entry-feature-image{margin-top:-145px;}} +.entry-feature-image{margin:20px 0 0;width:100%;}@media only screen and (min-width: 48em){.entry-feature-image{margin-top:-75px;}}@media only screen and (min-width: 62.5em){.entry-feature-image{margin-top:-145px;}} .entry-header{max-width:640px;width:100%;margin-right:auto;margin-left:auto;}@media only screen and (min-width: 62.5em){.entry-header{max-width:100%;margin-right:0;margin-left:0;}} .entry-tags{display:block;margin-top:2em;text-transform:uppercase;font-size:16px;font-size:1rem;font-weight:600;}.entry-tags a{color:#222222;} span+.entry-title{margin-top:0;} @@ -630,6 +633,3 @@ span+.entry-title{margin-top:0;} #goog-wm-qt{width:auto;margin-right:10px;} #goog-wm-sb{display:inline-block;padding:8px 20px;background-color:#000000;color:#ffffff;border:2px solid #000000 !important;-webkit-border-radius:20px;-moz-border-radius:20px;border-radius:20px;}#goog-wm-sb:visited{color:#ffffff;} #goog-wm-sb:hover{background-color:#ffffff;color:#000000;} - -.image-credit{font-size:0.8rem; color: #999; margin-top:-40px;text-transform:uppercase} -.image-credit a{font-size:0.8rem; color: #999;} diff --git a/assets/less/page.less b/assets/less/page.less index f509c3febc..9ca6278f98 100644 --- a/assets/less/page.less +++ b/assets/less/page.less @@ -177,7 +177,7 @@ body { border-bottom: 1px solid fade(@black,10); } .entry-feature-image { - margin: 20px 0 40px; + margin: 20px 0 0; width: 100%; @media @medium { margin-top: -75px; diff --git a/assets/less/typography.less b/assets/less/typography.less index 9dd28cb19b..03289101d7 100644 --- a/assets/less/typography.less +++ b/assets/less/typography.less @@ -41,6 +41,32 @@ figcaption { color: lighten(@text-color, 10); } +// Feature Image Caption +// -------------------------------------------------- +.image-credit { + margin: 0 auto; + max-width: 440px; + padding-top: 5px; + padding-right: 20px; + padding-left: 20px; + text-align: right; + .font(14); + line-height: 1.3; + color: lighten(@text-color, 30); + .clearfix(); + @media @medium { + max-width: 760px; + padding-right: 60px; + padding-left: 60px; + } + @media @large { + max-width: 960px; + } + a { + color: lighten(@text-color, 30); + } +} + // Note text // -------------------------------------------------- .notice { From a786e23a62b16fb2c4e1bf8585ac0be706c955fb Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 5 Aug 2013 11:59:26 -0400 Subject: [PATCH 4/7] Make minor formatting changes --- _layouts/page.html | 2 +- _layouts/post.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/page.html b/_layouts/page.html index 93f48a6a84..38044d1156 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -14,7 +14,7 @@
- {% if page.image.feature %}{{ page.title }}{% if page.image.credit %}

Photo Credit: {{page.image.credit}}{% endif %}{% endif %} + {% if page.image.feature %}{{ page.title }}{% if page.image.credit %}

Photo Credit: {{ page.image.credit }}{% endif %}{% endif %}

{% if page.headline %}{{ page.headline }}{% else %}{{ page.title }}

{% endif %} diff --git a/_layouts/post.html b/_layouts/post.html index d2bc7a71d0..5dc2cf4518 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -14,7 +14,7 @@
- {% if page.image.feature %}{{ page.title }}{% if page.image.credit %}

Photo Credit: {{page.image.credit}}{% endif %}{% endif %} + {% if page.image.feature %}{{ page.title }}{% if page.image.credit %}

Photo Credit: {{ page.image.credit }}{% endif %}{% endif %}

{% for tag in page.tags %}{% unless forloop.last %} • {% endunless %}{% endfor %} From be32f2eb028af8f83b1be56a802828ab8da5863a Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 5 Aug 2013 11:59:51 -0400 Subject: [PATCH 5/7] Add feature image credits --- _posts/2011-03-10-sample-post.md | 2 ++ _posts/2012-05-22-readability-post.md | 2 ++ _posts/2013-05-23-readability-feature-post.md | 2 ++ about.md | 2 ++ 4 files changed, 8 insertions(+) diff --git a/_posts/2011-03-10-sample-post.md b/_posts/2011-03-10-sample-post.md index 3d3acaa45a..08d5fe0eac 100644 --- a/_posts/2011-03-10-sample-post.md +++ b/_posts/2011-03-10-sample-post.md @@ -7,6 +7,8 @@ category: articles tags: [sample post] image: feature: so-simple-sample-image-1.jpg + credit: Michael Rose + creditlink: http://mademistakes.com comments: true --- diff --git a/_posts/2012-05-22-readability-post.md b/_posts/2012-05-22-readability-post.md index ade68dad6a..f3036fc835 100644 --- a/_posts/2012-05-22-readability-post.md +++ b/_posts/2012-05-22-readability-post.md @@ -6,6 +6,8 @@ category: articles tags: [sample post, readability, test, intro] image: feature: so-simple-sample-image-2.jpg + credit: Michael Rose + creditlink: http://mademistakes.com comments: true --- diff --git a/_posts/2013-05-23-readability-feature-post.md b/_posts/2013-05-23-readability-feature-post.md index 23c17882fc..fb5b972e64 100644 --- a/_posts/2013-05-23-readability-feature-post.md +++ b/_posts/2013-05-23-readability-feature-post.md @@ -7,6 +7,8 @@ tags: [sample post, readability] modified: 2013-06-30 image: feature: so-simple-sample-image-3.jpg + credit: Michael Rose + creditlink: http://mademistakes.com comments: true --- diff --git a/about.md b/about.md index 2792be4073..6b327adb81 100644 --- a/about.md +++ b/about.md @@ -5,6 +5,8 @@ title: About the Jekyll Theme tags: [Jekyll, theme, simple, minimal, minimalism, responsive] image: feature: so-simple-sample-image-4.jpg + credit: Michael Rose + creditlink: http://mademistakes.com --- Looking for a simple, responsive, theme for your Jekyll powered blog? Well look no further. Here be **So Simple Theme**, the followup to [**Minimal Mistakes**](http://mmistakes.github.io/minimal-mistakes) --- by designer slash illustrator [Michael Rose](http://mademistakes). From 4412636f5d0c5890c13dc46bc23e1b574a82bf28 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 5 Aug 2013 12:12:04 -0400 Subject: [PATCH 6/7] Document image credits (for feature images) --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index c4c2bb636b..6342400e25 100644 --- a/README.md +++ b/README.md @@ -185,6 +185,15 @@ image: thumb: thumbnail-image.jpg #keep it square 200x200 px is good ``` +If you want to apply attribution to a feature image use the following YAML front matter on posts or pages. Image credits appear directly below the feature image with a link back to the original source. + +``` yaml +image: + feature: feature-image-filename.jpg + credit: Michael Rose #name of the person or site you want to credit + creditlink: http://mademistakes.com #url to their site or licensing +``` + #### Categories In the sample `_posts` folder you may have noticed `category: articles` in the front matter. I like keeping all posts grouped in the same folder. If you decide to rename or add categories you will need to modify the permalink in `articles.md` along with the filename (if renaming). From 382e9a3aa76cdfddef7104c48cd9c5951812af85 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 5 Aug 2013 12:14:16 -0400 Subject: [PATCH 7/7] Document image credits (for feature images) --- theme-setup.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/theme-setup.md b/theme-setup.md index 7b12b24e88..c54671b594 100644 --- a/theme-setup.md +++ b/theme-setup.md @@ -108,7 +108,14 @@ image: thumb: thumbnail-image.jpg #keep it square 200x200 px is good {% endhighlight %} -The large texture images used in *Minimal Mistakes* are from [Love Textures](http://lovetextures.com), probably a good idea to swap these out with your own photos... +If you want to apply attribution to a feature image use the following YAML front matter on posts or pages. Image credits appear directly below the feature image with a link back to the original source. + +{% highlight yaml %} +image: + feature: feature-image-filename.jpg + credit: Michael Rose #name of the person or site you want to credit + creditlink: http://mademistakes.com #url to their site or licensing +{% endhighlight %} #### Categories