Photo Credit: {{ page.image.credit }}{% endif %}{% endif %}
+ {% if page.image.feature %}{% if page.image.credit %}
Photo Credit: {{ page.image.credit }}
{% endif %}{% endif %}diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000000..da0310f513b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,13 @@ +# editorconfig.org +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false \ No newline at end of file diff --git a/.gitignore b/.gitignore index f60f3093679..5b58b33f89d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,5 @@ _site *.sublime-workspace codekit-config.json node_modules -Gemfile.lock -.sass-cache \ No newline at end of file +.sass-cache +.jekyll-metadata diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index cd4bdd85490..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,13 +0,0 @@ -language: ruby -rvm: - - 2.1 - -before_install: - - export NOKOGIRI_USE_SYSTEM_LIBRARIES=true - -script: - - bundle exec jekyll build --drafts - - bundle exec htmlproof ./_site - -notifications: - email: false diff --git a/404.md b/404.md index 8c84a383e13..74e94d520d1 100644 --- a/404.md +++ b/404.md @@ -3,6 +3,8 @@ layout: page title: "Page Not Found" description: "Page not found. Your pixels are in another canvas." sitemap: false +search_omit: true +permalink: /404.html --- Sorry, but the page you were trying to view does not exist --- perhaps you can try searching for it below. @@ -12,5 +14,5 @@ Sorry, but the page you were trying to view does not exist --- perhaps you can t var GOOG_FIXURL_SITE = '{{ site.url }}' \ No newline at end of file diff --git a/Gemfile b/Gemfile index 963403db904..718d148751a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,6 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -gem 'jekyll' -gem 'jekyll-sitemap' -gem 'octopress', '~> 3.0.0.rc.12' - -group :test do - gem 'html-proofer' -end +gem "jekyll" +gem "jekyll-sitemap" +gem "jekyll-gist" +gem "jekyll-feed" diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000000..9afc35aa713 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,62 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.4.0) + colorator (1.1.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + ffi (1.9.14) + ffi (1.9.14-x64-mingw32) + forwardable-extended (2.6.0) + jekyll (3.2.1) + colorator (~> 1.0) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 3.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (~> 1.7) + safe_yaml (~> 1.0) + jekyll-feed (0.7.0) + jekyll-gist (1.4.0) + octokit (~> 4.2) + jekyll-sass-converter (1.4.0) + sass (~> 3.4) + jekyll-sitemap (0.11.0) + addressable (~> 2.4.0) + jekyll-watch (1.5.0) + listen (~> 3.0, < 3.1) + kramdown (1.12.0) + liquid (3.0.6) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + mercenary (0.3.6) + multipart-post (2.0.0) + octokit (4.3.0) + sawyer (~> 0.7.0, >= 0.5.3) + pathutil (0.14.0) + forwardable-extended (~> 2.6) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) + ffi (>= 0.5.0) + rouge (1.11.1) + safe_yaml (1.0.4) + sass (3.4.22) + sawyer (0.7.0) + addressable (>= 2.3.5, < 2.5) + faraday (~> 0.8, < 0.10) + +PLATFORMS + ruby + x64-mingw32 + +DEPENDENCIES + jekyll + jekyll-feed + jekyll-gist + jekyll-sitemap + +BUNDLED WITH + 1.12.5 diff --git a/README.md b/README.md index ee01de58629..425149ee4d4 100644 --- a/README.md +++ b/README.md @@ -2,16 +2,15 @@ Looking for a simple, responsive, theme for your Jekyll powered blog? Well look no further. Here be **So Simple Theme**, the followup to [**Minimal Mistakes**](http://mmistakes.github.io/minimal-mistakes/) -- by designer slash illustrator [Michael Rose](http://mademistakes.com). -[![Build Status](https://travis-ci.org/mmistakes/so-simple-theme.svg?branch=master)](https://travis-ci.org/mmistakes/so-simple-theme) +## Notable features: -## So Simple Theme is all about: - -* Responsive templates. Looking good on mobile, tablet, and desktop. +* Compatible with Jekyll 3 and GitHub Pages. +* Responsive templates. Looks good on mobile, tablet, and desktop devices. * Gracefully degrading in older browsers. Compatible with Internet Explorer 9+ and all modern browsers. * Minimal embellishments and subtle animations. * Optional large feature images for posts and pages. * [Custom 404 page](http://mmistakes.github.io/so-simple-theme/404.html) to get you started. -* [Simple site search](https://github.com/christian-fei/Simple-Jekyll-Search) +* Basic [search capabilities](https://github.com/mathaywarduk/jekyll-search) * Support for Disqus Comments ![screenshot of So Simple Theme](http://mmistakes.github.io/so-simple-theme/images/so-simple-theme-preview.jpg) @@ -22,9 +21,8 @@ See a [live version of So Simple](http://mmistakes.github.io/so-simple-theme/) h ## Getting Started -So Simple 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. +So Simple takes advantage of Sass and data files to make customizing easier and requires Jekyll 3.x. To learn how to install and use this theme check out the [Setup Guide](http://mmistakes.github.io/so-simple-theme/theme-setup/) for more information. [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/mmistakes/so-simple-theme/trend.png)](https://bitdeli.com/free "Bitdeli Badge") - diff --git a/_config.yml b/_config.yml index 823d882b274..65717757312 100644 --- a/_config.yml +++ b/_config.yml @@ -2,47 +2,49 @@ title: Jesse Stuart locale: en_US -description: +description: logo: site-logo.png search: false -url: - +url: # Jekyll configuration permalink: /:categories/:title/ markdown: kramdown -highlighter: pygments +highlighter: rouge sass: sass_dir: _sass style: compressed gems: - jekyll-sitemap + - jekyll-gist + - jekyll-feed kramdown: + input: GFM auto_ids: true footnote_nr: 1 entity_output: as_char - toc_levels: 1..6 - use_coderay: false + toc_levels: 1..2 + enable_coderay: false -include: [".htaccess"] -exclude: ["lib", "config.rb", "Capfile", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", "*.sublime-workspace", "test", "spec", "Gruntfile.js", "package.json", "node_modules", "Gemfile", "Gemfile.lock", "LICENSE", "README.md", "vendor"] +mathjax: true +include: [".htaccess"] +exclude: ["lib", "config.rb", "Capfile", "config", "log", "Rakefile", "Rakefile.rb", "tmp", ".less", "*.sublime-project", "*.sublime-workspace", "test", "spec", "Gruntfile.js", "package.json", "node_modules", "Gemfile", "Gemfile.lock", "LICENSE", "README.md", "vendor"] # Site owner owner: name: Jesse Stuart avatar: bio-photo.jpg email: jdstuart@icloud.com - # twitter: jesse_stuart - # facebook: jesse.d.stuart github: jessestuart linkedin: jessedstuart - # instagram: jaystu + twitter: jesse_stuart + instagram: jaystu google: analytics: UA-53770919-1 # verify: UQj93ERU9zgECodaaXgVpkjrFn9UrDMEzVamacSoQ8Y # ad-client: ca-pub-7328585512091257 # ad-slot: 7855747535 - # bing-verify: D81F4C18A6CB3018F64D7C827D953DFD \ No newline at end of file + disqus-shortname: diff --git a/_data/authors.yml b/_data/authors.yml index 182a6e69d51..92562924197 100644 --- a/_data/authors.yml +++ b/_data/authors.yml @@ -1,20 +1,11 @@ # Authors -# billy_rick: -# name: Billy Rick -# web: http://thewhip.com -# email: billy@rick.com -# bio: "What do you want, jewels? I am a very extravagant man." -# avatar: bio-photo-2.jpg -# twitter: extravagantman -# google: -# plus: BillyRick -# -# cornelius_fiddlebone: -# name: Cornelius Fiddlebone -# email: cornelius@thewhip.com -# bio: "I ordered what?" -# avatar: bio-photo.jpg -# twitter: rhymeswithsackit -# google: -# plus: CorneliusFiddlebone \ No newline at end of file +jesse: + name: Jesse Stuart + web: http://jessesturat.com + email: jdstuart@icloud.com + bio: "" + avatar: bio-photo-2.jpg + twitter: extravagantman + google: + plus: BillyRick diff --git a/_data/navigation.yml b/_data/navigation.yml index 41a05e05954..3efb43cf85a 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -4,10 +4,10 @@ - title: About url: /about/ - + - title: Publications url: /publications - + - title: Resume url: /images/jesse_stuart-resume(8.13.14).pdf @@ -21,4 +21,4 @@ # url: /theme-setup/ # # - title: Made Mistakes -# url: http://mademistakes.com \ No newline at end of file +# url: http://mademistakes.com diff --git a/_includes/ad-footer.html b/_includes/ad-footer.html index 1628318011c..ff2bc6e00d3 100644 --- a/_includes/ad-footer.html +++ b/_includes/ad-footer.html @@ -1,5 +1,5 @@
Photo Credit: {{ page.image.credit }}{% endif %}{% endif %}
+ {% if page.image.feature %}{% if page.image.credit %}
Photo Credit: {{ page.image.credit }}
{% endif %}{% endif %}