1
0
Fork 0
mirror of https://github.com/twbs/bootstrap-sass.git synced 2022-11-09 12:27:02 -05:00
Commit graph

14 commits

Author SHA1 Message Date
Thomas McDonald
d68959b708 check for compass before rails e.g. where using compass with rails 2012-05-06 19:04:49 +01:00
Thomas McDonald
a3bcf7fc25 reorganize loading of framework specific files 2012-05-02 14:29:01 +01:00
Thomas McDonald
60baf08a85 Revert "support for rails w/compass"
This reverts commit 0cea6384c8.

I had not considered the side effect of loading all the compass setup,
since this will mean that Rails' asset-url is overridden, or some side
effect will come about as a result.
2012-04-08 20:17:26 +01:00
Thomas McDonald
c637c73aab .rails_asset_pipeline -> .asset_pipeline for readability 2012-04-08 20:00:11 +01:00
Thomas McDonald
644623ae6e Merge pull request #106 from htanata/rails_2_3 2012-04-08 19:58:45 +01:00
Thomas McDonald
0cea6384c8 support for rails w/compass 2012-04-08 18:39:34 +01:00
Hendy Tanata
711f3b36c8 Make it work with Rails 2.3 and Compass. 2012-04-04 18:01:59 +08:00
Julien Guimont
e8025d3d84 Fix load sass_extentions in assets precompilation and compass 2012-03-14 14:49:39 -04:00
Thomas McDonald
4ae4653ff6 Update bootstrap-sass to 2.0.0
Now with support for Compass!
2012-02-06 13:38:26 +00:00
Robert Jackson
a86f133919 Accidentally commited duplicate. 2011-12-22 22:50:17 -05:00
Robert Jackson
2ae648370e Fix Microsoft.gradient issue with SASS asset compilation. Resolves #14. 2011-12-22 22:25:20 -05:00
Benoit Bénézech
533ece86ba You can't use bootstrap-sass without sass-rails, so you need to require it (gemspec dependency are not automatically required). When used from an engine, this ended up in weird races conditions when sass-rails wasn't present in main_app's Gemfile (which requires it by default).
Should fix https://github.com/sferik/rails_admin/issues/759
2011-10-12 18:43:01 +03:00
Thomas McDonald
a69cddf6de bootstrap-rails was taken, lets try bootstrap-sass instead! 2011-09-06 23:38:04 +01:00
Thomas McDonald
c303d86d57 Extracted Bootstrap from QA
and everything *should* work.
2011-09-06 20:08:31 +01:00