twitter-bootstrap-rails 2.1.5 → 2.1.6

data/README.md

@@ -20,10 +20,22 @@ in this episode continues on the Twitter Bootstrap project showing how to displa
 
 
 ## Installing Gem
+The gem includes the source LESS and JS files. You'll need to choose a javascript runtime.
+ExecJS supports these runtimes:
 
-Include the [Twitter Bootstrap Rails gem](http://rubygems.org/gems/twitter-bootstrap-rails) in Gemfile to install it from [RubyGems.org](http://rubygems.org);
+* [therubyracer](https://github.com/cowboyd/therubyracer) - Google V8
+  embedded within Ruby
+* [therubyrhino](https://github.com/cowboyd/therubyrhino) - Mozilla
+  Rhino embedded within JRuby
+* [Node.js](http://nodejs.org/)
+* Apple JavaScriptCore - Included with Mac OS X
+* [Microsoft Windows Script Host](http://msdn.microsoft.com/en-us/library/9bbdkx3k.aspx) (JScript)
+
+Include the [Twitter Bootstrap Rails gem](http://rubygems.org/gems/twitter-bootstrap-rails) in Gemfile to install it from [RubyGems.org](http://rubygems.org):
 
 ```ruby
+gem "therubyracer"
+gem "less-rails" #Sprockets (what Rails 3.1 uses for its asset pipeline) supports LESS
 gem "twitter-bootstrap-rails"
 ```
 
@@ -192,6 +204,7 @@ gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootst
   <li>Released gem v.2.1.3 (minor fixes and updated to Twitter Bootstrap 2.1.1)</li>
   <li>Released gem v.2.1.4 (minor fixes)</li>
   <li>Released gem v.2.1.5 (minor fixes, install generator detects javascript template engine, updated to Twitter Bootstrap 2.2.1)</li>
+  <li>Released gem v.2.1.6 (minor fixes)</li>
 </ul>
 
 

data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less

@@ -2,8 +2,8 @@
 @import "twitter/bootstrap/responsive";
 
 // Set the correct sprite paths
-@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings.png");
-@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white.png");
+@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings");
+@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white");
 
 // Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
 // Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not

data/lib/twitter-bootstrap-rails.rb

@@ -6,5 +6,5 @@ module Twitter
    end
 end
 
-require 'less-rails'
+#require 'less-rails'
 require 'twitter/bootstrap/rails/bootstrap' if defined?(Rails)

data/lib/twitter/bootstrap/rails/version.rb

@@ -1,7 +1,7 @@
 module Twitter
   module Bootstrap
     module Rails
-      VERSION = "2.1.5"
+      VERSION = "2.1.6"
     end
   end
 end

data/vendor/toolkit/twitter/bootstrap/bootstrap.less

@@ -27,7 +27,6 @@
 @import "tables.less";
 
 // Components: common
-@import "sprites.less";
 @import "dropdowns.less";
 @import "wells.less";
 @import "component-animations.less";

data/vendor/toolkit/twitter/bootstrap/sprites.less

@@ -22,7 +22,7 @@
   .ie7-restore-right-whitespace();
   line-height: 14px;
   vertical-align: text-top;
-  background-image: url("@{iconSpritePath}");
+  background-image: url(@iconSpritePath);
   background-position: 14px 14px;
   background-repeat: no-repeat;
   margin-top: 1px;
@@ -42,7 +42,7 @@
 .dropdown-menu > .active > a > [class*=" icon-"],
 .dropdown-submenu:hover > a > [class^="icon-"],
 .dropdown-submenu:hover > a > [class*=" icon-"] {
-  background-image: url("@{iconWhiteSpritePath}");
+  background-image: url(@iconWhiteSpritePath);
 }
 
 .icon-glass              { background-position: 0      0; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter-bootstrap-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70195226790080 !ruby/object:Gem::Requirement
+  requirement: &70105032018960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70195226790080
+  version_requirements: *70105032018960
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70195226789160 !ruby/object:Gem::Requirement
+  requirement: &70105032018240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,32 +32,21 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70195226789160
+  version_requirements: *70105032018240
 - !ruby/object:Gem::Dependency
-  name: therubyracer
-  requirement: &70195226788240 !ruby/object:Gem::Requirement
+  name: execjs
+  requirement: &70105032017480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70195226788240
-- !ruby/object:Gem::Dependency
-  name: less-rails
-  requirement: &70195226730700 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *70195226730700
+  version_requirements: *70105032017480
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70195226729720 !ruby/object:Gem::Requirement
+  requirement: &70105032016440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +54,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70195226729720
+  version_requirements: *70105032016440
 description: twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for
   Rails 3.1 Asset Pipeline
 email:
@@ -186,7 +175,11 @@ files:
 - README.md
 homepage: https://github.com/seyhunak/twitter-bootstrap-rails
 licenses: []
-post_install_message: 
+post_install_message: ! "Important: You may need to add a javascript runtime to your
+  Gemfile in order for bootstrap's LESS files to compile to CSS. \n\n**********************************************\n\nExecJS
+  supports these runtimes:\n\ntherubyracer - Google V8 embedded within Ruby\n\ntherubyrhino
+  - Mozilla Rhino embedded within JRuby\n\nNode.js\n\nApple JavaScriptCore - Included
+  with Mac OS X\n\nMicrosoft Windows Script Host (JScript)\n\n**********************************************"
 rdoc_options: []
 require_paths:
 - lib