Merge branch 'hotfix/updates'

This commit is contained in:
Michael Rose 2014-01-16 09:44:12 -05:00
commit 7d8cadfffb
5 changed files with 43 additions and 45 deletions

View file

@ -5,12 +5,11 @@ Looking for a simple, responsive, theme for your Jekyll powered blog? Well look
## So Simple Theme is all about:
* Responsive templates. Looking good on mobile, tablet, and desktop.
* Readable typography to make your words shine.
* Gracefully degrading in older browsers. Compatible with Internet Explorer 9+ and all modern browsers.
* Minimal embellishments and subtle animations.
* Readable typography to make your words shine.
* Support for large images to call out your favorite posts.
* Disqus comments if you choose to enable.
* Simple and clear permalink structure[^1].
* Tags for [Open Graph](https://developers.facebook.com/docs/opengraph/) and [Twitter Cards](https://dev.twitter.com/docs/cards) for a better social sharing experience.
* Vanilla [custom 404 page]({{ site.url }}/404.html) to get you started.
* Stylesheets for Pygments and Coderay [syntax highlighting](http://mmistakes.github.io/articles/so-simple-theme/code-highlighting-post/) to make your code examples look snazzy.
@ -94,7 +93,7 @@ pygments: true
markdown: kramdown
# https://github.com/mojombo/jekyll/wiki/Permalinks
permalink: /:categories/:title
permalink: /:categories/:title/
```
---
@ -124,7 +123,7 @@ so-simple-theme/
├── images #images for posts and pages
├── _config.yml #Jekyll site options
├── about.md #about page
├── articles.md #lists all posts from latest to oldest
├── articles.html #lists all posts from latest to oldest
├── index.html #homepage. lists 10 latest posts
├── tags.html #lists all posts sorted by tag
└── sitemap.xml #autogenerated sitemap for search engines

View file

@ -1,9 +1,9 @@
/*global jQuery */
/*jshint multistr:true browser:true */
/*!
* FitVids 1.0
* FitVids 1.0.3
*
* Copyright 2011, Chris Coyier - http://css-tricks.com + Dave Rupert - http://daverupert.com
* Copyright 2013, Chris Coyier - http://css-tricks.com + Dave Rupert - http://daverupert.com
* Credit to Thierry Koblentz - http://www.alistapart.com/articles/creating-intrinsic-ratios-for-video/
* Released under the WTFPL license - http://sam.zoy.org/wtfpl/
*
@ -19,30 +19,21 @@
customSelector: null
};
if(!document.getElementById('fit-vids-style')) {
var div = document.createElement('div'),
ref = document.getElementsByTagName('base')[0] || document.getElementsByTagName('script')[0];
ref = document.getElementsByTagName('base')[0] || document.getElementsByTagName('script')[0],
cssStyles = '&shy;<style>.fluid-width-video-wrapper{width:100%;position:relative;padding:0;}.fluid-width-video-wrapper iframe,.fluid-width-video-wrapper object,.fluid-width-video-wrapper embed {position:absolute;top:0;left:0;width:100%;height:100%;}</style>';
div.className = 'fit-vids-style';
div.innerHTML = '&shy;<style> \
.fluid-width-video-wrapper { \
width: 100%; \
position: relative; \
padding: 0; \
} \
\
.fluid-width-video-wrapper iframe, \
.fluid-width-video-wrapper object, \
.fluid-width-video-wrapper embed { \
position: absolute; \
top: 0; \
left: 0; \
width: 100%; \
height: 100%; \
} \
</style>';
div.id = 'fit-vids-style';
div.style.display = 'none';
div.innerHTML = cssStyles;
ref.parentNode.insertBefore(div,ref);
}
if ( options ) {
$.extend( settings, options );
}
@ -50,9 +41,9 @@
return this.each(function(){
var selectors = [
"iframe[src*='player.vimeo.com']",
"iframe[src*='www.youtube.com']",
"iframe[src*='www.youtube-nocookie.com']",
"iframe[src*='www.kickstarter.com']",
"iframe[src*='youtube.com']",
"iframe[src*='youtube-nocookie.com']",
"iframe[src*='kickstarter.com'][src*='video.html']",
"object",
"embed"
];
@ -62,6 +53,7 @@
}
var $allVideos = $(this).find(selectors.join(','));
$allVideos = $allVideos.not("object object"); // SwfObj conflict patch
$allVideos.each(function(){
var $this = $(this);
@ -78,4 +70,5 @@
});
});
};
})( jQuery );
// Works with either jQuery or Zepto
})( window.jQuery || window.Zepto );

File diff suppressed because one or more lines are too long

View file

@ -1,13 +1,13 @@
{
"name": "minimal-mistakes-theme",
"name": "so-simple-theme",
"author": "Michael Rose <michael@mademistakes.com>",
"homepage": "http://mmistakes.github.io/minima-mistakes/",
"homepage": "http://mmistakes.github.io/so-simple-theme/",
"repository": {
"type": "git",
"url": "git://github.com/mmistakes/minimal-mistakes.git"
"url": "git://github.com/mmistakes/so-simple-theme.git"
},
"bugs": {
"url": "https://github.com/mmistakes/minimal-mistakes/issues"
"url": "https://github.com/mmistakes/so-simple-theme/issues"
},
"engines": {
"node": ">= 0.10.0"

View file

@ -9,6 +9,9 @@ tags: [Jekyll, theme, install, setup]
General notes and suggestions for customizing **So Simple Theme**.
* Table of Contents
{:toc}
## Basic Setup for a new Jekyll site
1. [Install Jekyll](http://jekyllrb.com) and read through the documentation if you haven't already.
@ -67,9 +70,9 @@ bing_verify:
# For external links add external: true
links:
- title: About
url: /about
url: /about/
- title: Articles
url: /articles
url: /articles/
- title: Google
url: http://google.com
external: true
@ -80,7 +83,7 @@ pygments: true
markdown: kramdown
# https://github.com/mojombo/jekyll/wiki/Permalinks
permalink: /:categories/:title
permalink: /:categories/:title/
{% endhighlight %}
---
@ -110,7 +113,7 @@ so-simple-theme/
├── images #images for posts and pages
├── _config.yml #Jekyll site options
├── about.md #about page
├── articles.md #lists all posts from latest to oldest
├── articles.html #lists all posts from latest to oldest
├── index.html #homepage. lists 10 latest posts
├── tags.html #lists all posts sorted by tag
└── sitemap.xml #autogenerated sitemap for search engines
@ -149,11 +152,11 @@ Edit page/post titles and URLs to include in the site's navigation. For external
# sample top navigation links
links:
- title: About Page
url: /about
url: /about/
- title: Articles
url: /articles
url: /articles/
- title: Other Page
url: /other-page
url: /other-page/
- title: External Link
url: http://mademistakes.com
external: true
@ -209,9 +212,12 @@ image:
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).
For example. Say you want to group all your posts under `blog/` instead of `articles/`. In your post add `category: blog` to the front matter, rename or duplicate `articles.md` to `blog.md` and change the permalink in that file to `permalink: /blog/index.html`.
For example. Say you want to group all your posts under `blog/` instead of `articles/`. In your post add `category: blog` to the front matter, rename or duplicate `articles.html` to `blog.html` and change the permalink in that file to `permalink: /blog/`.
If done correctly `/blog` should be a page listing all the site's posts.
If done correctly `/blog/` should be a page listing all of the site's posts.
**ProTip:** To create multiple category pages, listing posts assigned to just that category modify the `for post` loop found in `articles.html` to something like `{{ "{% for post in site.categories.articles " }}%}`. Just be careful if you decide to paginate this page, Jekyll won't limit it to the category and will pull from all of your posts unless you use a plugin or a mess of Liquid if statements.
{: .notice}
#### Post/Page Thumbnails for OG and Twitter Cards