Merge branch 'hotfix/documentation' into develop

Conflicts:
	assets/js/scripts.min.js
This commit is contained in:
Michael Rose 2013-09-12 08:37:13 -04:00
commit cbe1f91b44
4 changed files with 7 additions and 11 deletions

View file

@ -14,8 +14,9 @@ Looking for a simple, responsive, theme for your Jekyll powered blog? Well look
* 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.
* Simple search.
* Simple search that overlays results based on post title.
* Grunt build script for easier theme development.
* [Sitemap](https://github.com/mmistakes/so-simple-theme/blob/master/sitemap.xml) for search engines
![screenshot of So Simple Theme](http://mmistakes.github.io/so-simple-theme/images/so-simple-theme-preview.jpg)

View file

@ -24,8 +24,9 @@ Looking for a simple, responsive, theme for your Jekyll powered blog? Well look
* 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.
* Simple search.
* Grunt build script for easier theme development.
* Simple search that overlays results based on post title.
* [Grunt build script]({{ site.url }}/theme-setup/index.html#theme-development) for easier theme development.
* [Sitemap](https://github.com/mmistakes/so-simple-theme/blob/master/sitemap.xml) for search engines
<a markdown="0" href="{{ site.url }}/theme-setup" class="btn">Install Minimal Mistakes Theme</a>

View file

@ -206,13 +206,7 @@ var responsiveNav = (function (window, document) {
addClass(nav, "closed");
setAttributes(nav, {"aria-hidden": "true"});
if (opts.animate) {
setTimeout(function () {
nav.style.position = "absolute";
}, opts.transition + 10);
} else {
nav.style.position = "absolute";
}
navOpen = false;
opts.close();

File diff suppressed because one or more lines are too long