Merge remote-tracking branch 'tripit/master'

Author: Sarah Kowalik

.gitignore

@@ -34,3 +34,4 @@ tmp
 .yardoc
 _yardoc
 doc/
+.idea/

CHANGELOG.md

@@ -0,0 +1,30 @@
+# Changelog
+
+## Version 1.1
+
+*July 27th, 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

CONTRIBUTING.md

@@ -0,0 +1,9 @@
+# Contributing to Slate
+
+Thanks for contributing to Slate! A couple of quick guidelines for submitting PRs:
+
+- Please point your pull requests at the `dev` branch, and keep your commit messages clear and informative.
+- 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.

Dockerfile

@@ -0,0 +1,12 @@
+FROM ubuntu:trusty
+
+RUN apt-get update
+RUN apt-get install -yq ruby ruby-dev build-essential
+RUN gem install --no-ri --no-rdoc bundler
+ADD Gemfile /app/Gemfile
+ADD Gemfile.lock /app/Gemfile.lock
+RUN cd /app; bundle install
+ADD . /app
+EXPOSE 4567
+WORKDIR /app
+CMD ["bundle", "exec", "middleman", "server"]

Gemfile

@@ -2,7 +2,7 @@
 # the following line to use "https"
 source 'http://rubygems.org'
 
-gem "middleman", "~>3.2.0"
+gem "middleman", "~>3.3.0"
 
 # For syntax highlighting
 gem "middleman-syntax"
@@ -11,7 +11,7 @@ gem "middleman-syntax"
 gem 'middleman-gh-pages'
 
 # Live-reloading plugin
-gem "middleman-livereload", "~> 3.1.0"
+gem "middleman-livereload", "~> 3.3.0"
 
 gem 'redcarpet', '~> 3.1.1'
 
@@ -23,9 +23,8 @@ platforms :mri_18 do
   gem "ruby18_source_location"
 end
 
-gem "rake", "~> 10.1.0"
+gem "rake", "~> 10.3.0"
 
-gem 'execjs'
 gem 'therubyracer', :platforms => :ruby
 
 gem 'nokogiri'

Gemfile.lock

@@ -1,29 +1,36 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.17)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+    activesupport (4.0.4)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
     chunky_png (1.3.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
-    compass (0.12.4)
+    compass (0.12.6)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (~> 3.2.17)
+      sass (~> 3.2.19)
+    compass-import-once (1.0.4)
+      sass (>= 3.2, < 3.5)
     em-websocket (0.5.0)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.5.3)
+    erubis (2.7.0)
     eventmachine (1.0.3)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.0.2)
     ffi (1.9.3)
     fssm (0.2.10)
     haml (4.0.5)
       tilt
     hike (1.2.3)
+    hooks (0.4.0)
+      uber (~> 0.0.4)
     http_parser.rb (0.5.3)
     i18n (0.6.9)
     json (1.8.1)
@@ -33,90 +40,102 @@ GEM
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    middleman (3.2.2)
+    middleman (3.3.2)
       coffee-script (~> 2.2.0)
-      compass (>= 0.12.2)
-      execjs (~> 1.4.0)
-      haml (>= 3.1.6)
+      compass (>= 0.12.4)
+      compass-import-once (~> 1.0.4)
+      execjs (~> 2.0)
+      haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.2.2)
+      middleman-core (= 3.3.2)
       middleman-sprockets (>= 3.1.2)
-      sass (>= 3.1.20)
-      uglifier (~> 2.4.0)
-    middleman-core (3.2.2)
-      activesupport (~> 3.2.6)
+      sass (>= 3.2.17, < 4.0)
+      uglifier (~> 2.5)
+    middleman-core (3.3.2)
+      activesupport (~> 4.0.1)
       bundler (~> 1.1)
+      erubis
+      hooks (~> 0.3)
       i18n (~> 0.6.9)
       listen (~> 1.1)
-      rack (>= 1.4.5)
-      rack-test (~> 0.6.1)
+      padrino-helpers (~> 0.12.1)
+      rack (>= 1.4.5, < 2.0)
+      rack-test (~> 0.6.2)
       thor (>= 0.15.2, < 2.0)
-      tilt (~> 1.4.1)
+      tilt (~> 1.4.1, < 2.0)
     middleman-gh-pages (0.0.3)
       rake (> 0.9.3)
-    middleman-livereload (3.1.1)
-      em-websocket (>= 0.2.0)
-      middleman-core (>= 3.0.2)
-      multi_json (~> 1.0)
-      rack-livereload
-    middleman-sprockets (3.3.1)
+    middleman-livereload (3.3.2)
+      em-websocket (~> 0.5.0)
+      middleman-core (~> 3.2)
+      rack-livereload (~> 0.3.15)
+    middleman-sprockets (3.3.3)
       middleman-core (>= 3.2)
-      sprockets (~> 2.1)
-      sprockets-helpers (~> 1.0.0)
-      sprockets-sass (~> 1.0.0)
+      sprockets (~> 2.2)
+      sprockets-helpers (~> 1.1.0)
+      sprockets-sass (~> 1.1.0)
     middleman-syntax (2.0.0)
       middleman-core (~> 3.2)
       rouge (~> 1.0)
     mini_portile (0.6.0)
+    minitest (4.7.5)
     multi_json (1.9.2)
-    nokogiri (1.6.2.1)
+    nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
+    padrino-helpers (0.12.1)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.12.1)
+      tilt (~> 1.4.1)
+    padrino-support (0.12.1)
+      activesupport (>= 3.1)
     rack (1.5.2)
     rack-livereload (0.3.15)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.1.1)
+    rake (10.3.1)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.2)
       ffi (>= 0.5.0)
-    redcarpet (3.1.1)
+    redcarpet (3.1.2)
     ref (1.0.5)
     rouge (1.3.3)
     ruby18_source_location (0.2)
-    sass (3.2.17)
-    sprockets (2.12.0)
+    sass (3.2.19)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-helpers (1.0.1)
+    sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
-    sprockets-sass (1.0.3)
+    sprockets-sass (1.1.0)
       sprockets (~> 2.0)
       tilt (~> 1.1)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
-    thor (0.18.1)
+    thor (0.19.1)
+    thread_safe (0.3.3)
     tilt (1.4.1)
-    uglifier (2.4.0)
+    tzinfo (0.3.39)
+    uber (0.0.4)
+    uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  execjs
-  middleman (~> 3.2.0)
+  middleman (~> 3.3.0)
   middleman-gh-pages
-  middleman-livereload (~> 3.1.0)
+  middleman-livereload (~> 3.3.0)
   middleman-syntax
   nokogiri
-  rake (~> 10.1.0)
+  rake (~> 10.3.0)
   redcarpet (~> 3.1.1)
   ruby18_source_location
   therubyracer

config.rb

@@ -1,3 +1,5 @@
+require './lib/redcarpet_header_fix'
+
 set :css_dir, 'stylesheets'
 
 set :js_dir, 'javascripts'
@@ -49,3 +51,4 @@
   # Or use a different image path
   # set :http_prefix, "/Content/images/"
 end
+

lib/redcarpet_header_fix.rb

@@ -0,0 +1,9 @@
+module RedcarpetHeaderFix
+  def header(text, level)
+    clean_id = text.downcase.gsub(/( +|\.+)/, '-').gsub(/[^a-zA-Z0-9\-_]/, '')
+    "<h#{level} id='#{clean_id}'>#{text}</h#{level}>"
+  end
+end
+
+require 'middleman-core/renderers/redcarpet'
+Middleman::Renderers::MiddlemanRedcarpetHTML.send :include, RedcarpetHeaderFix