Skip to content

Commit

Permalink
upgraded to foundation 5
Browse files Browse the repository at this point in the history
  • Loading branch information
jeloi committed Nov 30, 2013
1 parent d4574af commit 0d2a8f6
Show file tree
Hide file tree
Showing 11 changed files with 755 additions and 967 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ gem 'rmagick'

# gem 'jquery-turbolinks'

gem 'zurb-foundation'
# gem 'zurb-foundation'
gem 'foundation-rails'
gem 'omniauth-facebook', '1.4.0'
gem 'friendly_id', '5.0.0.beta4'
# gem 'nested_form'
Expand Down
7 changes: 4 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ GEM
multipart-post (~> 1.2.0)
ffi (1.9.0)
formatador (0.2.4)
foundation-rails (5.0.2.0)
railties (>= 3.1.0)
sass (>= 3.2.0)
friendly_id (5.0.0.beta4)
activerecord (~> 4.0.0)
fssm (0.2.10)
Expand Down Expand Up @@ -269,8 +272,6 @@ GEM
nokogiri (~> 1.3)
zeus (0.13.3)
method_source (>= 0.6.7)
zurb-foundation (4.3.1)
sass (>= 3.2.0)

PLATFORMS
ruby
Expand All @@ -292,6 +293,7 @@ DEPENDENCIES
database_cleaner (= 1.0.1)
factory_girl_rails
faker
foundation-rails
friendly_id (= 5.0.0.beta4)
guard-rspec
guard-zeus
Expand All @@ -318,4 +320,3 @@ DEPENDENCIES
uglifier (= 2.1.1)
will_paginate
zeus
zurb-foundation
5 changes: 3 additions & 2 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//= require jquery
//= require jquery_ujs
// require foundation
//= require foundation
//= require turbolinks
//= require bxslider/jquery.bxslider
//= require chosen-jquery
Expand All @@ -37,4 +37,5 @@
// screen_width = $(window).width();
// };
// console.log("Window Resized");
// }
// }
$(function(){ $(document).foundation(); });
6 changes: 4 additions & 2 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
*= require foundation_and_overrides
*= require chosen
*= require_tree .
*= require foundation_and_overrides
*= require visual
* require_tree .
*/

3 changes: 0 additions & 3 deletions app/assets/stylesheets/comments.css.scss

This file was deleted.

Loading

0 comments on commit 0d2a8f6

Please sign in to comment.