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

29 commits

Author SHA1 Message Date
gleb
8dabf1caef make it work 2013-05-02 14:34:25 +02:00
Tristan Harward
3e40c4caea Provide image_path that works with Sprockets
Prior to this, functions in sprockets-sass conflicted with ours and caused an infinite loop and StackError. This fixes thomas-mcdonald/bootstrap-sass#257

Note that Sprockets' asset_path requires configuration if it's not already configured by your framework. For example, in a simple Rack app, add the following to your config.ru:

environment.context_class.class_eval do
  def asset_path(path, options = {})
    "/assets/#{path}"
  end
end
2013-03-21 13:06:19 -04:00
Tristan Harward
2be2d7d130 Reorganize loader for compass support
::Sprockets is the wrong check, since we reference the ::Rails constant directly in the loaded file. This was outright failing when used with an empty compass-sprockets-sass install (without Rails)
2013-03-21 11:26:25 -04:00
Tristan Harward
e9eb3d8c4a Merge pull request #295 from JohnAlbin/patch-1
Fix compass unpack error. Fixes #70
2013-02-19 16:14:56 -08:00
John Albin Wilkins
dea4550106 Fix compass unpack error. Fixes #70
Add :path to Compass registration so "compass unpack" works without errors.
2013-02-19 02:26:45 +08:00
Tristan Harward
5b17751454 Fix namespace Sass module due to conflict with bootstra-sass-rails
No one should really use the two together, but in case they do, or in case any other library defines a Bootstrap::Sass module, we should be clear that we mean the global core Sass module here. Fixes thomas-mcdonald/bootstrap-sass#293
2013-02-15 19:42:23 -05:00
Thomas McDonald
2d40e4d27b Merge pull request #260 from trisweb/tristan_259_add_global_sass_load_path
Add Sass.load_paths entry to help our absolute @import paths
2013-02-08 03:08:24 -08:00
Pavel Belyakov
48699e76db Use asset pipeline if defined Sprockets instead of checking for Rails version 2013-01-29 13:07:15 +04:00
Tristan Harward
41d9219902 Add Sass.load_paths entry to help absolute @import paths
Nice feature added in Sass 2.3 - see nex3/sass@5c93cbfe

This should resolve thomas-mcdonald/bootstrap-sass#259 better than making users manually adding a load_paths entry.
2012-11-19 14:26:32 -05:00
Tristan Harward
2fc8201565 Provide a compass-agnostic version of image_path
This allows for test compilation (which doesn't use sass-rails *or* compass) and could be a lead-in to a fully generic version for non-compass/rails use of bootstrap-sass.
2012-11-01 11:22:08 -04:00
Tristan Harward
2cca8870c2 Bah, don't need the submodule anymore. 2012-11-01 11:06:04 -04:00
Tristan Harward
6dea3d599f Fix module to correctly include compass extenstion.
Sorry about all the commits - still getting my bearings with compass.
2012-11-01 11:04:42 -04:00
Tristan Harward
a7369e809d Standardize on image-path for referencing sprite assets.
We need a new compass function to handle image-path, since image-url (rightfully) includes the url() wrapper. We don't want the url() wrapper around our path variable, since bootstrap already includes it. This way we only have to patch the _variables.scss file, and not _sprites.scss too.
2012-11-01 10:56:58 -04:00
Thomas McDonald
2a9d9bf4fb Register the rails engine when using Rails w/Compass
This means that the javascripts will still be available through the
asset pipeline.
2012-05-11 14:39:47 +01:00
Thomas McDonald
1503314ca2 further tweaking to rails w/compass support 2012-05-06 19:11:47 +01:00
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