Merge branch 'js_maps'

utkarshkukreti · Jun 4, 2011 · aa386b5 · aa386b5
2 parents fb24172 + 564cf3e
commit aa386b5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb
diff --git a/config/routes.rb b/config/routes.rb
@@ -21,8 +21,6 @@
 
   devise_for :users, :controllers => { :sessions => "user_sessions" }
 
-  resource :home, :controller => "home"
-
   get "slugger" => "slugger#index", :as => "slugger"
 
   resources :users do

diff --git a/public-site/stylesheets/partials/_map.sass b/public-site/stylesheets/partials/_map.sass
@@ -1,3 +1,5 @@
 #map_canvas
   height: 500px
-  width: 100%
+  width: 900px
+  margin: 1em auto
+  +box-shadow(#000, 0px, 0px, 7px)