bootstrap-sass 3.0.2.0 → 3.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 406353c9ec5de3ac96f4f954e900f11aa511553e
-  data.tar.gz: d008d48d93324d8652723d8dfed1fd7831f70cd2
+  metadata.gz: 7adbd7c5c49bbaf3ac3ca916dca5a5c5fcfbdd32
+  data.tar.gz: 98f8ed3a12d41e396130826cd46bd4b3bcfa8089
 SHA512:
-  metadata.gz: 17701036ba1df529d39ea4c085db5ce342851d201c4c666ecc1eda80c9a156e924e0ccb864567343976eeb4a9410c0db810bcbd4cda0942cd088f993f3e79ddf
-  data.tar.gz: e35a825e74cc14d75feadbaef5f59c2bd6ce976a39dbef09ebc062c4b8a32f1392c4b0c6edb7a9b8ddc7925dadb6467337a2a97670f05d7b80e44118f4cf44dc
+  metadata.gz: af547f0a32aef0187ddd596aa6ff90574994339b444b3f11da80e8ac4e0b35bf6dccf84974ee7a06c124c0accfad0338d4334f6772adc91e64fd56ad86195be7
+  data.tar.gz: 64d7cfa04ca0050be992dda8541a884caa5c3dd2b3ee59a337cb078a75955b729743d4c1f2169a4b0470fafe191b482a27d000178b915323733e618de2e46e81

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.0.2.1
+
+* fix vendor paths for compass
+
 ## 3.0.0.0
 
 * Fully automated (lots of string juggling) LESS -> Sass conversion. - *Gleb Mazovetskiy*

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/thomas-mcdonald/bootstrap-sass.png?branch=master)](http://travis-ci.org/thomas-mcdonald/bootstrap-sass) [![Code Climate](https://codeclimate.com/github/thomas-mcdonald/bootstrap-sass.png)](https://codeclimate.com/github/thomas-mcdonald/bootstrap-sass)
 
-`bootstrap-sass` is an Sass-powered version of [Bootstrap](http://github.com/twbs/bootstrap), ready to drop right into your Sass powered applications.
+`bootstrap-sass` is a Sass-powered version of [Bootstrap](http://github.com/twbs/bootstrap), ready to drop right into your Sass powered applications.
 
 ## Installation
 
@@ -16,7 +16,7 @@ In your Gemfile you need to add the `bootstrap-sass` gem, and ensure that the `s
 
 ```ruby
 gem 'sass-rails', '>= 3.2' # sass-rails needs to be higher than 3.2
-gem 'bootstrap-sass', '~> 3.0.1.0.rc'
+gem 'bootstrap-sass', '~> 3.0.2.0'
 ```
 
 `bundle install` and restart your server to make the files available through the pipeline.
@@ -24,8 +24,8 @@ gem 'bootstrap-sass', '~> 3.0.1.0.rc'
 ### b. Compass (no Rails)
 
 Install the gem
-```console
-gem install bootstrap-sass --pre
+```sh
+gem install bootstrap-sass
 ```
 
 If you have an existing Compass project:
@@ -53,9 +53,10 @@ This will create a new Compass project with the following files in it:
 
 ## Usage
 
-### CSS / SCSS / SASS
+### Sass
 
-Import Bootstrap in an SCSS file (for example, `application.css.scss`) to get all of Bootstrap's styles, mixins and variables! We recommend against using `//= require` directives, since none of your other stylesheets will be [able to access][antirequire] the Bootstrap mixins or variables.
+Import Bootstrap into a Sass file (for example, `application.css.scss`) to get all of Bootstrap's styles, mixins and variables!
+We recommend against using `//= require` directives, since none of your other stylesheets will be [able to access][antirequire] the Bootstrap mixins or variables.
 
 ```scss
 @import "bootstrap";
@@ -77,24 +78,20 @@ $navbar-default-color: $light-orange;
 @import "bootstrap";
 ```
 
-For granular control over what is imported, instead of `@import "bootstrap"`, explicitly specify which modules and components should be included.
-
-Copy `bootstrap.scss` from the gem into the project's vendor/ as `bootstrap-custom.scss`.
+You can also import components explicitly. To start with a full list of modules copy this file from the gem:
 
 ```bash
 cp $(bundle show bootstrap-sass)/vendor/assets/stylesheets/bootstrap/bootstrap.scss \
    vendor/assets/stylesheets/bootstrap-custom.scss
 ```
 
-Comment out the import statements you do not need from `bootstrap-custom.scss`.
-
-Finally, in your `application.sass`:
+In your `application.sass`, replace `@import 'bootstrap'` with:
 
 ```scss
   @import 'bootstrap-custom';
 ```
 
-NB: This file now needs to be manually kept up to date with structural changes from upstream.
+Comment out any modules you don't need from `bootstrap-custom`.
 
 ### Javascript
 

data/lib/bootstrap-sass.rb

@@ -20,7 +20,7 @@ module Bootstrap
             'bootstrap-sass requires either Rails > 3.1 or Compass, neither of which are loaded'
     end
 
-    bs_stylesheets = File.expand_path(File.join('..', 'vendor', 'assets', 'stylesheets'))
+    bs_stylesheets = File.join(gem_path, 'vendor', 'assets', 'stylesheets')
     ::Sass.load_paths << bs_stylesheets
     if ::Sass::Script::Number.precision < 10
       # see https://github.com/thomas-mcdonald/bootstrap-sass/issues/409
@@ -29,6 +29,11 @@ module Bootstrap
   end
 
   private
+
+  def self.gem_path
+    @gem_path ||= File.expand_path File.join('..'), File.dirname(__FILE__)
+  end
+
   def self.asset_pipeline?
     defined?(::Sprockets)
   end
@@ -42,10 +47,14 @@ module Bootstrap
   end
 
   def self.register_compass_extension
-    base = File.join(File.dirname(__FILE__), '..')
-    styles = File.join(base, 'vendor', 'assets', 'stylesheets')
-    templates = File.join(base, 'templates')
-    ::Compass::Frameworks.register('bootstrap', :path => base, :stylesheets_directory => styles, :templates_directory => templates)
+    styles    = File.join gem_path, 'vendor', 'assets', 'stylesheets'
+    templates = File.join gem_path, 'templates'
+    ::Compass::Frameworks.register(
+        'bootstrap',
+        :path                  => gem_path,
+        :stylesheets_directory => styles,
+        :templates_directory   => templates
+    )
   end
 
   def self.register_rails_engine

data/lib/bootstrap-sass/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION = '3.0.2.0'
+  VERSION = '3.0.2.1'
   BOOTSTRAP_SHA = '463343af63344dbbc3db04f40b0b804baa919b7e'
 end

data/templates/project/manifest.rb

@@ -5,12 +5,12 @@ stylesheet 'styles.scss'
 
 # SCSS:
 bs_stylesheets = "../../vendor/assets/stylesheets/bootstrap"
-stylesheet '_variables.scss.erb', to: '_variables.scss', erb: true,
-           bs_variables_path: File.expand_path("#{bs_stylesheets}/_variables.scss", File.dirname(__FILE__))
+stylesheet '_variables.scss.erb', :to => '_variables.scss', :erb => true,
+           :bs_variables_path => File.expand_path("#{bs_stylesheets}/_variables.scss", File.dirname(__FILE__))
 
 # JS:
 bs_javascripts = "../../vendor/assets/javascripts/bootstrap"
 Dir.glob File.expand_path("#{bs_javascripts}/*.js", File.dirname(__FILE__)) do |path|
   file = File.basename(path)
-  javascript "#{bs_javascripts}/#{file}", to: "bootstrap/#{file}"
+  javascript "#{bs_javascripts}/#{file}", :to => "bootstrap/#{file}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-sass
 version: !ruby/object:Gem::Version
-  version: 3.0.2.0
+  version: 3.0.2.1
 platform: ruby
 authors:
 - Thomas McDonald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass