kinda update to foundation, depricate bootstrap 2

This commit is contained in:
2015-01-28 18:15:25 +01:00
parent 323e68bcad
commit e2f8459960
24 changed files with 1673 additions and 242 deletions
+9 -8
View File
@@ -82,8 +82,6 @@ GEM
tzinfo (~> 1.1)
arel (6.0.0)
bcrypt (3.1.9)
bootstrap-sass (2.3.2.2)
sass (~> 3.2)
bourbon (4.1.1)
sass (~> 3.3)
thor
@@ -126,6 +124,9 @@ GEM
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
foundation-rails (5.5.0.0)
railties (>= 3.1.0)
sass (>= 3.2.0, < 3.4)
globalid (0.3.0)
activesupport (>= 4.1.0)
hike (1.2.3)
@@ -146,7 +147,7 @@ GEM
mini_portile (0.6.2)
minitest (5.5.1)
multi_json (1.10.1)
nokogiri (1.6.5)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
paperclip (4.2.1)
activemodel (>= 3.0.0)
@@ -189,8 +190,8 @@ GEM
rake (10.4.2)
rdoc (4.2.0)
json (~> 1.4)
responders (2.0.2)
railties (>= 4.2.0.alpha, < 5)
responders (2.1.0)
railties (>= 4.2.0, < 5)
rest-client (1.6.8)
mime-types (~> 1.16)
rdoc (>= 2.4.2)
@@ -213,7 +214,7 @@ GEM
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
sass (3.4.9)
sass (3.3.14)
sass-rails (5.0.1)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
@@ -235,7 +236,7 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.2)
sprockets-rails (2.2.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
@@ -264,7 +265,6 @@ PLATFORMS
DEPENDENCIES
actionpack-page_caching
bootstrap-sass (~> 2.3)
bourbon
cmtool!
coffee-script
@@ -273,6 +273,7 @@ DEPENDENCIES
devise_simply_stored!
email_validator
factory_girl_rails
foundation-rails
jquery-rails
jquery-ui-rails
orm_adapter!