Skip to content

Commit

Permalink
Desperate switching of gem versions to get sass load_paths right
Browse files Browse the repository at this point in the history
On advice of
twbs/bootstrap-sass#523 (comment)

This seems to let both compass and partials be found!!!!
  • Loading branch information
carols10cents committed Jun 15, 2014
1 parent dfc0cbb commit 9fe6fea
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 30 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ gemspec
# gem "radiant-smarty_pants_filter-extension", "~> 1.0.2"
# gem "radiant-textile_filter-extension", "~> 1.0.4"

gem "sass-rails", github: 'guilleiguaran/sass-rails', branch: 'backport'

group :development, :test do
gem 'pry', '~> 0.10.0'
gem 'capybara', '~> 2.3.0'
Expand Down
32 changes: 22 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
GIT
remote: git://github.com/guilleiguaran/sass-rails.git
revision: 0393d9e1a6e4a776e61f16fb75f97971b9f4abd2
branch: backport
specs:
sass-rails (4.0.1)
railties (>= 3.2.0, < 5.0)
sass (>= 3.2.0)
sprockets-rails (~> 2.0.0.backport1)

PATH
remote: .
specs:
trusty-cms (1.0.0)
RedCloth (~> 4.2.0)
acts_as_tree (~> 0.1.1)
bundler (>= 1.0.0)
compass (~> 0.12.6)
compass-rails (~> 1.1.7)
delocalize (~> 0.2.3)
haml (~> 4.0.5)
Expand All @@ -18,7 +27,9 @@ PATH
rails (~> 3.2.18)
rake (>= 0.8.7)
rdoc (~> 3.9)
sass-rails (~> 3.2.6)
sass (= 3.2.7)
sprockets (= 2.2.2.backport2)
sprockets-rails (~> 2.0.0.backport1)
stringex (~> 1.3.0)
tzinfo (~> 0.3.31)
will_paginate (~> 3.0)
Expand Down Expand Up @@ -67,10 +78,10 @@ GEM
xpath (~> 2.0)
chunky_png (1.3.1)
coderay (1.1.0)
compass (0.12.6)
compass (0.12.2)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.2.19)
sass (~> 3.1)
compass-rails (1.1.7)
compass (>= 0.12.2)
sprockets (<= 2.11.0)
Expand Down Expand Up @@ -158,19 +169,19 @@ GEM
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.0)
sass (3.2.19)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
sass (3.2.7)
slop (3.5.0)
spoon (0.0.4)
ffi
sprockets (2.2.2)
sprockets (2.2.2.backport2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.0.backport1)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.2.2.backport2)
stringex (1.3.3)
thor (0.19.1)
tilt (1.4.1)
Expand All @@ -191,4 +202,5 @@ DEPENDENCIES
launchy (~> 2.4.2)
pry (~> 0.10.0)
rspec-rails (~> 3.0.0)
sass-rails!
trusty-cms!
41 changes: 21 additions & 20 deletions trusty_cms.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,25 @@ a general purpose content managment system--not merely a blogging engine.}
s.summary = %q{A no-fluff content management system designed for small teams.}
s.license = %q{MIT}

s.add_dependency "tzinfo", "~> 0.3.31"
s.add_dependency "rails", "~> 3.2.18"
s.add_dependency "rdoc", "~> 3.9"
s.add_dependency "acts_as_tree", "~> 0.1.1"
s.add_dependency "bundler", ">= 1.0.0"
s.add_dependency "compass", "~> 0.12.6"
s.add_dependency "compass-rails", "~> 1.1.7"
s.add_dependency "sass-rails", "~> 3.2.6"
s.add_dependency "delocalize", "~> 0.2.3"
s.add_dependency "haml", "~> 4.0.5"
s.add_dependency "haml-rails", ">= 0.4", "< 0.5" # 0.5 is rails 4+ only
s.add_dependency "highline", "~> 1.6.10"
s.add_dependency "mysql", "~> 2.9.1"
s.add_dependency "rack", "~> 1.4.5"
s.add_dependency "rack-cache", "~> 1.2"
s.add_dependency "rake", ">= 0.8.7"
s.add_dependency "radius", "~> 0.7.3"
s.add_dependency "RedCloth", "~> 4.2.0"
s.add_dependency "will_paginate", "~> 3.0"
s.add_dependency "stringex", "~> 1.3.0"
s.add_dependency "tzinfo", "~> 0.3.31"
s.add_dependency "rails", "~> 3.2.18"
s.add_dependency "rdoc", "~> 3.9"
s.add_dependency "acts_as_tree", "~> 0.1.1"
s.add_dependency "bundler", ">= 1.0.0"
s.add_dependency "compass-rails", "~> 1.1.7"
s.add_dependency "sprockets", "= 2.2.2.backport2"
s.add_dependency "sprockets-rails", "~> 2.0.0.backport1"
s.add_dependency "sass", "= 3.2.7"
s.add_dependency "delocalize", "~> 0.2.3"
s.add_dependency "haml", "~> 4.0.5"
s.add_dependency "haml-rails", ">= 0.4", "< 0.5" # 0.5 is rails 4+ only
s.add_dependency "highline", "~> 1.6.10"
s.add_dependency "mysql", "~> 2.9.1"
s.add_dependency "rack", "~> 1.4.5"
s.add_dependency "rack-cache", "~> 1.2"
s.add_dependency "rake", ">= 0.8.7"
s.add_dependency "radius", "~> 0.7.3"
s.add_dependency "RedCloth", "~> 4.2.0"
s.add_dependency "will_paginate", "~> 3.0"
s.add_dependency "stringex", "~> 1.3.0"
end

0 comments on commit 9fe6fea

Please sign in to comment.