Merge pull request #239 from tripit/update

Bugfixes merged.

Dockerfile

 FROM ubuntu:trusty
 
 RUN apt-get update
-RUN apt-get install -yq ruby ruby-dev build-essential
+RUN apt-get install -yq ruby ruby-dev build-essential git
 RUN gem install --no-ri --no-rdoc bundler
 ADD Gemfile /app/Gemfile
 ADD Gemfile.lock /app/Gemfile.lock
@@ -9,4 +9,4 @@ RUN cd /app; bundle install
 ADD . /app
 EXPOSE 4567
 WORKDIR /app
-CMD ["bundle", "exec", "middleman", "server"]
+CMD ["bundle", "exec", "middleman", "server"]
\ No newline at end of file

Gemfile

-# If you have OpenSSL installed, we recommend updating
-# the following line to use "https"
 source 'http://rubygems.org'
 
-gem "rouge", "1.7.2"
+# Middleman
+gem 'middleman', '~>3.3.10'
+gem 'middleman-gh-pages', '~> 0.0.3'
+gem 'middleman-syntax', '~> 2.0.0'
+gem 'rouge', '~> 1.8.0'
+gem 'redcarpet', '~> 3.2.2'
 
-gem "middleman", "~>3.3.0"
-
-# For syntax highlighting
-gem "middleman-syntax"
-
-# Plugin for middleman to generate Github pages
-gem 'middleman-gh-pages'
-
-# Live-reloading plugin
-gem "middleman-livereload", "~> 3.3.0"
-
-gem 'redcarpet', '~> 3.2.1'
-
-# For faster file watcher updates on Windows:
-gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
-
-# Cross-templating language block fix for Ruby 1.8
-platforms :mri_18 do
-  gem "ruby18_source_location"
-end
-
-gem "rake", "~> 10.4.0"
-
-gem 'therubyracer', :platforms => :ruby
+gem 'rake', '~> 10.4.2'
+gem 'therubyracer', '~> 0.12.1', platforms: :ruby
\ No newline at end of file

Gemfile.lock

 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.1.9)
+    activesupport (4.1.10)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -9,62 +9,57 @@ GEM
       tzinfo (~> 1.1)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    chunky_png (1.3.3)
-    coffee-script (2.3.0)
+    chunky_png (1.3.4)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
-    compass (1.0.1)
+    coffee-script-source (1.9.1.1)
+    compass (1.0.3)
       chunky_png (~> 1.2)
-      compass-core (~> 1.0.1)
+      compass-core (~> 1.0.2)
       compass-import-once (~> 1.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       sass (>= 3.3.13, < 3.5)
-    compass-core (1.0.1)
+    compass-core (1.0.3)
       multi_json (~> 1.0)
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    em-websocket (0.5.1)
-      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
-    eventmachine (1.0.4)
-    execjs (2.2.2)
-    ffi (1.9.6)
+    execjs (2.5.2)
+    ffi (1.9.8)
     haml (4.0.6)
       tilt
     hike (1.2.3)
     hitimes (1.2.2)
     hooks (0.4.0)
       uber (~> 0.0.4)
-    http_parser.rb (0.6.0)
-    i18n (0.6.11)
+    i18n (0.7.0)
     json (1.8.2)
-    kramdown (1.5.0)
+    kramdown (1.7.0)
     libv8 (3.16.14.7)
-    listen (2.8.5)
-      celluloid (>= 0.15.2)
+    listen (2.10.0)
+      celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    middleman (3.3.7)
+    middleman (3.3.11)
       coffee-script (~> 2.2)
       compass (>= 1.0.0, < 2.0.0)
       compass-import-once (= 1.0.5)
       execjs (~> 2.0)
       haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.3.7)
+      middleman-core (= 3.3.11)
       middleman-sprockets (>= 3.1.2)
       sass (>= 3.4.0, < 4.0)
       uglifier (~> 2.5)
-    middleman-core (3.3.7)
+    middleman-core (3.3.11)
       activesupport (~> 4.1.0)
       bundler (~> 1.1)
       erubis
       hooks (~> 0.3)
-      i18n (~> 0.6.9)
+      i18n (~> 0.7.0)
       listen (>= 2.7.9, < 3.0)
       padrino-helpers (~> 0.12.3)
       rack (>= 1.4.5, < 2.0)
@@ -73,11 +68,7 @@ GEM
       tilt (~> 1.4.1, < 2.0)
     middleman-gh-pages (0.0.3)
       rake (> 0.9.3)
-    middleman-livereload (3.3.4)
-      em-websocket (~> 0.5.1)
-      middleman-core (~> 3.2)
-      rack-livereload (~> 0.3.15)
-    middleman-sprockets (3.4.1)
+    middleman-sprockets (3.4.2)
       middleman-core (>= 3.3)
       sprockets (~> 2.12.1)
       sprockets-helpers (~> 1.1.0)
@@ -85,28 +76,25 @@ GEM
     middleman-syntax (2.0.0)
       middleman-core (~> 3.2)
       rouge (~> 1.0)
-    minitest (5.5.1)
-    multi_json (1.10.1)
-    padrino-helpers (0.12.4)
+    minitest (5.6.1)
+    multi_json (1.11.0)
+    padrino-helpers (0.12.5)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.4)
+      padrino-support (= 0.12.5)
       tilt (~> 1.4.1)
-    padrino-support (0.12.4)
+    padrino-support (0.12.5)
       activesupport (>= 3.1)
     rack (1.6.0)
-    rack-livereload (0.3.15)
-      rack
     rack-test (0.6.3)
       rack (>= 1.0)
     rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    redcarpet (3.2.2)
+    redcarpet (3.2.3)
     ref (1.0.5)
-    rouge (1.7.2)
-    ruby18_source_location (0.2)
-    sass (3.4.9)
+    rouge (1.8.0)
+    sass (3.4.13)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -117,18 +105,18 @@ GEM
     sprockets-sass (1.3.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    therubyracer (0.12.1)
+    therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uber (0.0.13)
-    uglifier (2.7.0)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
@@ -136,13 +124,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  middleman (~> 3.3.0)
-  middleman-gh-pages
-  middleman-livereload (~> 3.3.0)
-  middleman-syntax
-  rake (~> 10.4.0)
-  redcarpet (~> 3.2.1)
-  rouge (= 1.7.2)
-  ruby18_source_location
-  therubyracer
-  wdm (~> 0.1.0)
+  middleman (~> 3.3.10)
+  middleman-gh-pages (~> 0.0.3)
+  middleman-syntax (~> 2.0.0)
+  rake (~> 10.4.2)
+  redcarpet (~> 3.2.2)
+  rouge (~> 1.8.0)
+  therubyracer (~> 0.12.1)

README.md

@@ -84,8 +84,10 @@ Examples of Slate in the Wild
 * [Switch Payments Documentation](http://switchpayments.com/docs/) & [API](http://switchpayments.com/developers/)
 * [Coinbase API Reference](https://developers.coinbase.com/api)
 * [Whispir.io API](https://whispir.github.io/api)
-* [Nasa API](https://data.nasa.gov/developer/external/planetary/)
+* [NASA API](https://data.nasa.gov/developer/external/planetary/)
 * [CardPay API](https://developers.cardpay.com/)
+* [IBM Cloudant](https://docs-testb.cloudant.com/content-review/_design/couchapp/index.html)
+* [Bitrix basis components](http://bbc.bitrix.expert/)
 
 (Feel free to add your site to this list in a pull request!)
 

config.rb

+# Markdown
+set :markdown_engine, :redcarpet
+set :markdown,
+    fenced_code_blocks: true,
+    smartypants: true,
+    disable_indented_code_blocks: true,
+    prettify: true,
+    tables: true,
+    with_toc_data: true,
+    no_intra_emphasis: true
+
+# Assets
 set :css_dir, 'stylesheets'
-
 set :js_dir, 'javascripts'
-
 set :images_dir, 'images'
-
 set :fonts_dir, 'fonts'
 
-set :markdown_engine, :redcarpet
-
-set :markdown, :fenced_code_blocks => true, :smartypants => true, :disable_indented_code_blocks => true, :prettify => true, :tables => true, :with_toc_data => true, :no_intra_emphasis => true
-
 # Activate the syntax highlighter
 activate :syntax
 
-# This is needed for Github pages, since they're hosted on a subdomain
+# Github pages require relative links
 activate :relative_assets
 set :relative_links, true
 
-# Build-specific configuration
+# Build Configuration
 configure :build do
-  # For example, change the Compass output style for deployment
   activate :minify_css
-
-  # Minify Javascript on build
   activate :minify_javascript
-
-  # Enable cache buster
-  # activate :asset_hash
-
-  # Use relative URLs
   # activate :relative_assets
-
-  # Or use a different image path
-  # set :http_prefix, "/Content/images/"
+  # activate :asset_hash
+  # activate :gzip
 end
-

source/index.md

@@ -55,7 +55,7 @@ Kittn expects for the API key to be included in all API requests to the server i
 `Authorization: meowmeowmeow`
 
 <aside class="notice">
-You must replace `meowmeowmeow` with your personal API key.
+You must replace <code>meowmeowmeow</code> with your personal API key.
 </aside>
 
 # Kittens

source/javascripts/app/lang.js

@@ -14,6 +14,8 @@ License for the specific language governing permissions and limitations
 under the License.
 */
 (function (global) {
+  'use strict';
+
   var languages = [];
 
   global.setupLanguages = setupLanguages;
@@ -26,9 +28,9 @@ under the License.
     $(".lang-selector a").removeClass('active');
     $(".lang-selector a[data-language-name='" + language + "']").addClass('active');
     for (var i=0; i < languages.length; i++) {
-      $(".highlight." + languages[i]).parent().hide();
+      $(".highlight." + languages[i]).hide();
     }
-    $(".highlight." + language).parent().show();
+    $(".highlight." + language).show();
 
     global.toc.calculateHeights();
 

source/javascripts/app/search.js

 (function (global) {
+  'use strict';
 
   var $global = $(global);
   var content, darkBox, searchResults;
@@ -49,7 +50,8 @@
       if (results.length) {
         searchResults.empty();
         $.each(results, function (index, result) {
-          searchResults.append("<li><a href='#" + result.ref + "'>" + $('#'+result.ref).text() + "</a></li>");
+          var elem = document.getElementById(result.ref);
+          searchResults.append("<li><a href='#" + result.ref + "'>" + $(elem).text() + "</a></li>");
         });
         highlight.call(this);
       } else {

source/javascripts/app/toc.js

 (function (global) {
+  'use strict';
 
   var closeToc = function() {
     $(".tocify-wrapper").removeClass('open');

source/layouts/layout.erb

@@ -24,7 +24,7 @@ under the License.
 
     <%= stylesheet_link_tag :screen, media: :screen %>
     <%= stylesheet_link_tag :print, media: :print %>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
     <% if current_page.data.search %>
       <%= javascript_include_tag  "all" %>
     <% else %>