From f4cc49ffcaf060b1cad0b8fb882cb213030934a8 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 7 Mar 2016 09:47:00 -0500 Subject: [PATCH 1/5] Remove some categories to get around Windows path limit errors --- .../2009-07-02-edge-case-many-categories.md | 48 ------------------- 1 file changed, 48 deletions(-) diff --git a/_posts/2009-07-02-edge-case-many-categories.md b/_posts/2009-07-02-edge-case-many-categories.md index 53eeb400..6cb412d1 100644 --- a/_posts/2009-07-02-edge-case-many-categories.md +++ b/_posts/2009-07-02-edge-case-many-categories.md @@ -7,62 +7,14 @@ categories: - asmodeus - broder - buying - - Cat A - - Cat B - - Cat C - championship - chastening - - Child 1 - - Child 2 - - Child Category 01 - - Child Category 02 - - Child Category 03 - - Child Category 04 - - Child Category 05 - - clerkship - disinclination - disinfection - dispatch - echappee - - Edge Case - enphagy - equipollent - - fatuity - - Foo A - - Foo A - - Foo Parent - - gaberlunzie - - Grandchild Category - - illtempered - - insubordination - - lender - - Markup - - Media - - monosyllable - - packthread - - palter - - papilionaceous - - Parent - - Parent Category - - personable - - Post Formats - - propylaeum - - pustule - - quartern - - scholarship - - selfconvicted - - showshoe - - sloyd - - sub - - sublunary - - tamtam - - Unpublished - - weakhearted - - ween - - wellhead - - wellintentioned - - whetstone - - years tags: - categories - edge case From 0ccaef5a96825412da211ba921342d97af24df46 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 7 Mar 2016 09:51:50 -0500 Subject: [PATCH 2/5] Add space after YAML Front Matter --- _layouts/archive.html | 1 + _pages/404.md | 1 + _pages/about.md | 1 + _pages/category-archive.html | 1 + _pages/collection-archive.html | 1 + _pages/home.md | 1 + _pages/lorem-ipsum.md | 1 + _pages/page-a.md | 1 + _pages/page-archive.html | 1 + _pages/page-b.md | 1 + _pages/portfolio-archive.html | 1 + _pages/recipes-archive.html | 1 + _pages/sample-page.md | 1 + _pages/sitemap.md | 1 + _pages/tag-archive.html | 1 + _pages/theme-setup.md | 1 + _pages/year-archive.html | 1 + _pets/lhasa-apso.md | 1 + _pets/tabby.md | 1 + _portfolio/foo-bar-website.md | 1 + _posts/2009-05-15-edge-case-nested-and-mixed-lists.md | 1 + _posts/2009-06-01-edge-case-many-tags.md | 1 + _posts/2009-07-02-edge-case-many-categories.md | 1 + _posts/2009-09-05-edge-case-no-yaml-title.md | 1 + ...10-05-edge-case-title-should-not-overflow-the-content-area.md | 1 + _posts/2009-10-05-edge-case-very-long-title.md | 1 + _posts/2010-01-07-post-standard.md | 1 + _posts/2010-01-08-post-chat.md | 1 + _posts/2010-02-05-post-notice.md | 1 + _posts/2010-02-05-post-quote.md | 1 + _posts/2010-03-07-post-link.md | 1 + _posts/2010-06-02-post-video-youtube.md | 1 + _posts/2010-08-05-post-image-linked.md | 1 + _posts/2010-08-05-post-image-standard.md | 1 + _posts/2010-08-06-post-image-linked-caption.md | 1 + _posts/2010-08-07-post-image-caption.md | 1 + _posts/2010-09-09-post-gallery.md | 1 + _posts/2010-09-10-post-twitter-embeds.md | 1 + _posts/2010-10-25-post-future-date.md | 1 + _posts/2012-01-02-template-comments-disabled.md | 1 + _posts/2012-01-02-template-comments.md | 1 + _posts/2012-01-02-template-related-posts-disabled.md | 1 + _posts/2012-01-02-template-related-posts.md | 1 + _posts/2012-01-02-template-sharing-disabled.md | 1 + _posts/2012-01-02-template-sharing.md | 1 + ...012-01-03-template-comments-sharing-related-posts-disabled.md | 1 + _posts/2012-01-03-template-table-of-contents-post.md | 1 + _posts/2012-01-07-template-sticky.md | 1 + _posts/2012-03-14-template-code-excerpt-generated.md | 1 + _posts/2012-03-14-template-excerpt-defined.md | 1 + _posts/2012-03-14-template-excerpt-generated.md | 1 + _posts/2012-03-15-template-author-override.md | 1 + _posts/2012-03-15-template-featured-image-external.md | 1 + _posts/2012-03-15-template-featured-image-horizontal.md | 1 + _posts/2012-03-15-template-featured-image-text-readability.md | 1 + _posts/2012-03-15-template-featured-image-vertical.md | 1 + _posts/2012-03-15-template-more-tag.md | 1 + _posts/2012-05-22-markup-text-readability.md | 1 + _posts/2013-01-05-markup-title-with-markup.md | 1 + _posts/2013-01-05-markup-title-with-special-characters.md | 1 + _posts/2013-01-09-markup-text-alignment.md | 1 + _posts/2013-01-10-markup-image-alignment.md | 1 + _posts/2013-01-11-markup-html-tags-and-formatting.md | 1 + _posts/2016-02-24-welcome-to-jekyll.md | 1 + _recipes/chocolate-chip-cookies.md | 1 + _recipes/oatmeal-cookies.md | 1 + _recipes/peanut-butter-cookies.md | 1 + 67 files changed, 67 insertions(+) diff --git a/_layouts/archive.html b/_layouts/archive.html index 9f03103f..411c7929 100644 --- a/_layouts/archive.html +++ b/_layouts/archive.html @@ -1,6 +1,7 @@ --- layout: default --- +

{{ page.title }}

{{ content }} diff --git a/_pages/404.md b/_pages/404.md index ae3be79d..9d0f8606 100644 --- a/_pages/404.md +++ b/_pages/404.md @@ -4,6 +4,7 @@ excerpt: "Page not found. Your pixels are in another canvas." sitemap: false permalink: /404.html --- + Sorry, but the page you were trying to view does not exist --- perhaps you can try searching for it below. diff --git a/_posts/2010-10-25-post-future-date.md b/_posts/2010-10-25-post-future-date.md index 56a21ad8..7d1b203a 100644 --- a/_posts/2010-10-25-post-future-date.md +++ b/_posts/2010-10-25-post-future-date.md @@ -4,4 +4,5 @@ date: 9999-12-31 categories: - Post --- + This post lives in the future and is dated {{ page.date | date: "%c" }}. When building Jekyll with the `--future` flag it should appear. \ No newline at end of file diff --git a/_posts/2012-01-02-template-comments-disabled.md b/_posts/2012-01-02-template-comments-disabled.md index 46a08d80..250e5def 100644 --- a/_posts/2012-01-02-template-comments-disabled.md +++ b/_posts/2012-01-02-template-comments-disabled.md @@ -8,6 +8,7 @@ tags: - comments - template --- + This post has its comments disabled. There should be no comment form. \ No newline at end of file diff --git a/_posts/2012-01-02-template-comments.md b/_posts/2012-01-02-template-comments.md index a7443e83..ee9f54ab 100644 --- a/_posts/2012-01-02-template-comments.md +++ b/_posts/2012-01-02-template-comments.md @@ -8,4 +8,5 @@ tags: - comments - template --- + This post should display comments. \ No newline at end of file diff --git a/_posts/2012-01-02-template-related-posts-disabled.md b/_posts/2012-01-02-template-related-posts-disabled.md index 47201067..00e77bc6 100644 --- a/_posts/2012-01-02-template-related-posts-disabled.md +++ b/_posts/2012-01-02-template-related-posts-disabled.md @@ -8,6 +8,7 @@ tags: - related posts - template --- + This post has related posts disabled. Related post links should not appear. \ No newline at end of file diff --git a/_posts/2012-01-02-template-related-posts.md b/_posts/2012-01-02-template-related-posts.md index 0f2a0046..e91f0df2 100644 --- a/_posts/2012-01-02-template-related-posts.md +++ b/_posts/2012-01-02-template-related-posts.md @@ -8,4 +8,5 @@ tags: - related posts - template --- + This post has related posts enabled. \ No newline at end of file diff --git a/_posts/2012-01-02-template-sharing-disabled.md b/_posts/2012-01-02-template-sharing-disabled.md index b82c3189..84a5ceff 100644 --- a/_posts/2012-01-02-template-sharing-disabled.md +++ b/_posts/2012-01-02-template-sharing-disabled.md @@ -8,6 +8,7 @@ tags: - social - template --- + This post has social sharing disabled. Social sharing links should not appear. \ No newline at end of file diff --git a/_posts/2012-01-02-template-sharing.md b/_posts/2012-01-02-template-sharing.md index aa4db931..5b82536a 100644 --- a/_posts/2012-01-02-template-sharing.md +++ b/_posts/2012-01-02-template-sharing.md @@ -8,4 +8,5 @@ tags: - social - template --- + This post should display social sharing links. \ No newline at end of file diff --git a/_posts/2012-01-03-template-comments-sharing-related-posts-disabled.md b/_posts/2012-01-03-template-comments-sharing-related-posts-disabled.md index e6828fd0..e14d8e02 100644 --- a/_posts/2012-01-03-template-comments-sharing-related-posts-disabled.md +++ b/_posts/2012-01-03-template-comments-sharing-related-posts-disabled.md @@ -12,6 +12,7 @@ tags: - comments - template --- + This post has comments, social sharing links, and related posts disabled. Comments, social sharing and related post links should not appear. \ No newline at end of file diff --git a/_posts/2012-01-03-template-table-of-contents-post.md b/_posts/2012-01-03-template-table-of-contents-post.md index 9aa96fdc..d9314b73 100644 --- a/_posts/2012-01-03-template-table-of-contents-post.md +++ b/_posts/2012-01-03-template-table-of-contents-post.md @@ -3,6 +3,7 @@ title: "Template: Post with Table Of Contents" tags: - table of contents --- +

Overview

diff --git a/_posts/2012-01-07-template-sticky.md b/_posts/2012-01-07-template-sticky.md index d467bc33..347d9899 100644 --- a/_posts/2012-01-07-template-sticky.md +++ b/_posts/2012-01-07-template-sticky.md @@ -6,6 +6,7 @@ tags: - sticky - template --- + This is a sticky post. There are a few things to verify: diff --git a/_posts/2012-03-14-template-code-excerpt-generated.md b/_posts/2012-03-14-template-code-excerpt-generated.md index 0f9f9966..78e9dbcd 100644 --- a/_posts/2012-03-14-template-code-excerpt-generated.md +++ b/_posts/2012-03-14-template-code-excerpt-generated.md @@ -8,6 +8,7 @@ tags: - excerpt - template --- + This is the post content with inline code, (e.g. `red`. It should be displayed in place of the auto-generated excerpt in single-page views. Archive-index pages should display an auto-generated excerpt of this content. Be sure to test the formatting of the auto-generated excerpt, to ensure that it doesn't create any layout problems. \ No newline at end of file diff --git a/_posts/2012-03-14-template-excerpt-defined.md b/_posts/2012-03-14-template-excerpt-defined.md index bdc9f899..7c41c571 100644 --- a/_posts/2012-03-14-template-excerpt-defined.md +++ b/_posts/2012-03-14-template-excerpt-defined.md @@ -9,6 +9,7 @@ tags: - excerpt - template --- + This is the post content. It should be displayed in place of the user-defined excerpt in archive-index pages. This paragraph should be absent from an archive-index page where `post.excerpt` is shown. \ No newline at end of file diff --git a/_posts/2012-03-14-template-excerpt-generated.md b/_posts/2012-03-14-template-excerpt-generated.md index 7ff3df7a..02542cf1 100644 --- a/_posts/2012-03-14-template-excerpt-generated.md +++ b/_posts/2012-03-14-template-excerpt-generated.md @@ -9,6 +9,7 @@ tags: - excerpt - template --- + This is the post content. It should be displayed in place of the auto-generated excerpt in single-page views. Archive-index pages should display an auto-generated excerpt of this content. diff --git a/_posts/2012-03-15-template-author-override.md b/_posts/2012-03-15-template-author-override.md index db20af45..f0d12636 100644 --- a/_posts/2012-03-15-template-author-override.md +++ b/_posts/2012-03-15-template-author-override.md @@ -3,6 +3,7 @@ title: "Template: Author Override" author: Billy Rick excerpt: "A post to test author overrides using a data file." --- + For those of you who may have content written by multiple authors on your site you can now assign different authors to each post if desired. Previously the theme used a global author for the entire site and those attributes would be used in all bylines, social networking links, Twitter Card attribution, and Google Authorship. These `owner` variables were defined in `config.yml` diff --git a/_posts/2012-03-15-template-featured-image-external.md b/_posts/2012-03-15-template-featured-image-external.md index 82155ea7..82987273 100644 --- a/_posts/2012-03-15-template-featured-image-external.md +++ b/_posts/2012-03-15-template-featured-image-external.md @@ -11,6 +11,7 @@ tags: - image - template --- + This post should display a **featured image**, if the theme supports it. Featured image is an external asset and should load. \ No newline at end of file diff --git a/_posts/2012-03-15-template-featured-image-horizontal.md b/_posts/2012-03-15-template-featured-image-horizontal.md index 6e1d3700..6e5313ff 100644 --- a/_posts/2012-03-15-template-featured-image-horizontal.md +++ b/_posts/2012-03-15-template-featured-image-horizontal.md @@ -12,6 +12,7 @@ tags: - image - template --- + This post should display a **featured image**, if the theme supports it. Non-square images can provide some unique styling issues. diff --git a/_posts/2012-03-15-template-featured-image-text-readability.md b/_posts/2012-03-15-template-featured-image-text-readability.md index ac219fbe..c6ef168f 100644 --- a/_posts/2012-03-15-template-featured-image-text-readability.md +++ b/_posts/2012-03-15-template-featured-image-text-readability.md @@ -8,6 +8,7 @@ tags: - readability - test --- + This is a sample post with a large feature image[^1] up top and tons of text. Odio ad blue bottle vinyl, 90's narwhal commodo bitters pour-over nostrud. Ugh est hashtag in, fingerstache adipisicing laboris esse Pinterest shabby chic Portland. Shoreditch bicycle rights anim, flexitarian laboris put a bird on it vinyl cupidatat narwhal. Hashtag artisan skateboard, flannel Bushwick nesciunt salvia aute fixie do plaid post-ironic dolor McSweeney's. Cliche pour-over chambray nulla four loko skateboard sapiente hashtag. Vero laborum commodo occupy. Semiotics voluptate mumblecore pug. Cosby sweater ullamco quinoa ennui assumenda, sapiente occupy delectus lo-fi. *Ea fashion axe [Marfa cillum aliquip](#). Retro Bushwick keytar cliche.* Before they sold out sustainable gastropub Marfa readymade, ethical Williamsburg skateboard brunch qui consectetur gentrify semiotics. Mustache cillum irony, fingerstache magna pour-over keffiyeh tousled selfies. diff --git a/_posts/2012-03-15-template-featured-image-vertical.md b/_posts/2012-03-15-template-featured-image-vertical.md index ff252d0f..6df4faea 100644 --- a/_posts/2012-03-15-template-featured-image-vertical.md +++ b/_posts/2012-03-15-template-featured-image-vertical.md @@ -13,6 +13,7 @@ tags: - image - template --- + This post should display a **featured image**, if the theme supports it. Non-square images can provide some unique styling issues. diff --git a/_posts/2012-03-15-template-more-tag.md b/_posts/2012-03-15-template-more-tag.md index 9ace97ac..652e4a05 100644 --- a/_posts/2012-03-15-template-more-tag.md +++ b/_posts/2012-03-15-template-more-tag.md @@ -8,6 +8,7 @@ tags: - read more - template --- + This content is before the [excerpt separator tag](http://jekyllrb.com/docs/posts/#post-excerpts). Right after this sentence there should be a **continue reading** link of some sort in archive-index pages. diff --git a/_posts/2012-05-22-markup-text-readability.md b/_posts/2012-05-22-markup-text-readability.md index be2779d2..e0dde8ee 100644 --- a/_posts/2012-05-22-markup-text-readability.md +++ b/_posts/2012-05-22-markup-text-readability.md @@ -6,6 +6,7 @@ tags: - readability - test --- + Portland in shoreditch Vice, labore typewriter pariatur hoodie fap sartorial Austin. Pinterest literally occupy Schlitz forage. Odio ad blue bottle vinyl, 90's narwhal commodo bitters pour-over nostrud. Ugh est hashtag in, fingerstache adipisicing laboris esse Pinterest shabby chic Portland. Shoreditch bicycle rights anim, flexitarian laboris put a bird on it vinyl cupidatat narwhal. Hashtag artisan skateboard, flannel Bushwick nesciunt salvia aute fixie do plaid post-ironic dolor McSweeney's. Cliche pour-over chambray nulla four loko skateboard sapiente hashtag. Vero laborum commodo occupy. Semiotics voluptate mumblecore pug. Cosby sweater ullamco quinoa ennui assumenda, sapiente occupy delectus lo-fi. Ea fashion axe Marfa cillum aliquip. Retro Bushwick keytar cliche. Before they sold out sustainable gastropub Marfa readymade, ethical Williamsburg skateboard brunch qui consectetur gentrify semiotics. Mustache cillum irony, fingerstache magna pour-over keffiyeh tousled selfies. diff --git a/_posts/2013-01-05-markup-title-with-markup.md b/_posts/2013-01-05-markup-title-with-markup.md index 6a4a9622..2ead3fc9 100644 --- a/_posts/2013-01-05-markup-title-with-markup.md +++ b/_posts/2013-01-05-markup-title-with-markup.md @@ -7,6 +7,7 @@ tags: - html - title --- + Verify that: * The post title renders the word "with" in *italics* and the word "Markdown" in **bold**. diff --git a/_posts/2013-01-05-markup-title-with-special-characters.md b/_posts/2013-01-05-markup-title-with-special-characters.md index 65a4888f..075828af 100644 --- a/_posts/2013-01-05-markup-title-with-special-characters.md +++ b/_posts/2013-01-05-markup-title-with-special-characters.md @@ -8,6 +8,7 @@ tags: - post - title --- + Putting special characters in the title should have no adverse effect on the layout or functionality. Special characters in the post title have been known to cause issues with JavaScript and XML when not properly encoded and escaped. diff --git a/_posts/2013-01-09-markup-text-alignment.md b/_posts/2013-01-09-markup-text-alignment.md index 081a277e..e6fd09b3 100644 --- a/_posts/2013-01-09-markup-text-alignment.md +++ b/_posts/2013-01-09-markup-text-alignment.md @@ -8,6 +8,7 @@ tags: - css - markup --- + ### Default This is a paragraph. It should not have any alignment of any kind. It should just flow like you would normally expect. Nothing fancy. Just straight up text, free flowing, with love. Completely neutral and not picking a side or sitting on the fence. It just is. It just freaking is. It likes where it is. It does not feel compelled to pick a side. Leave him be. It will just be better that way. Trust me. diff --git a/_posts/2013-01-10-markup-image-alignment.md b/_posts/2013-01-10-markup-image-alignment.md index e5440fcf..3ee05e86 100644 --- a/_posts/2013-01-10-markup-image-alignment.md +++ b/_posts/2013-01-10-markup-image-alignment.md @@ -10,6 +10,7 @@ tags: - image - markup --- + Welcome to image alignment! The best way to demonstrate the ebb and flow of the various image positioning options is to nestle them snuggly among an ocean of words. Grab a paddle and let's get started. ![image-center](http://wpthemetestdata.files.wordpress.com/2013/03/image-alignment-580x300.jpg){: .align-center} diff --git a/_posts/2013-01-11-markup-html-tags-and-formatting.md b/_posts/2013-01-11-markup-html-tags-and-formatting.md index 424fa950..5d3f40a0 100644 --- a/_posts/2013-01-11-markup-html-tags-and-formatting.md +++ b/_posts/2013-01-11-markup-html-tags-and-formatting.md @@ -9,6 +9,7 @@ tags: - html - markup --- + ## Headings # Header one diff --git a/_posts/2016-02-24-welcome-to-jekyll.md b/_posts/2016-02-24-welcome-to-jekyll.md index f343cd3a..bcaa097e 100644 --- a/_posts/2016-02-24-welcome-to-jekyll.md +++ b/_posts/2016-02-24-welcome-to-jekyll.md @@ -5,6 +5,7 @@ categories: tags: - update --- + You'll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated. To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works. diff --git a/_recipes/chocolate-chip-cookies.md b/_recipes/chocolate-chip-cookies.md index d40da08e..f58e3022 100644 --- a/_recipes/chocolate-chip-cookies.md +++ b/_recipes/chocolate-chip-cookies.md @@ -4,6 +4,7 @@ categories: - cookies - desert --- + A chocolate chip cookie is a drop cookie that originated in the United States and features chocolate chips as its distinguishing ingredient. The traditional recipe combines a dough composed of butter and both brown and white sugar with semi-sweet chocolate chips. Variations include recipes with other types of chocolate as well as additional ingredients such as nuts or oatmeal. diff --git a/_recipes/oatmeal-cookies.md b/_recipes/oatmeal-cookies.md index 3fc2793f..2eb2143c 100644 --- a/_recipes/oatmeal-cookies.md +++ b/_recipes/oatmeal-cookies.md @@ -3,6 +3,7 @@ title: "Oatmeal Cookies" categories: - cookies --- + Oatmeal cookies are a proverbial favorite with both kids and adults. This crisp and chewy cookie is loaded with oats, dried fruit, and chopped nuts. ## Ingredients diff --git a/_recipes/peanut-butter-cookies.md b/_recipes/peanut-butter-cookies.md index 969acce5..029c30d6 100644 --- a/_recipes/peanut-butter-cookies.md +++ b/_recipes/peanut-butter-cookies.md @@ -3,6 +3,7 @@ title: "Peanut Butter Cookies" categories: - cookies --- + A peanut butter cookie is a type of cookie that is distinguished for having peanut butter as a principal ingredient. The cookie generally originated in the United States, its development dating back to the 1910s. ## Ingredients From 3bd495f1d4f25fb4f81f73e6744048c176c4a943 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 7 Mar 2016 10:27:07 -0500 Subject: [PATCH 3/5] Remove extensions from _includes to simplify naming --- _includes/absolute-url.liquid | 1 - _includes/archive-list-single | 8 +++++ _includes/archive-list-single.html | 8 ----- .../{author-profile.html => author-profile} | 2 +- _includes/base_path | 1 + _includes/{breadcrumbs.html => breadcrumbs} | 4 +-- .../{browser-upgrade.html => browser-upgrade} | 0 .../{disqus-comments.html => disqus-comments} | 0 _includes/feed-footer.html | 4 --- _includes/{footer.html => footer} | 0 _includes/gallery | 8 ++--- .../{group-by-array.html => group-by-array} | 0 _includes/head | 30 +++++++++++++++++++ _includes/head.html | 30 ------------------- _includes/navigation | 19 ++++++++++++ _includes/navigation.html | 19 ------------ _includes/{scripts.html => scripts} | 6 ++-- _includes/{seo.html => seo} | 6 ++-- _includes/social-share | 14 +++++++++ _includes/social-share.html | 14 --------- _includes/toc | 7 +++++ _includes/toc.html | 9 ------ _layouts/default.html | 20 ++++++------- _layouts/single.html | 10 +++---- _pages/category-archive.html | 6 ++-- _pages/collection-archive.html | 4 +-- _pages/home.md | 4 +-- _pages/page-archive.html | 4 +-- _pages/portfolio-archive.html | 6 ++-- _pages/recipes-archive.html | 6 ++-- _pages/sitemap.md | 10 +++---- _pages/tag-archive.html | 6 ++-- _pages/theme-setup.md | 16 +++++----- _pages/year-archive.html | 4 +-- ...2-01-03-template-table-of-contents-post.md | 18 +++++------ 35 files changed, 148 insertions(+), 156 deletions(-) delete mode 100644 _includes/absolute-url.liquid create mode 100644 _includes/archive-list-single delete mode 100644 _includes/archive-list-single.html rename _includes/{author-profile.html => author-profile} (97%) create mode 100644 _includes/base_path rename _includes/{breadcrumbs.html => breadcrumbs} (68%) rename _includes/{browser-upgrade.html => browser-upgrade} (100%) rename _includes/{disqus-comments.html => disqus-comments} (100%) delete mode 100644 _includes/feed-footer.html rename _includes/{footer.html => footer} (100%) rename _includes/{group-by-array.html => group-by-array} (100%) create mode 100644 _includes/head delete mode 100644 _includes/head.html create mode 100644 _includes/navigation delete mode 100644 _includes/navigation.html rename _includes/{scripts.html => scripts} (72%) rename _includes/{seo.html => seo} (96%) create mode 100644 _includes/social-share delete mode 100644 _includes/social-share.html create mode 100644 _includes/toc delete mode 100644 _includes/toc.html diff --git a/_includes/absolute-url.liquid b/_includes/absolute-url.liquid deleted file mode 100644 index 7809e996..00000000 --- a/_includes/absolute-url.liquid +++ /dev/null @@ -1 +0,0 @@ -{% capture absurl %}{{ site.url }}{{ site.baseurl }}{% endcapture %} \ No newline at end of file diff --git a/_includes/archive-list-single b/_includes/archive-list-single new file mode 100644 index 00000000..37d421d6 --- /dev/null +++ b/_includes/archive-list-single @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/_includes/archive-list-single.html b/_includes/archive-list-single.html deleted file mode 100644 index 3b4032bb..00000000 --- a/_includes/archive-list-single.html +++ /dev/null @@ -1,8 +0,0 @@ - \ No newline at end of file diff --git a/_includes/author-profile.html b/_includes/author-profile similarity index 97% rename from _includes/author-profile.html rename to _includes/author-profile index 29458ce7..76bb3267 100644 --- a/_includes/author-profile.html +++ b/_includes/author-profile @@ -7,7 +7,7 @@ {% if author.avatar contains "http" %} {{ author.name }} photo {% else %} - {{ author.name }} photo + {{ author.name }} photo {% endif %}

{{ author.name }}

diff --git a/_includes/base_path b/_includes/base_path new file mode 100644 index 00000000..8c7dc62b --- /dev/null +++ b/_includes/base_path @@ -0,0 +1 @@ +{% capture base_path %}{{ site.url }}{{ site.baseurl }}{% endcapture %} \ No newline at end of file diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs similarity index 68% rename from _includes/breadcrumbs.html rename to _includes/breadcrumbs index 8a12274e..3caff149 100644 --- a/_includes/breadcrumbs.html +++ b/_includes/breadcrumbs @@ -5,7 +5,7 @@ {% for crumb in crumbs offset: 1 %} {% if forloop.first %}
  • - {{ site.breadcrumb_home_label }} + {{ site.breadcrumb_home_label }}
    • {{ site.breadcrumb_separator }} @@ -15,7 +15,7 @@ {% else %} {% assign i = i | plus: 1 %}
  • - {{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }} + {{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }}
    • {{ site.breadcrumb_separator }} diff --git a/_includes/browser-upgrade.html b/_includes/browser-upgrade similarity index 100% rename from _includes/browser-upgrade.html rename to _includes/browser-upgrade diff --git a/_includes/disqus-comments.html b/_includes/disqus-comments similarity index 100% rename from _includes/disqus-comments.html rename to _includes/disqus-comments diff --git a/_includes/feed-footer.html b/_includes/feed-footer.html deleted file mode 100644 index 59faf918..00000000 --- a/_includes/feed-footer.html +++ /dev/null @@ -1,4 +0,0 @@ -{% capture feed_footer %} -

    {{ post.title }} was originally published by {{ site.owner.name }} on {{ site.title }}

    -{% endcapture %} -{{ feed_footer | markdownify | xml_escape }} \ No newline at end of file diff --git a/_includes/footer.html b/_includes/footer similarity index 100% rename from _includes/footer.html rename to _includes/footer diff --git a/_includes/gallery b/_includes/gallery index db1b0a22..4f1f77b2 100644 --- a/_includes/gallery +++ b/_includes/gallery @@ -1,4 +1,4 @@ -{% include absolute-url.liquid %} +{% include base_path %} {% if include.id %} {% assign gallery = page.[include.id] %} @@ -23,14 +23,14 @@ {% if img.url contains "http" %} "{{ img.url }}" {% else %} - "{{ img.url | prepend: "/images/" | prepend: absurl }}" + "{{ img.url | prepend: "/images/" | prepend: base_path }}" {% endif %} > {% if img.alt %}{{ img.alt }}{% endif %} @@ -39,7 +39,7 @@ {% if img.image_path contains "http" %} "{{ img.image_path }}" {% else %} - "{{ img.image_path | prepend: "/images/" | prepend: absurl }}" + "{{ img.image_path | prepend: "/images/" | prepend: base_path }}" {% endif %} alt="{% if img.alt %}{{ img.alt }}{% endif %}"> {% endif %} diff --git a/_includes/group-by-array.html b/_includes/group-by-array similarity index 100% rename from _includes/group-by-array.html rename to _includes/group-by-array diff --git a/_includes/head b/_includes/head new file mode 100644 index 00000000..38a43551 --- /dev/null +++ b/_includes/head @@ -0,0 +1,30 @@ + + +{% include seo %} + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/_includes/head.html b/_includes/head.html deleted file mode 100644 index dfd62a5b..00000000 --- a/_includes/head.html +++ /dev/null @@ -1,30 +0,0 @@ - - -{% include seo.html %} - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/_includes/navigation b/_includes/navigation new file mode 100644 index 00000000..04005971 --- /dev/null +++ b/_includes/navigation @@ -0,0 +1,19 @@ +
    +
    + {{ site.title }} +
    +
    + +
    +
    diff --git a/_includes/navigation.html b/_includes/navigation.html deleted file mode 100644 index 27aff530..00000000 --- a/_includes/navigation.html +++ /dev/null @@ -1,19 +0,0 @@ -
    -
    - {{ site.title }} -
    -
    - -
    -
    diff --git a/_includes/scripts.html b/_includes/scripts similarity index 72% rename from _includes/scripts.html rename to _includes/scripts index 746e9f5d..c8b4714e 100644 --- a/_includes/scripts.html +++ b/_includes/scripts @@ -1,6 +1,6 @@ - - + + {% if site.google_analytics %} \ No newline at end of file diff --git a/_includes/analytics-providers/google-universal b/_includes/analytics-providers/google-universal new file mode 100644 index 00000000..8da1929c --- /dev/null +++ b/_includes/analytics-providers/google-universal @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/_includes/comments b/_includes/comments new file mode 100644 index 00000000..a549d8e7 --- /dev/null +++ b/_includes/comments @@ -0,0 +1,14 @@ +{% if site.comments.provider and page.comments %} + +{% case site.comments.provider %} +{% when "disqus" %} + {% include /comments-providers/disqus %} +{% when "facebook" %} + {% include /comments-providers/facebook %} +{% when "google-plus" %} + {% include /comments-providers/google-plus %} +{% when "custom" %} + {% include /comments-providers/custom %} +{% endcase %} + +{% endif %} \ No newline at end of file diff --git a/_includes/comments-providers/custom b/_includes/comments-providers/custom new file mode 100644 index 00000000..90993691 --- /dev/null +++ b/_includes/comments-providers/custom @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/_includes/comments-providers/disqus b/_includes/comments-providers/disqus new file mode 100644 index 00000000..b80be9ef --- /dev/null +++ b/_includes/comments-providers/disqus @@ -0,0 +1,22 @@ +{% if site.comments.disqus.shortname %} + + +{% endif %} diff --git a/_includes/comments-providers/facebook b/_includes/comments-providers/facebook new file mode 100644 index 00000000..009dc1c6 --- /dev/null +++ b/_includes/comments-providers/facebook @@ -0,0 +1,8 @@ +
    + \ No newline at end of file diff --git a/_includes/comments-providers/google-plus b/_includes/comments-providers/google-plus new file mode 100644 index 00000000..cd582c3d --- /dev/null +++ b/_includes/comments-providers/google-plus @@ -0,0 +1,2 @@ + + diff --git a/_includes/disqus-comments b/_includes/disqus-comments deleted file mode 100644 index 721316a1..00000000 --- a/_includes/disqus-comments +++ /dev/null @@ -1,22 +0,0 @@ -{% if site.disqus_shortname %} - - -{% endif %} diff --git a/_includes/scripts b/_includes/scripts index c8b4714e..dfe7ba46 100644 --- a/_includes/scripts +++ b/_includes/scripts @@ -2,19 +2,5 @@ -{% if site.google_analytics %} - -{% endif %} - -{% if page.comments %} - {% include disqus-comments %} -{% endif %} +{% include analytics %} +{% include comments %} diff --git a/_layouts/single.html b/_layouts/single.html index 5cc99dac..31648567 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -32,8 +32,17 @@ layout: default
    - {% if site.disqus_shortname and page.comments %} -
    + {% if site.comments.provider and page.comments %} + {% case site.comments.provider %} + {% when "disqus" %} +
    + {% when "facebook" %} +
    + {% when "google-plus" %} +
    Loading Google+ Comments ...
    + {% when "custom" %} +
    + {% endcase %} {% endif %} From 455067a0007da9edfbb79e67714d300672eeaf98 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 7 Mar 2016 11:48:25 -0500 Subject: [PATCH 5/5] Add option to disable social sharing globally --- _config.yml | 16 +++++++++++----- _layouts/single.html | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/_config.yml b/_config.yml index 3be0ef38..4a4bbb15 100644 --- a/_config.yml +++ b/_config.yml @@ -15,7 +15,7 @@ url : "http://localhost:4000" # the base hostname & protoco baseurl : "/minimal-mistakes" # the subpath of your site, e.g. /blog email : "your-email@domain.com" logo : "site-logo.png" -breadcrumbs : # true / false (default) +breadcrumbs : false # true / false (default) breadcrumb_home_label : "Home" breadcrumb_separator : "/" twitter: @@ -24,6 +24,7 @@ facebook: username : &facebook "site_facebook" app_id : publisher : +share : true # false (default), true comments: provider : false # false (default), "disqus", "facebook", "google-plus", custom" disqus: @@ -130,32 +131,37 @@ defaults: related: true # _pages - scope: - path: _pages + path: "" type: pages values: layout: single author_profile: true # _recipes - scope: - path: _recipes + path: "" type: recipes values: layout: single author_profile: true + share: true + comments: true # _pets - scope: - path: _pets + path: "" type: pets values: layout: single author_profile: true + share: true + comment: true # _portfolio - scope: - path: _portfolio + path: "" type: portfolio values: layout: single author_profile: true + share: true # Plugins gems: diff --git a/_layouts/single.html b/_layouts/single.html index 31648567..036db3e0 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -25,7 +25,7 @@ layout: default