Merge pull request #124 from tripit/dev

Update gems and new markup styling issue.

All done, thanks Robert!

Gemfile.lock

 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.0.4)
+    activesupport (4.1.7)
       i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    chunky_png (1.3.0)
-    coffee-script (2.2.0)
+      tzinfo (~> 1.1)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    chunky_png (1.3.3)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
-    compass (0.12.6)
+    coffee-script-source (1.8.0)
+    compass (1.0.1)
       chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.2.19)
-    compass-import-once (1.0.4)
+      compass-core (~> 1.0.1)
+      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)
+      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.0)
+    em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.5.3)
+      http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
     eventmachine (1.0.3)
-    execjs (2.0.2)
-    ffi (1.9.3)
-    fssm (0.2.10)
+    execjs (2.2.2)
+    ffi (1.9.6)
     haml (4.0.5)
       tilt
     hike (1.2.3)
+    hitimes (1.2.2)
     hooks (0.4.0)
       uber (~> 0.0.4)
-    http_parser.rb (0.5.3)
-    i18n (0.6.9)
+    http_parser.rb (0.6.0)
+    i18n (0.6.11)
     json (1.8.1)
-    kramdown (1.3.3)
-    libv8 (3.16.14.3)
-    listen (1.3.1)
+    kramdown (1.5.0)
+    libv8 (3.16.14.7)
+    listen (2.7.11)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    middleman (3.3.2)
-      coffee-script (~> 2.2.0)
-      compass (>= 0.12.4)
-      compass-import-once (~> 1.0.4)
+    middleman (3.3.6)
+      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.2)
+      middleman-core (= 3.3.6)
       middleman-sprockets (>= 3.1.2)
-      sass (>= 3.2.17, < 4.0)
+      sass (>= 3.4.0, < 4.0)
       uglifier (~> 2.5)
-    middleman-core (3.3.2)
-      activesupport (~> 4.0.1)
+    middleman-core (3.3.6)
+      activesupport (~> 4.1.0)
       bundler (~> 1.1)
       erubis
       hooks (~> 0.3)
       i18n (~> 0.6.9)
-      listen (~> 1.1)
-      padrino-helpers (~> 0.12.1)
+      listen (>= 2.7.9, < 3.0)
+      padrino-helpers (~> 0.12.3)
       rack (>= 1.4.5, < 2.0)
       rack-test (~> 0.6.2)
       thor (>= 0.15.2, < 2.0)
       tilt (~> 1.4.1, < 2.0)
     middleman-gh-pages (0.0.3)
       rake (> 0.9.3)
-    middleman-livereload (3.3.2)
-      em-websocket (~> 0.5.0)
+    middleman-livereload (3.3.4)
+      em-websocket (~> 0.5.1)
       middleman-core (~> 3.2)
       rack-livereload (~> 0.3.15)
-    middleman-sprockets (3.3.3)
-      middleman-core (>= 3.2)
-      sprockets (~> 2.2)
+    middleman-sprockets (3.3.10)
+      middleman-core (~> 3.3)
+      sprockets (~> 2.12.1)
       sprockets-helpers (~> 1.1.0)
-      sprockets-sass (~> 1.1.0)
+      sprockets-sass (~> 1.2.0)
     middleman-syntax (2.0.0)
       middleman-core (~> 3.2)
       rouge (~> 1.0)
-    minitest (4.7.5)
-    multi_json (1.9.2)
-    padrino-helpers (0.12.1)
+    minitest (5.4.2)
+    multi_json (1.10.1)
+    padrino-helpers (0.12.4)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.1)
+      padrino-support (= 0.12.4)
       tilt (~> 1.4.1)
-    padrino-support (0.12.1)
+    padrino-support (0.12.4)
       activesupport (>= 3.1)
     rack (1.5.2)
     rack-livereload (0.3.15)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.3.1)
+    rake (10.3.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.2)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     redcarpet (3.1.2)
     ref (1.0.5)
-    rouge (1.3.3)
+    rouge (1.7.2)
     ruby18_source_location (0.2)
-    sass (3.2.19)
-    sprockets (2.12.1)
+    sass (3.4.7)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
-    sprockets-sass (1.1.0)
+    sprockets-sass (1.2.0)
       sprockets (~> 2.0)
       tilt (~> 1.1)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
-    tzinfo (0.3.39)
-    uber (0.0.4)
-    uglifier (2.5.0)
+    timers (4.0.1)
+      hitimes
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uber (0.0.10)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 

source/javascripts/app/lang.js

@@ -26,9 +26,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]).hide();
+      $(".highlight." + languages[i]).parent().hide();
     }
-    $(".highlight." + language).show();
+    $(".highlight." + language).parent().show();
 
     // scroll to the new location of the position
     $(window.location.hash).get(0).scrollIntoView(true);

source/stylesheets/screen.css.scss

@@ -475,6 +475,11 @@ html, body {
     @extend %code-font;
   }
 
+  pre>code {
+    background-color: transparent;
+    padding: 0;
+  }
+
   aside {
     padding-top: 1em;
     padding-bottom: 1em;