Update to latest versions of the gems.

turingschool · Feb 10, 2014 · 35f0452 · 35f0452
1 parent 74e9c79
commit 35f0452
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 77 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,15 +1,15 @@
 source "https://rubygems.org"
 
-gem 'middleman', '~> 3.1.4'
-gem 'middleman-core', '~> 3.1.4'
+gem 'middleman', '~> 3.2.2'
+gem 'middleman-core', '~> 3.2.2'
 
-gem "middleman-blog", "~> 3.2.0"
-gem "middleman-syntax", "~> 1.0.1"
+gem "middleman-blog", "~> 3.5.1"
+gem "middleman-syntax", "~> 2.0.0"
 
 gem "zurb-foundation", "~> 3.2.3"
-gem "builder", "~> 3.0.4"
-gem "nokogiri", "~> 1.6.0"
+gem "builder", "~> 3.2.2"
+gem "nokogiri", "~> 1.6.1"
 gem "rack-contrib", "~> 1.1.0"
 
-gem "redcarpet", "~> 2.2.2"
-gem "pygments.rb", "~> 0.3.7"
+gem "redcarpet", "~>3.0.0"
+gem "pygments.rb", "~> 0.5.4"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,129 +1,131 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.14)
+    activesupport (3.2.16)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    builder (3.0.4)
-    chunky_png (1.2.8)
+    addressable (2.3.5)
+    atomic (1.1.14)
+    builder (3.2.2)
+    chunky_png (1.3.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
+    coffee-script-source (1.7.0)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    ffi (1.9.0)
+    ffi (1.9.3)
     fssm (0.2.10)
-    haml (4.0.3)
+    haml (4.0.5)
       tilt
     hike (1.2.3)
-    i18n (0.6.5)
-    kramdown (1.1.0)
-    listen (1.2.3)
+    i18n (0.6.9)
+    json (1.8.1)
+    kramdown (1.3.1)
+    listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    maruku (0.6.1)
-      syntax (>= 1.0.0)
-    middleman (3.1.4)
+    middleman (3.2.2)
       coffee-script (~> 2.2.0)
       compass (>= 0.12.2)
       execjs (~> 1.4.0)
       haml (>= 3.1.6)
-      kramdown (~> 1.1.0)
-      middleman-core (= 3.1.4)
-      middleman-more (= 3.1.4)
+      kramdown (~> 1.2)
+      middleman-core (= 3.2.2)
       middleman-sprockets (>= 3.1.2)
       sass (>= 3.1.20)
-      uglifier (~> 2.1.0)
-    middleman-blog (3.2.0)
-      maruku (~> 0.6.0)
-      middleman-core (~> 3.0)
-      tzinfo (~> 0.3.0)
-    middleman-core (3.1.4)
+      uglifier (~> 2.4.0)
+    middleman-blog (3.5.1)
+      addressable (~> 2.3.5)
+      middleman-core (~> 3.2)
+      tzinfo (>= 0.3.0)
+    middleman-core (3.2.2)
       activesupport (~> 3.2.6)
       bundler (~> 1.1)
-      i18n (~> 0.6.1)
-      listen (~> 1.2.2)
+      i18n (~> 0.6.9)
+      listen (~> 1.1)
       rack (>= 1.4.5)
       rack-test (~> 0.6.1)
       thor (>= 0.15.2, < 2.0)
-      tilt (~> 1.3.6)
-    middleman-more (3.1.4)
-    middleman-sprockets (3.1.4)
-      middleman-core (>= 3.0.14)
-      middleman-more (>= 3.0.14)
+      tilt (~> 1.4.1)
+    middleman-sprockets (3.2.0)
+      middleman-core (~> 3.2)
       sprockets (~> 2.1)
       sprockets-helpers (~> 1.0.0)
       sprockets-sass (~> 1.0.0)
-    middleman-syntax (1.0.1)
-      middleman-core (~> 3.0)
-      pygments.rb (~> 0.3)
-    mini_portile (0.5.1)
-    modular-scale (1.0.2)
-      compass (>= 0.11.5)
-      sassy-math (>= 1.2)
-    multi_json (1.7.9)
-    nokogiri (1.6.0)
+    middleman-syntax (2.0.0)
+      middleman-core (~> 3.2)
+      rouge (~> 1.0)
+    mini_portile (0.5.2)
+    modular-scale (1.0.6)
+      compass (>= 0.12.1)
+      sass (>= 3.2.0)
+      sassy-math (>= 1.5)
+    multi_json (1.8.4)
+    nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
-    posix-spawn (0.3.6)
-    pygments.rb (0.3.7)
+    posix-spawn (0.3.8)
+    pygments.rb (0.5.4)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.0.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.1)
+    rake (10.1.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.0)
       ffi (>= 0.5.0)
-    redcarpet (2.2.2)
-    sass (3.2.10)
-    sassy-math (1.2)
+    redcarpet (3.0.0)
+    rouge (1.3.2)
+    sass (3.2.14)
+    sassy-math (1.5)
       compass (~> 0.11)
-    sprockets (2.10.0)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sprockets-helpers (1.0.1)
       sprockets (~> 2.0)
-    sprockets-sass (1.0.1)
+    sprockets-sass (1.0.2)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    syntax (1.0.0)
     thor (0.18.1)
-    tilt (1.3.7)
-    tzinfo (0.3.37)
-    uglifier (2.1.2)
+    thread_safe (0.1.3)
+      atomic
+    tilt (1.4.1)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
+    uglifier (2.4.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
     yajl-ruby (1.1.0)
-    zurb-foundation (3.2.3)
+    zurb-foundation (3.2.5)
       compass (>= 0.12.2)
-      modular-scale (>= 1.0.2)
+      modular-scale (= 1.0.6)
       rake
       sass (>= 3.2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  builder (~> 3.0.4)
-  middleman (~> 3.1.4)
-  middleman-blog (~> 3.2.0)
-  middleman-core (~> 3.1.4)
-  middleman-syntax (~> 1.0.1)
-  nokogiri (~> 1.6.0)
-  pygments.rb (~> 0.3.7)
+  builder (~> 3.2.2)
+  middleman (~> 3.2.2)
+  middleman-blog (~> 3.5.1)
+  middleman-core (~> 3.2.2)
+  middleman-syntax (~> 2.0.0)
+  nokogiri (~> 1.6.1)
+  pygments.rb (~> 0.5.4)
   rack-contrib (~> 1.1.0)
-  redcarpet (~> 2.2.2)
+  redcarpet (~> 3.0.0)
   zurb-foundation (~> 3.2.3)
diff --git a/README.md b/README.md
@@ -20,6 +20,10 @@
 	$ open http://localhost:4567
 	```
 
+1. Check out the existing articles for an example of how to write a blog post. Make note that you can
+add a tag to the article using the 'tag' setting at the top of an article. See http://middlemanapp.com/basics/blogging/#toc_1
+for more information about adding dates and tags to each article.
+
 1. Remove the existing articles
 
 	```
@@ -28,7 +32,7 @@
 	$ git commit -m "Removed old articles"
 	```
 
-1. Create your first article
+1. Create your first article.
 
 	```
 	$ middleman article "gSchool - Week 0"
@@ -56,4 +60,7 @@
 	$ git push origin master
 	```
 
-1. (Optional) Rename the blog to something other than the default Heroku name. You can do this via the Heroku console after you log in.
+1. (Optional) Rename the blog to something other than the default Heroku name. You can do this via the Heroku console after you log in.
+
+Note: The styling of code highlighting is a bit broken when the code shows up on the homepage. If you would like to embed code in your
+blog posts, let an instructor know.
diff --git a/config.rb b/config.rb
@@ -79,10 +79,7 @@
 set :markdown_engine, :redcarpet
 set :markdown, :fenced_code_blocks => true, :smartypants => true
 
-activate :syntax,
-         :linenos => 'inline',
-         :anchorlinenos => true,
-         :linenostart => 2
+activate :syntax
 
 # Build-specific configuration
 configure :build do

diff --git a/source/stylesheets/_settings.scss b/source/stylesheets/_settings.scss
@@ -1,4 +1,4 @@
-@import "foundation/common/ratios";
+//@import "foundation/common/ratios";
 
 // Settings file containing Foundation defaults