version bump to v0.2.1

OSUOSC · Jan 24, 2016 · ec44f18 · ec44f18
1 parent 64edf52
commit ec44f18
Show file tree

Hide file tree

Showing 33 changed files with 531 additions and 336 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,6 +3,9 @@ source "https://rubygems.org"
 gem 'jekyll', '~> 3.0.0'
 gem 'jekyll-paginate', '~> 1.1.0', github: 'egladman/jekyll-paginate'
 gem 'jekyll-sitemap', '~> 0.9.0'
+gem 'jekyll-last-modified-at', '~> 0.3.4'
 gem 'jekyll-feed', '~> 0.3.1'
 gem 'rake', '~> 10.4.2'
 gem 'sass', '~> 3.4'
+gem 'nokogiri', '~> 1.6', '>= 1.6.6.2'
+gem 'iconv', '~> 1.0', '>= 1.0.4'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -9,6 +9,7 @@ GEM
   specs:
     colorator (0.1)
     ffi (1.9.10)
+    iconv (1.0.4)
     jekyll (3.0.0)
       colorator (~> 0.1)
       jekyll-sass-converter (~> 1.0)
@@ -19,6 +20,8 @@ GEM
       rouge (~> 1.7)
       safe_yaml (~> 1.0)
     jekyll-feed (0.3.1)
+    jekyll-last-modified-at (0.3.4)
+      jekyll
     jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
     jekyll-sitemap (0.9.0)
@@ -30,6 +33,9 @@ GEM
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     mercenary (0.3.5)
+    mini_portile (0.6.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     rake (10.4.2)
     rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
@@ -42,10 +48,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  iconv (~> 1.0, >= 1.0.4)
   jekyll (~> 3.0.0)
   jekyll-feed (~> 0.3.1)
+  jekyll-last-modified-at (~> 0.3.4)
   jekyll-paginate (~> 1.1.0)!
   jekyll-sitemap (~> 0.9.0)
+  nokogiri (~> 1.6, >= 1.6.6.2)
   rake (~> 10.4.2)
   sass (~> 3.4)
 

diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -306,6 +306,9 @@ module.exports = (grunt) ->
       jekyll:
         cmd: 'bundle exec jekyll build'
 
+      aliasFeed:
+        cmd: 'cp _site/atom.xml _site/rss.xml'
+
       new_post:
         cmd: './_helpers/new-post.sh'
 
@@ -370,7 +373,7 @@ module.exports = (grunt) ->
     'jade'
     'copy:scss'
     'exec:jekyll'
-    # delete grunt.config.data.copy.scss
+    'exec:aliasFeed'
     'copy:js'
     'copy:css'
     'copy:image'

diff --git a/_assets/css/_mailchimp.sass b/_assets/css/_mailchimp.sass
@@ -66,6 +66,7 @@ form
 
 #mc_embed_signup, #mc_embed_signup *
   box-sizing: border-box
+  // position: relative
 
 .mc-field-group.input-group
   ul
@@ -125,7 +126,9 @@ form
 
 #mc_embed_signup_scroll
   line-height: 8em
-  height: 12em
+  min-height: 12em
+  display: inline-block
+  width: 100%
 
 .mc-field-group
   margin-right: 8em