From 254b40b8a8fd45c1881e571ad7ece8ff3728fda4 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 10 Oct 2016 11:48:30 -0400 Subject: [PATCH] Remove `prepend: "/"` from includes and add to image path's instead --- _includes/archive-single.html | 2 +- _includes/author-profile.html | 2 +- _includes/feature_row | 4 +- _includes/gallery | 6 +- _includes/page__hero.html | 4 +- _includes/seo.html | 16 ++--- _includes/sidebar.html | 2 +- example/_config.yml | 4 +- example/_data/authors.yml | 4 +- example/_pages/splash-page.md | 12 ++-- example/_portfolio/foo-bar-website.md | 10 +-- .../_posts/2010-08-05-post-image-standard.md | 2 +- example/_posts/2010-09-09-post-gallery.md | 68 +++++++++---------- .../2012-03-15-layout-author-override.md | 4 +- ...12-03-15-layout-header-image-horizontal.md | 2 +- ...15-layout-header-image-text-readability.md | 2 +- ...2012-03-15-layout-header-image-vertical.md | 2 +- .../2012-03-15-layout-header-overlay-image.md | 6 +- .../_posts/2013-05-22-markup-more-images.md | 4 +- 19 files changed, 78 insertions(+), 78 deletions(-) diff --git a/_includes/archive-single.html b/_includes/archive-single.html index 141704d..93755e3 100644 --- a/_includes/archive-single.html +++ b/_includes/archive-single.html @@ -18,7 +18,7 @@ {% if teaser contains "://" %} "{{ teaser }}" {% else %} - "{{ teaser | prepend: "/" | absolute_url }}" + "{{ teaser | absolute_url }}" {% endif %} alt=""> diff --git a/_includes/author-profile.html b/_includes/author-profile.html index db9d4fe..97261f3 100644 --- a/_includes/author-profile.html +++ b/_includes/author-profile.html @@ -9,7 +9,7 @@ {% if author.avatar contains "://" %} {{ author.name }} {% else %} - {{ author.name }} + {{ author.name }} {% endif %} {% endif %} diff --git a/_includes/feature_row b/_includes/feature_row index 75b6cb8..d5b7e23 100644 --- a/_includes/feature_row +++ b/_includes/feature_row @@ -11,7 +11,7 @@ {% if f.url contains "://" %} {% capture f_url %}{{ f.url }}{% endcapture %} {% else %} - {% capture f_url %}{{ f.url | prepend: "/" | absolute_url }}{% endcapture %} + {% capture f_url %}{{ f.url | absolute_url }}{% endcapture %} {% endif %}
@@ -22,7 +22,7 @@ {% if f.image_path contains "://" %} "{{ f.image_path }}" {% else %} - "{{ f.image_path | prepend: "/" | absolute_url }}" + "{{ f.image_path | absolute_url }}" {% endif %} alt="{% if f.alt %}{{ f.alt }}{% endif %}">
diff --git a/_includes/gallery b/_includes/gallery index cb5c778..5983239 100644 --- a/_includes/gallery +++ b/_includes/gallery @@ -19,7 +19,7 @@ {% if img.url contains "://" %} "{{ img.url }}" {% else %} - "{{ img.url | prepend: "/" | absolute_url }}" + "{{ img.url | absolute_url }}" {% endif %} {% if img.title %}title="{{ img.title }}"{% endif %} > @@ -27,7 +27,7 @@ {% if img.image_path contains "://" %} "{{ img.image_path }}" {% else %} - "{{ img.image_path | prepend: "/" | absolute_url }}" + "{{ img.image_path | absolute_url }}" {% endif %} alt="{% if img.alt %}{{ img.alt }}{% endif %}"> @@ -36,7 +36,7 @@ {% if img.image_path contains "://" %} "{{ img.image_path }}" {% else %} - "{{ img.image_path | prepend: "/" | absolute_url }}" + "{{ img.image_path | absolute_url }}" {% endif %} alt="{% if img.alt %}{{ img.alt }}{% endif %}"> {% endif %} diff --git a/_includes/page__hero.html b/_includes/page__hero.html index 32f0b79..ecc8d80 100644 --- a/_includes/page__hero.html +++ b/_includes/page__hero.html @@ -1,7 +1,7 @@ {% if page.header.image contains "://" %} {% capture img_path %}{{ page.header.image }}{% endcapture %} {% else %} - {% capture img_path %}{{ page.header.image | prepend: "/" | absolute_url }}{% endcapture %} + {% capture img_path %}{{ page.header.image | absolute_url }}{% endcapture %} {% endif %} {% if page.header.cta_url contains "://" %} @@ -13,7 +13,7 @@ {% if page.header.overlay_image contains "://" %} {% capture overlay_img_path %}{{ page.header.overlay_image }}{% endcapture %} {% elsif page.header.overlay_image %} - {% capture overlay_img_path %}{{ page.header.overlay_image | prepend: "/" | absolute_url }}{% endcapture %} + {% capture overlay_img_path %}{{ page.header.overlay_image | absolute_url }}{% endcapture %} {% endif %} {% if page.header.overlay_filter contains "rgba" %} diff --git a/_includes/seo.html b/_includes/seo.html index a2a293c..9279e1a 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -58,13 +58,13 @@ {% if page.header.image %} - + {% else %} {% if page.header.teaser %} - + {% elsif site.og_image %} - + {% endif %} {% endif %} @@ -84,13 +84,13 @@ {% endif %} {% if page.header.image %} - + {% elsif page.header.overlay_image %} - + {% elsif page.header.teaser %} - + {% elsif site.og_image %} - + {% endif %} {% if page.date %} @@ -111,7 +111,7 @@ "@context": "http://schema.org", "@type": "Organization", "url": {{ seo_url | jsonify }}, - "logo": {{ site.og_image | prepend: "/" | absolute_url | jsonify }} + "logo": {{ site.og_image | absolute_url | jsonify }} } {% endif %} diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 37bb439..d2661c3 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -8,7 +8,7 @@ {% if s.image contains "://" %} "{{ s.image }}" {% else %} - "{{ s.image | prepend: "/" | absolute_url }}" + "{{ s.image | absolute_url }}" {% endif %} alt="{% if s.image_alt %}{{ s.image_alt }}{% endif %}"> {% endif %} diff --git a/example/_config.yml b/example/_config.yml index 868abf8..4bd8a91 100644 --- a/example/_config.yml +++ b/example/_config.yml @@ -16,7 +16,7 @@ description : "An amazing website." url : # the base hostname & protocol for your site e.g. "https://mmistakes.github.io" baseurl : # the subpath of your site, e.g. "/blog" repository : # GitHub username/repo-name e.g. "mmistakes/minimal-mistakes" -teaser : # filename of teaser fallback teaser image placed in /images/, .e.g. "500x300.png" +teaser : # path of fallback teaser image, e.g. "/assets/images/500x300.png" # breadcrumbs : false # true, false (default) words_per_minute : 200 comments: @@ -80,7 +80,7 @@ analytics: # Site Author author: name : "Your Name" - avatar : "assets/images/bio-photo.jpg" + avatar : "/assets/images/bio-photo.jpg" bio : "I am an amazing person." location : "Somewhere" email : diff --git a/example/_data/authors.yml b/example/_data/authors.yml index 0ea8a64..d1ba8c6 100755 --- a/example/_data/authors.yml +++ b/example/_data/authors.yml @@ -5,7 +5,7 @@ Billy Rick: uri : "http://thewhip.com" email : "billy@rick.com" bio : "What do you want, jewels? I am a very extravagant man." - avatar : "bio-photo-2.jpg" + avatar : "/assets/images/bio-photo-2.jpg" twitter : "extravagantman" google_plus : "BillyRick" @@ -13,6 +13,6 @@ Cornelius Fiddlebone: name : "Cornelius Fiddlebone" email : "cornelius@thewhip.com" bio : "I ordered what?" - avatar : "bio-photo.jpg" + avatar : "/assets/images/bio-photo.jpg" twitter : "rhymeswithsackit" google_plus : "CorneliusFiddlebone" \ No newline at end of file diff --git a/example/_pages/splash-page.md b/example/_pages/splash-page.md index 388ce4a..5993367 100755 --- a/example/_pages/splash-page.md +++ b/example/_pages/splash-page.md @@ -6,7 +6,7 @@ date: 2016-03-23T11:48:41-04:00 header: overlay_color: "#000" overlay_filter: "0.5" - overlay_image: assets/images/unsplash-image-1.jpg + overlay_image: /assets/images/unsplash-image-1.jpg cta_label: "Download" cta_url: "https://github.com/mmistakes/minimal-mistakes/" caption: "Photo credit: [**Unsplash**](https://unsplash.com)" @@ -18,18 +18,18 @@ feature_row: alt: "placeholder image 1" title: "Placeholder 1" excerpt: "This is some sample content that goes here with **Markdown** formatting." - - image_path: assets/images/unsplash-gallery-image-2-th.jpg + - image_path: /assets/images/unsplash-gallery-image-2-th.jpg alt: "placeholder image 2" title: "Placeholder 2" excerpt: "This is some sample content that goes here with **Markdown** formatting." url: "#test-link" btn_label: "Read More" btn_class: "btn--inverse" - - image_path: assets/images/unsplash-gallery-image-3-th.jpg + - image_path: /assets/images/unsplash-gallery-image-3-th.jpg title: "Placeholder 3" excerpt: "This is some sample content that goes here with **Markdown** formatting." feature_row2: - - image_path: assets/images/unsplash-gallery-image-2-th.jpg + - image_path: /assets/images/unsplash-gallery-image-2-th.jpg alt: "placeholder image 2" title: "Placeholder Image Left Aligned" excerpt: 'This is some sample content that goes here with **Markdown** formatting. Left aligned with `type="left"`' @@ -37,7 +37,7 @@ feature_row2: btn_label: "Read More" btn_class: "btn--inverse" feature_row3: - - image_path: assets/images/unsplash-gallery-image-2-th.jpg + - image_path: /assets/images/unsplash-gallery-image-2-th.jpg alt: "placeholder image 2" title: "Placeholder Image Right Aligned" excerpt: 'This is some sample content that goes here with **Markdown** formatting. Right aligned with `type="right"`' @@ -45,7 +45,7 @@ feature_row3: btn_label: "Read More" btn_class: "btn--inverse" feature_row4: - - image_path: assets/images/unsplash-gallery-image-2-th.jpg + - image_path: /assets/images/unsplash-gallery-image-2-th.jpg alt: "placeholder image 2" title: "Placeholder Image Center Aligned" excerpt: 'This is some sample content that goes here with **Markdown** formatting. Centered with `type="center"`' diff --git a/example/_portfolio/foo-bar-website.md b/example/_portfolio/foo-bar-website.md index ea815c4..2002bd5 100755 --- a/example/_portfolio/foo-bar-website.md +++ b/example/_portfolio/foo-bar-website.md @@ -2,8 +2,8 @@ title: "Foo Bar Identity" excerpt: "Foo Bar design system including logo mark, website design, and branding applications." header: - image: assets/images/foo-bar-identity.jpg - teaser: assets/images/foo-bar-identity-th.jpg + image: /assets/images/foo-bar-identity.jpg + teaser: /assets/images/foo-bar-identity-th.jpg sidebar: - title: "Role" image: http://placehold.it/350x250 @@ -12,13 +12,13 @@ sidebar: - title: "Responsibilities" text: "Reuters try PR stupid commenters should isn't a business model" gallery: - - url: assets/images/unsplash-gallery-image-1.jpg + - url: /assets/images/unsplash-gallery-image-1.jpg image_path: assets/images/unsplash-gallery-image-1-th.jpg alt: "placeholder image 1" - - url: assets/images/unsplash-gallery-image-2.jpg + - url: /assets/images/unsplash-gallery-image-2.jpg image_path: assets/images/unsplash-gallery-image-2-th.jpg alt: "placeholder image 2" - - url: assets/images/unsplash-gallery-image-3.jpg + - url: /assets/images/unsplash-gallery-image-3.jpg image_path: assets/images/unsplash-gallery-image-3-th.jpg alt: "placeholder image 3" --- diff --git a/example/_posts/2010-08-05-post-image-standard.md b/example/_posts/2010-08-05-post-image-standard.md index 5696b9c..097e235 100755 --- a/example/_posts/2010-08-05-post-image-standard.md +++ b/example/_posts/2010-08-05-post-image-standard.md @@ -7,7 +7,7 @@ tags: - Post Formats --- -The preferred way of using images is placing them in the `assets/images/` directory and referencing them with an absolute path. Prepending the filename with `{% raw %}{{ site.url }}{{ site.baseurl }}/assets/images/{% endraw %}` will make sure your images display properly in feeds and such. +The preferred way of using images is placing them in the `/assets/images/` directory and referencing them with an absolute path. Prepending the filename with `{% raw %}{{ site.url }}{{ site.baseurl }}/assets/images/{% endraw %}` will make sure your images display properly in feeds and such. Standard image with no width modifier classes applied. diff --git a/example/_posts/2010-09-09-post-gallery.md b/example/_posts/2010-09-09-post-gallery.md index 7e285be..f7a9e91 100755 --- a/example/_posts/2010-09-09-post-gallery.md +++ b/example/_posts/2010-09-09-post-gallery.md @@ -7,52 +7,52 @@ tags: - Post Formats - tiled gallery: - - url: assets/images/unsplash-gallery-image-1.jpg - image_path: assets/images/unsplash-gallery-image-1-th.jpg + - url: /assets/images/unsplash-gallery-image-1.jpg + image_path: /assets/images/unsplash-gallery-image-1-th.jpg alt: "placeholder image 1" title: "Image 1 title caption" - - url: assets/images/unsplash-gallery-image-2.jpg - image_path: assets/images/unsplash-gallery-image-2-th.jpg + - url: /assets/images/unsplash-gallery-image-2.jpg + image_path: /assets/images/unsplash-gallery-image-2-th.jpg alt: "placeholder image 2" title: "Image 2 title caption" - - url: assets/images/unsplash-gallery-image-3.jpg - image_path: assets/images/unsplash-gallery-image-3-th.jpg + - url: /assets/images/unsplash-gallery-image-3.jpg + image_path: /assets/images/unsplash-gallery-image-3-th.jpg alt: "placeholder image 3" title: "Image 3 title caption" - - url: assets/images/unsplash-gallery-image-1.jpg - image_path: assets/images/unsplash-gallery-image-1-th.jpg + - url: /assets/images/unsplash-gallery-image-1.jpg + image_path: /assets/images/unsplash-gallery-image-1-th.jpg alt: "placeholder image 4" title: "Image 4 title caption" - - url: assets/images/unsplash-gallery-image-2.jpg - image_path: assets/images/unsplash-gallery-image-2-th.jpg + - url: /assets/images/unsplash-gallery-image-2.jpg + image_path: /assets/images/unsplash-gallery-image-2-th.jpg alt: "placeholder image 5" title: "Image 5 title caption" - - url: assets/images/unsplash-gallery-image-3.jpg - image_path: assets/images/unsplash-gallery-image-3-th.jpg + - url: /assets/images/unsplash-gallery-image-3.jpg + image_path: /assets/images/unsplash-gallery-image-3-th.jpg alt: "placeholder image 6" title: "Image 6 title caption" - - url: assets/images/unsplash-gallery-image-1.jpg - image_path: assets/images/unsplash-gallery-image-1-th.jpg + - url: /assets/images/unsplash-gallery-image-1.jpg + image_path: /assets/images/unsplash-gallery-image-1-th.jpg alt: "placeholder image 7" title: "Image 7 title caption" - - url: assets/images/unsplash-gallery-image-2.jpg - image_path: assets/images/unsplash-gallery-image-2-th.jpg + - url: /assets/images/unsplash-gallery-image-2.jpg + image_path: /assets/images/unsplash-gallery-image-2-th.jpg alt: "placeholder image 8" title: "Image 8 title caption" - - url: assets/images/unsplash-gallery-image-3.jpg - image_path: assets/images/unsplash-gallery-image-3-th.jpg + - url: /assets/images/unsplash-gallery-image-3.jpg + image_path: /assets/images/unsplash-gallery-image-3-th.jpg alt: "placeholder image 9" title: "Image 9 title caption" - - url: assets/images/unsplash-gallery-image-1.jpg - image_path: assets/images/unsplash-gallery-image-1-th.jpg + - url: /assets/images/unsplash-gallery-image-1.jpg + image_path: /assets/images/unsplash-gallery-image-1-th.jpg alt: "placeholder image 10" title: "Image 10 title caption" - - url: assets/images/unsplash-gallery-image-2.jpg - image_path: assets/images/unsplash-gallery-image-2-th.jpg + - url: /assets/images/unsplash-gallery-image-2.jpg + image_path: /assets/images/unsplash-gallery-image-2-th.jpg alt: "placeholder image 11" title: "Image 11 title caption" - - url: assets/images/unsplash-gallery-image-3.jpg - image_path: assets/images/unsplash-gallery-image-3-th.jpg + - url: /assets/images/unsplash-gallery-image-3.jpg + image_path: /assets/images/unsplash-gallery-image-3-th.jpg alt: "placeholder image 12" title: "Image 12 title caption" gallery2: @@ -66,9 +66,9 @@ gallery2: image_path: https://farm5.staticflickr.com/4046/4697502929_72c612c636_q.jpg alt: "Fog in the trees" gallery3: - - image_path: assets/images/unsplash-gallery-image-2-th.jpg + - image_path: /assets/images/unsplash-gallery-image-2-th.jpg alt: "placeholder image 2" - - image_path: assets/images/unsplash-gallery-image-4-th.jpg + - image_path: /assets/images/unsplash-gallery-image-4-th.jpg alt: "placeholder image 4" --- @@ -78,20 +78,20 @@ To place a gallery add the necessary YAML Front Matter: ```yaml gallery: - - url: assets/images/unsplash-gallery-image-1.jpg - image_path: assets/images/unsplash-gallery-image-1-th.jpg + - url: /assets/images/unsplash-gallery-image-1.jpg + image_path: /assets/images/unsplash-gallery-image-1-th.jpg alt: "placeholder image 1" title: "Image 1 title caption" - - url: assets/images/unsplash-gallery-image-2.jpg - image_path: assets/images/unsplash-gallery-image-2-th.jpg + - url: /assets/images/unsplash-gallery-image-2.jpg + image_path: /assets/images/unsplash-gallery-image-2-th.jpg alt: "placeholder image 2" title: "Image 2 title caption" - - url: assets/images/unsplash-gallery-image-3.jpg - image_path: assets/images/unsplash-gallery-image-3-th.jpg + - url: /assets/images/unsplash-gallery-image-3.jpg + image_path: /assets/images/unsplash-gallery-image-3-th.jpg alt: "placeholder image 3" title: "Image 3 title caption" - - url: assets/images/unsplash-gallery-image-4.jpg - image_path: assets/images/unsplash-gallery-image-4-th.jpg + - url: /assets/images/unsplash-gallery-image-4.jpg + image_path: /assets/images/unsplash-gallery-image-4-th.jpg alt: "placeholder image 4" title: "Image 4 title caption" ``` diff --git a/example/_posts/2012-03-15-layout-author-override.md b/example/_posts/2012-03-15-layout-author-override.md index 6d41b5c..50635b9 100755 --- a/example/_posts/2012-03-15-layout-author-override.md +++ b/example/_posts/2012-03-15-layout-author-override.md @@ -18,14 +18,14 @@ Billy Rick: uri: "http://thewhip.com" email: "billy@rick.com" bio: "What do you want, jewels? I am a very extravagant man." - avatar: "assets/images/bio-photo-2.jpg" + avatar: "/assets/images/bio-photo-2.jpg" twitter: "extravagantman" Cornelius Fiddlebone: name: "Cornelius Fiddlebone" email: "cornelius@thewhip.com" bio: "I ordered what?" - avatar: "assets/images/bio-photo.jpg" + avatar: "/assets/images/bio-photo.jpg" twitter: "rhymeswithsackit" ``` diff --git a/example/_posts/2012-03-15-layout-header-image-horizontal.md b/example/_posts/2012-03-15-layout-header-image-horizontal.md index 665163d..5a177aa 100755 --- a/example/_posts/2012-03-15-layout-header-image-horizontal.md +++ b/example/_posts/2012-03-15-layout-header-image-horizontal.md @@ -1,7 +1,7 @@ --- title: "Layout: Header Image (Horizontal)" header: - image: assets/images/unsplash-image-1.jpg + image: /assets/images/unsplash-image-1.jpg caption: "Photo credit: [**Unsplash**](https://unsplash.com)" categories: - Layout diff --git a/example/_posts/2012-03-15-layout-header-image-text-readability.md b/example/_posts/2012-03-15-layout-header-image-text-readability.md index 10897ce..56df347 100755 --- a/example/_posts/2012-03-15-layout-header-image-text-readability.md +++ b/example/_posts/2012-03-15-layout-header-image-text-readability.md @@ -1,7 +1,7 @@ --- title: "Layout: Header Image and Text Readability" header: - image: assets/images/unsplash-image-4.jpg + image: /assets/images/unsplash-image-4.jpg caption: "Photo credit: [**Unsplash**](https://unsplash.com)" tags: - sample post diff --git a/example/_posts/2012-03-15-layout-header-image-vertical.md b/example/_posts/2012-03-15-layout-header-image-vertical.md index 1a8fc71..97154fe 100755 --- a/example/_posts/2012-03-15-layout-header-image-vertical.md +++ b/example/_posts/2012-03-15-layout-header-image-vertical.md @@ -1,7 +1,7 @@ --- title: "Layout: Header Image (Vertical)" header: - image: assets/images/unsplash-image-6.jpg + image: /assets/images/unsplash-image-6.jpg caption: "Photo credit: [**Unsplash**](https://unsplash.com)" categories: - Layout diff --git a/example/_posts/2012-03-15-layout-header-overlay-image.md b/example/_posts/2012-03-15-layout-header-overlay-image.md index 01e8581..155423d 100755 --- a/example/_posts/2012-03-15-layout-header-overlay-image.md +++ b/example/_posts/2012-03-15-layout-header-overlay-image.md @@ -1,7 +1,7 @@ --- title: "Layout: Header Image Overlay" header: - overlay_image: assets/images/unsplash-image-1.jpg + overlay_image: /assets/images/unsplash-image-1.jpg caption: "Photo credit: [**Unsplash**](https://unsplash.com)" cta_url: "https://unsplash.com" categories: @@ -31,7 +31,7 @@ You can use it by specifying the opacity (between 0 and 1) of a black overlay li ```yaml excerpt: "This post should [...]" header: - overlay_image: assets/images/unsplash-image-1.jpg + overlay_image: /assets/images/unsplash-image-1.jpg overlay_filter: 0.5 # same as adding an opacity of 0.5 to a black background caption: "Photo credit: [**Unsplash**](https://unsplash.com)" cta_label: "More Info" @@ -45,7 +45,7 @@ Or if you want to do more fancy things, go full rgba: ```yaml excerpt: "This post should [...]" header: - overlay_image: assets/images/unsplash-image-1.jpg + overlay_image: /assets/images/unsplash-image-1.jpg overlay_filter: rgba(255, 0, 0, 0.5) caption: "Photo credit: [**Unsplash**](https://unsplash.com)" cta_label: "More Info" diff --git a/example/_posts/2013-05-22-markup-more-images.md b/example/_posts/2013-05-22-markup-more-images.md index 6507cd3..c6a8555 100755 --- a/example/_posts/2013-05-22-markup-more-images.md +++ b/example/_posts/2013-05-22-markup-more-images.md @@ -28,8 +28,8 @@ Apply the `half` class like so to display two images side by side that share the ```html
- - + +
Caption describing these two images.
``` -- 2.43.0