Merge.

.gitignore

@@ -1,5 +1,24 @@
-_site
+*.gem
+*.rbc
+.bundle
+.config
+coverage
+InstalledFiles
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.DS_STORE
+build/
+.cache
+.vagrant
 .sass-cache
-.jekyll-metadata
-.imdone/
-.todo
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/
+.idea/

.travis.yml

@@ -0,0 +1,10 @@
+sudo: false
+
+language: ruby
+
+rvm:
+  - 2.0.0
+  - 2.1.0
+
+cache: bundler
+script: bundle exec middleman build

CHANGELOG.md

@@ -0,0 +1,69 @@
+# Changelog
+
+## Version 1.3.2
+
+*February 3, 2016*
+
+A small bugfix for slightly incorrect background colors on code samples in some cases.
+
+## Version 1.3.1
+
+*January 31, 2016*
+
+A small bugfix for incorrect whitespace in code blocks.
+
+## Version 1.3
+
+*January 27, 2016*
+
+We've upgraded Middleman and a number of other dependencies, which should fix quite a few bugs.
+
+Instead of `rake build` and `rake deploy`, you should now run `bundle exec middleman build --clean` to build your server, and `./deploy.sh` to deploy it to Github Pages.
+
+## Version 1.2
+
+*June 20, 2015*
+
+**Fixes:**
+
+- Remove crash on invalid languages
+- Update Tocify to scroll to the highlighted header in the Table of Contents
+- Fix variable leak and update search algorithms
+- Update Python examples to be valid Python
+- Update gems
+- More misc. bugfixes of Javascript errors
+- Add Dockerfile
+- Remove unused gems
+- Optimize images, fonts, and generated asset files
+- Add chinese font support
+- Remove RedCarpet header ID patch
+- Update language tabs to not disturb existing query strings
+
+## Version 1.1
+
+*July 27, 2014*
+
+**Fixes:**
+
+- Finally, a fix for the redcarpet upgrade bug
+
+## Version 1.0
+
+*July 2, 2014*
+
+[View Issues](https://github.com/tripit/slate/issues?milestone=1&state=closed)
+
+**Features:**
+
+- Responsive designs for phones and tablets
+- Started tagging versions
+
+**Fixes:**
+
+- Fixed 'unrecognized expression' error
+- Fixed #undefined hash bug
+- Fixed bug where the current language tab would be unselected
+- Fixed bug where tocify wouldn't highlight the current section while searching
+- Fixed bug where ids of header tags would have special characters that caused problems
+- Updated layout so that pages with disabled search wouldn't load search.js
+- Cleaned up Javascript

CNAME

@@ -1 +1 @@
-whitestormjs.xyz
+whitestormjs.xyz

CONTRIBUTING.md

@@ -0,0 +1,16 @@
+# Before You Submit an Issue
+
+- Are you using Windows? We unfortunately don't support Windows. You could try using Docker, as outlined in the `README`.
+- Is your version of Slate out of date? We have [upgrade instructions](https://github.com/tripit/slate/wiki/Updating-Slate) in the wiki. You could also try seeing if your problem is reproducible on the latest version of Slate.
+
+If you answered "no" to each of the questions above, feel free to submit an issue! It's also helpful if you include a code example of your problem (if applicable), we can't help you if you just say "Slate stopped loading for me once I added my documentation" without telling us the problematic documentation.
+
+# Before You Submit a Pull Request
+
+Thanks for contributing to Slate! A couple of quick guidelines for submitting pull requests:
+
+- **Please point your pull requests at the `dev` branch.** We don't accept pull requests to `master`.
+- Please make sure your contributions work in the most recent version of Chrome, Firefox, and IE.
+- If you're implementing a new feature, even if it's relatively small, it's nice to open an issue before you start so that others know what you're working on and can help make sure you're on the right track.
+
+Thanks again! Happy coding.

Gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+# Middleman
+gem 'middleman', '~>4.0.0'
+gem 'middleman-gh-pages', '~> 0.0.3'
+gem 'middleman-syntax', '~> 2.1.0'
+gem 'middleman-autoprefixer', '~> 2.7.0'
+gem "middleman-sprockets", "~> 4.0.0.rc"
+gem 'rouge', '~> 1.10.1'
+gem 'redcarpet', '~> 3.3.2'

Gemfile.lock

@@ -0,0 +1,138 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.5.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.4.0)
+    autoprefixer-rails (6.3.1)
+      execjs
+      json
+    backports (3.6.7)
+    capybara (2.5.0)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.10.0)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
+    concurrent-ruby (0.9.2)
+    contracts (0.12.0)
+    erubis (2.7.0)
+    execjs (2.6.0)
+    fastimage (1.8.1)
+      addressable (~> 2.3, >= 2.3.5)
+    ffi (1.9.10)
+    ffi (1.9.10-x86-mingw32)
+    haml (4.0.7)
+      tilt
+    hamster (2.0.0)
+      concurrent-ruby (~> 0.8)
+    hashie (3.4.3)
+    i18n (0.7.0)
+    json (1.8.3)
+    kramdown (1.9.0)
+    listen (3.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    middleman (4.0.0)
+      coffee-script (~> 2.2)
+      compass-import-once (= 1.0.5)
+      haml (>= 4.0.5)
+      kramdown (~> 1.2)
+      middleman-cli (= 4.0.0)
+      middleman-core (= 4.0.0)
+      sass (>= 3.4.0, < 4.0)
+    middleman-autoprefixer (2.7.0)
+      autoprefixer-rails (>= 6.3.1, < 7.0.0)
+      middleman-core (>= 3.3.3)
+    middleman-cli (4.0.0)
+      thor (>= 0.17.0, < 2.0)
+    middleman-core (4.0.0)
+      activesupport (~> 4.2)
+      addressable (~> 2.4.0)
+      backports (~> 3.6)
+      bundler (~> 1.1)
+      capybara (~> 2.5.0)
+      contracts (~> 0.12.0)
+      erubis
+      execjs (~> 2.0)
+      fastimage (~> 1.8)
+      hamster (~> 2.0)
+      hashie (~> 3.4)
+      i18n (~> 0.7.0)
+      listen (~> 3.0)
+      padrino-helpers (~> 0.13.0)
+      rack (>= 1.4.5, < 2.0)
+      sass (>= 3.4)
+      tilt (~> 1.4.1)
+      uglifier (~> 2.6)
+    middleman-gh-pages (0.0.3)
+      rake (> 0.9.3)
+    middleman-sprockets (4.0.0.rc.1)
+      middleman-core (>= 4.0.0.rc.1)
+      sprockets (~> 3.0)
+    middleman-syntax (2.1.0)
+      middleman-core (>= 3.2)
+      rouge (~> 1.0)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2015.1120)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.7.2-x86-mingw32)
+      mini_portile2 (~> 2.0.0.rc2)
+    padrino-helpers (0.13.1)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.13.1)
+      tilt (~> 1.4.1)
+    padrino-support (0.13.1)
+      activesupport (>= 3.1)
+    rack (1.6.4)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rake (10.4.2)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    redcarpet (3.3.4)
+    rouge (1.10.1)
+    sass (3.4.21)
+    sprockets (3.4.1)
+      rack (> 1, < 3)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (1.4.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uglifier (2.7.2)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+  x86-mingw32
+
+DEPENDENCIES
+  middleman (~> 4.0.0)
+  middleman-autoprefixer (~> 2.7.0)
+  middleman-gh-pages (~> 0.0.3)
+  middleman-sprockets (~> 4.0.0.rc)
+  middleman-syntax (~> 2.1.0)
+  redcarpet (~> 3.3.2)
+  rouge (~> 1.10.1)
+
+BUNDLED WITH
+   1.11.2

LICENSE

@@ -0,0 +1,13 @@
+Copyright 2008-2013 Concur Technologies, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may
+not use this file except in compliance with the License. You may obtain
+a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.