Merge branch 'CSS_serena' into dev

manubete · Jul 17, 2014 · f9d5d58 · f9d5d58
2 parents 160f432 + cffb720
commit f9d5d58
Show file tree

Hide file tree

Showing 27 changed files with 7,049 additions and 340 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Gemfile b/Gemfile
@@ -5,6 +5,8 @@ gem 'rails', '3.2.13'
 
 gem 'rake', '10.3.2'
 
+gem"simple-navigation"
+
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 gem 'unicorn'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -136,6 +136,8 @@ GEM
       websocket (~> 1.0.4)
     shoulda-matchers (2.6.0)
       activesupport (>= 3.0.0)
+    simple-navigation (3.13.0)
+      activesupport (>= 2.3.2)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -178,5 +180,6 @@ DEPENDENCIES
   sass-rails (~> 3.2.3)
   selenium-webdriver
   shoulda-matchers
+  simple-navigation
   uglifier (>= 1.0.3)
   unicorn
diff --git a/app/assets/.DS_Store b/app/assets/.DS_Store