Compare commits

..
9 Commits
Author SHA1 Message Date
Michael Rose 6d2a62774b Merge pull request #182 from YNedderhoff/experimental
Remove navigation role as it is unnecessary
2016-02-20 22:54:32 -05:00
Michael Rose 7142a54650 Support Jekyll 3.0
- Update to Jekyll v3.0
- Switch from Pygments.rb to Rouge for syntax highlighting
- Minor updates to syntax.scss partial and theme documentation
- Include jekyll-gist gem
- Close #192, #218
2016-02-01 21:30:49 -05:00
Michael Rose e5ba10ee7d Merge pull request #216 from localstatic/setup-doc-fix
Fix typo in `bundle exec` command
2016-01-28 10:46:09 -05:00
Morgan Terry 19806e1eb6 Fix typo in bundle exec command 2016-01-27 22:29:56 -07:00
Michael Rose 6c71841425 Increase width of main content container 2016-01-19 21:56:51 -05:00
Michael Rose 5a69e71df9 Update links
- Remove Made Mistakes from header nav
- Update MM footer link
2016-01-19 21:10:58 -05:00
Michael Rose 4b99152c7d Update dependencies 2016-01-19 21:07:42 -05:00
Michael Rose fdad24cec9 Update Octopress config
- Remove _octopress.yml and move settings into _config.yml as per Octopress' documentation
- Close #163
2016-01-19 21:07:30 -05:00
YNedderhoff dbf44d066d Remove navigation role as it is unnecessary 2015-09-09 13:54:23 +02:00
14 changed files with 88 additions and 91 deletions
+2 -1
View File
@@ -5,4 +5,5 @@ _site
*.sublime-workspace
codekit-config.json
node_modules
_asset_bundler_cache
_asset_bundler_cache
.jekyll-metadata
+4 -3
View File
@@ -1,5 +1,6 @@
source "https://rubygems.org"
gem 'jekyll', '2.5.3'
gem 'jekyll-sitemap'
gem 'octopress', '~> 3.0'
gem "jekyll", "~> 3.0"
gem "jekyll-sitemap"
gem "jekyll-gist"
gem "octopress"
+32 -48
View File
@@ -1,49 +1,36 @@
GEM
remote: https://rubygems.org/
specs:
blankslate (2.1.2.4)
classifier-reborn (2.0.4)
fast-stemmer (~> 1.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
addressable (2.3.8)
colorator (0.1)
execjs (2.6.0)
fast-stemmer (1.0.2)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
ffi (1.9.10-x64-mingw32)
ffi (1.9.10-x86-mingw32)
jekyll (2.5.3)
classifier-reborn (~> 2.0)
jekyll (3.1.1)
colorator (~> 0.1)
jekyll-coffeescript (~> 1.0)
jekyll-gist (~> 1.0)
jekyll-paginate (~> 1.0)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
liquid (~> 2.6.1)
liquid (~> 3.0)
mercenary (~> 0.3.3)
pygments.rb (~> 0.6.0)
redcarpet (~> 3.1)
rouge (~> 1.7)
safe_yaml (~> 1.0)
toml (~> 0.1.0)
jekyll-coffeescript (1.0.1)
coffee-script (~> 2.2)
jekyll-gist (1.3.5)
jekyll-paginate (1.1.0)
jekyll-sass-converter (1.3.0)
sass (~> 3.2)
jekyll-sitemap (0.9.0)
jekyll-watch (1.3.0)
jekyll-gist (1.4.0)
octokit (~> 4.2)
jekyll-sass-converter (1.4.0)
sass (~> 3.4)
jekyll-sitemap (0.10.0)
jekyll-watch (1.3.1)
listen (~> 3.0)
kramdown (1.9.0)
liquid (2.6.3)
listen (3.0.4)
liquid (3.0.6)
listen (3.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
mercenary (0.3.5)
multipart-post (2.0.0)
octokit (4.2.0)
sawyer (~> 0.6.0, >= 0.5.3)
octopress (3.0.11)
jekyll (>= 2.0)
mercenary (~> 0.3.2)
@@ -54,33 +41,30 @@ GEM
titlecase
octopress-deploy (1.3.0)
colorator
octopress-escape-code (2.0.6)
octopress-hooks (~> 2.0)
octopress-escape-code (2.1.1)
jekyll (~> 3.0)
octopress-hooks (2.6.1)
jekyll (>= 2.0)
parslet (1.5.0)
blankslate (~> 2.0)
posix-spawn (0.3.11)
pygments.rb (0.6.3)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.2.0)
rb-fsevent (0.9.6)
rb-fsevent (0.9.7)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
redcarpet (3.3.3)
redcarpet (3.3.4)
rouge (1.10.1)
safe_yaml (1.0.4)
sass (3.4.19)
sass (3.4.21)
sawyer (0.6.0)
addressable (~> 2.3.5)
faraday (~> 0.8, < 0.10)
titlecase (0.1.1)
toml (0.1.2)
parslet (~> 1.5.0)
yajl-ruby (1.2.1)
PLATFORMS
ruby
x64-mingw32
x86-mingw32
DEPENDENCIES
jekyll (= 2.5.3)
jekyll (~> 3.0)
jekyll-gist
jekyll-sitemap
octopress (~> 3.0)
octopress
BUNDLED WITH
1.11.2
+2 -4
View File
@@ -1,8 +1,6 @@
# Minimal Mistakes
**[Minimal Mistakes](http://mmistakes.github.io/minimal-mistakes)** is a two column responsive Jekyll theme perfect for powering your GitHub hosted blog.
**Jekyll 3 Update:** A version of Minimal Mistakes compatible with Jekyll 3 can be found in the [`jekyll3` branch](https://github.com/mmistakes/minimal-mistakes/tree/jekyll3). GitHub Pages is [locked at version 2.4](https://pages.github.com/versions/) so some keep that in mind if you're trying to use 3.0 features that aren't supported there yet.
**[Minimal Mistakes](http://mmistakes.github.io/minimal-mistakes)** is a two column responsive Jekyll theme perfect for powering your GitHub hosted blog built. Compatible with Jekyll 3.0 and up.
## Minimal Mistakes is all about:
@@ -20,6 +18,6 @@ See a [live version of Minimal Mistakes](http://mmistakes.github.io/minimal-mist
## Getting Started
Minimal Mistakes takes advantage of Sass and data files to make customizing easier. These features require Jekyll 2.x and will not work with older versions of Jekyll.
Minimal Mistakes takes advantage of Sass and data files to make customizing easier. These features require [Jekyll 2.x](https://github.com/mmistakes/minimal-mistakes/releases/tag/2.1.3) and will not work with older versions of Jekyll.
To learn how to install and use this theme check out the [Setup Guide](http://mmistakes.github.io/minimal-mistakes/theme-setup/) for more information.
+17 -2
View File
@@ -9,19 +9,34 @@ url:
permalink: /:categories/:title/
markdown: kramdown
highlighter: pygments
highlighter: rouge
sass:
sass_dir: _sass
style: compressed
gems:
- jekyll-sitemap
- jekyll-gist
kramdown:
auto_ids: true
footnote_nr: 1
entity_output: as_char
toc_levels: 1..6
use_coderay: false
enable_coderay: false
# Octopress
# Default extensions
post_ext: md
page_ext: md
# Found in _templates/
post_layout: post
page_layout: page
# Format titles with titlecase?
titlecase: true
# Site owner
+1 -4
View File
@@ -7,7 +7,4 @@
url: /posts/
- title: Theme Setup
url: /theme-setup/
- title: Made Mistakes
url: http://mademistakes.com
url: /theme-setup/
+1 -1
View File
@@ -12,4 +12,4 @@
</div><!-- /.google-ads -->
{% endif %}
<span>&copy; {{ site.time | date: '%Y' }} {{ site.owner.name }}. Powered by <a href="http://jekyllrb.com" rel="nofollow">Jekyll</a> using the <a href="http://mademistakes.com/minimal-mistakes/" rel="nofollow">Minimal Mistakes</a> theme.</span>
<span>&copy; {{ site.time | date: '%Y' }} {{ site.owner.name }}. Powered by <a href="http://jekyllrb.com" rel="nofollow">Jekyll</a> using the <a href="https://mademistakes.com/work/minimal-mistakes-jekyll-theme/" rel="nofollow">Minimal Mistakes</a> theme.</span>
+2 -2
View File
@@ -3,7 +3,7 @@
<a href="{{ site.url }}/">{{ site.title }}</a>
</div><!-- /.site-name -->
<div class="top-navigation">
<nav role="navigation" id="site-nav" class="nav">
<nav id="site-nav" class="nav">
<ul>
{% for link in site.data.navigation %}
{% if link.url contains 'http' %}
@@ -16,4 +16,4 @@
</ul>
</nav>
</div><!-- /.top-navigation -->
</div><!-- /.navigation-wrapper -->
</div><!-- /.navigation-wrapper -->
-10
View File
@@ -1,10 +0,0 @@
# Default extensions
post_ext: md
page_ext: md
# Found in _templates/
post_layout: post
page_layout: page
# Format titles with titlecase?
titlecase: true
+4 -4
View File
@@ -3,7 +3,7 @@ layout: post
title: Syntax Highlighting Post
excerpt: "Demo post displaying the various ways of highlighting code in Markdown."
tags: [sample post, code, highlighting]
modified: 2014-09-14
modified: 2016-02-01
comments: true
---
@@ -11,9 +11,9 @@ Syntax highlighting is a feature that displays source code, in different colors
[^1]: <http://en.wikipedia.org/wiki/Syntax_highlighting>
### Pygments Code Blocks
### Highlighted Code Blocks
To modify styling and highlight colors edit `/_sass/_pygments.scss`.
To modify styling and highlight colors edit `/_sass/syntax.scss`.
{% highlight css %}
#container {
@@ -73,7 +73,7 @@ end
### Fenced Code Blocks
To modify styling and highlight colors edit `/_sass/_coderay.scss`. Line numbers and a few other things can be modified in `_config.yml`. Consult [Jekyll's documentation](http://jekyllrb.com/docs/configuration/) for more information.
To modify styling and highlight colors edit `/_sass/coderay.scss`. Line numbers and a few other things can be modified in `_config.yml`. Consult [Jekyll's documentation](http://jekyllrb.com/docs/configuration/) for more information.
~~~ css
#container {
+10 -4
View File
@@ -234,12 +234,15 @@ $button-size: 1.5rem;
@include suffix(12,1);
margin-bottom: 2em;
@media #{$small} {
@include grid(12,6);
@include grid(12,8);
@include prefix(12,0);
@include suffix(12,0);
}
@media #{$large} {
@include grid(12,6);
}
@media #{$x-large} {
@include grid(12,4.5);
@include grid(12,5);
}
}
}
@@ -252,12 +255,15 @@ $button-size: 1.5rem;
@include suffix(12,1);
margin-bottom: 2em;
@media #{$small} {
@include grid(12,6);
@include grid(12,8);
@include prefix(12,0);
@include suffix(12,0);
}
@media #{$large} {
@include grid(12,6);
}
@media #{$x-large} {
@include grid(12,4.5);
@include grid(12,5);
}
h3 {
margin: 0;
+7 -2
View File
@@ -1,11 +1,16 @@
/* ==========================================================================
Pygments.rb syntax highlighting
Syntax highlighting
========================================================================== */
pre.highlight {
padding: 1em;
}
.highlight {
background-color: #efefef;
font-family: $code-font;
@include font(12);
@include font-rem(12);
line-height: 1.5;
color: #333332;
margin-bottom: 1.5em;
@include rounded(4px);
+1 -1
View File
@@ -18,7 +18,7 @@ sitemap: false
@import "normalize";
@import "site";
@import "typography";
@import "pygments";
@import "syntax";
@import "coderay";
@import "elements";
@import "forms";
+5 -5
View File
@@ -1,7 +1,7 @@
---
layout: page
title: Theme Setup
modified: 2014-07-31T13:23:02.362000-04:00
modified: 2016-01-19
excerpt: "Instructions on how to install and customize the Jekyll theme Minimal Mistakes."
image:
feature: sample-image-3.jpg
@@ -13,7 +13,7 @@ image:
## Installation
Minimal Mistakes now requires [Jekyll](http://jekyllrb.com/) 2.2+. Make sure to run `gem update jekyll` if you aren't on the latest version or `gem install jekyll` if this is your first time installing it.
Minimal Mistakes now requires [Jekyll](http://jekyllrb.com/) 3.0. Make sure to run `bundle update` if you aren't on the latest version to update all gem dependencies.
If you are creating a new Jekyll site using Minimal Mistakes follow these steps:
@@ -38,7 +38,7 @@ If you want to use Minimal Mistakes with an existing Jekyll site follow these st
## Running Jekyll
If `jekyll build` and `jekyll serve` throw errors you may have to run Jekyll with `bundled exec` instead.
The preferred method for running Jekyll is with `bundle exec`, but if you're willing to deal gem conflicts feel free to go cowboy with a `jekyll build` or `jekyll serve`.
> In some cases, running executables without bundle exec may work, if the executable happens to be installed in your system and does not pull in any gems that conflict with your bundle.
>
@@ -145,7 +145,7 @@ To set what links appear in the top navigation edit `_data/navigation.yml`. Use
While completely optional, I've included Octopress and some starter templates to automate the creation of new posts and pages. To take advantage of it start by installing the [Octopress](https://github.com/octopress/octopress) gem if it isn't already.
{% highlight bash %}
$ gem install octopress --pre
$ gem install octopress
{% endhighlight %}
### New Post
@@ -159,7 +159,7 @@ $ octopress new post "Post Title"
Default works great if you want all your posts in one directory, but if you're like me and want to group them into subfolders like `/posts`, `/portfolio`, etc. Then this is the command for you. By specifying the DIR it will create a new post in that folder and populate the `categories:` YAML with the same value.
{% highlight bash %}
$ octopress new post "New Post Title" --dir posts
$ octopress new post "New Portfolio Post Title" --dir portfolio
{% endhighlight %}
### New Page