twitter-bootstrap-rails 1.3.0 → 1.3.1

data/Gemfile

@@ -2,3 +2,4 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in twitter-bootstrap-rails.gemspec
 gemspec
+gem 'less-rails', :path => ENV['LESS_RAILS_PATH'] if ENV['LESS_RAILS_PATH']

data/README.md

@@ -2,10 +2,12 @@
 Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
 It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
 
+
 twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline
 
 
 ## Installing Gem
+
 Include Bootstrap in Gemfile;
 
     gem 'twitter-bootstrap-rails'
@@ -24,44 +26,70 @@ You can run bundle from command line
 Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less,
 a CSS preprocessor for faster and easier web development.
 
-## Installing Less
-
-Include Less in Gemfile;
-    gem 'less'
-
-Include less-rails in Gemfile;
-    gem 'less-rails', :git => 'git://github.com/metaskills/less-rails.git'
-
 ## Using stylesheets with Less
 
 You have to require Bootstrap LESS (bootstrap.less) in your application.css
 
-	/*
-	 *= require bootstrap
-	*/
+    /*
+     *= require twitter/bootstrap
+    */
 
     /* Your stylesheets goes here... */
+    
 
 Now, you can override LESS files provided by Twitter Bootstrap
 
-i.e
-
-	@import "bootstrap";
-
-	// Baseline grid
-	@basefont:          13px;
-	@baseline:          18px;
+     @import "bootstrap";
+     
+     // Baseline grid
+     @basefont:          13px;
+     @baseline:          18px;
 
 
-## Using javascripts
+## Using Javascripts
 
 You have to require Bootstrap JS (bootstrap.js) in your application.js
 
-    //= require bootstrap
+    //= require twitter/bootstrap
 
-	$(document).ready(function(){
+    $(document).ready(function(){
       /* Your javascripts goes here... */
-	});
+    });
+
+
+## Using With Coffeescript
+
+Using Twitter Bootstrap with the CoffeeScript is easy.
+Just create a "application.js.coffee" file to /app/assets/javascripts/ folder and put lines below.
+
+    $ ->
+	  $("body > .topbar").scrollSpy()
+  	$ ->
+	  $(".tabs").tabs()
+	$ ->
+	  $("a[rel=twipsy]").twipsy live: true
+	$ ->
+	  $("a[rel=popover]").popover offset: 10
+	$ ->
+	  $(".topbar-wrapper").dropdown()
+	$ ->
+	  $(".alert-message").alert()
+	$ ->
+	  domModal = $(".modal").modal(
+		backdrop: true
+		closeOnEscape: true
+	  )
+	  $(".open-modal").click ->
+		domModal.toggle()
+		
+
+## Using Static CSS, JS (w/o Less)
+
+twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest static CSS, JS files.
+
+    You can install from latest build (from branch);
+    
+    gem 'twitter-bootstrap-rails', :git => "git://github.com/seyhunak/twitter-bootstrap-rails.git", :branch => "static"
 
 
 ## Changelog
@@ -69,6 +97,10 @@ You have to require Bootstrap JS (bootstrap.js) in your application.js
   <li>Version 0.0.5 deprecated</li>
   <li>Asset files updated to latest and removed version numbers</li>
   <li>Implemented Less::Rails Railtie to use with LESS</li>
+  <li>Fixed railtie to only initialize Less when installed</li>
+  <li>Created new branch for the static version of Bootstrap (w/o Less) - check static branch</li>
+  <li>Added path to support heroku deploy</li>
+  <li>Rake precompile issue fixed</li>
 </ul>
 
 ## Credits
@@ -77,12 +109,14 @@ Seyhun Akyürek - seyhunak [at] gmail com
 [Follow me on Twitter](http://twitter.com/seyhunak "Twitter")
 
 
-## Contributors
+## Contributors & Patches
 <ul>
   <li>Daniel Morris</li>
   <li>Bradly Feeley</li>
   <li>Guilherme Moreira</li>
   <li>Alex Behar</li>
+  <li>Brandon Keene</li>
+  <li>Anthony Corcutt</li>
 </ul>
 
 

data/lib/twitter-bootstrap-rails.rb

@@ -1,12 +1,10 @@
 module Twitter
   module Bootstrap
-      module Rails
-        if ::Rails.version < "3.1"
-          require "twitter-bootstrap-rails/railtie"
-        else
-          require "twitter-bootstrap-rails/engine"
-        end
+      module Rails       
       end
    end
 end
 
+require 'less-rails'
+require 'twitter/bootstrap/rails/bootstrap'
+

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

@@ -0,0 +1,2 @@
+require "twitter/bootstrap/rails/version"
+require "twitter/bootstrap/rails/engine"

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

@@ -0,0 +1,15 @@
+module Twitter
+  module Bootstrap
+    module Rails
+      class Engine < ::Rails::Engine
+     
+        initializer 'twitter-bootstrap-rails.setup', 
+          :after => 'less-rails.after.load_config_initializers', 
+          :group => :all do |app|
+            app.config.less.paths << File.join(config.root, 'vendor', 'toolkit')
+        end
+
+      end
+    end
+  end
+end

data/lib/{twitter-bootstrap-rails → twitter/bootstrap/rails}/version.rb

@@ -1,7 +1,7 @@
 module Twitter
   module Bootstrap
     module Rails
-      VERSION = "1.3.0"
+      VERSION = "1.3.1"
     end
   end
 end

data/twitter-bootstrap-rails.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "twitter-bootstrap-rails/version"
+require "twitter/bootstrap/rails/version"
 
 Gem::Specification.new do |s|
   s.name        = "twitter-bootstrap-rails"
@@ -24,6 +24,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'railties'
   s.add_runtime_dependency 'actionpack'
   s.add_development_dependency "bundler"
-  s.add_development_dependency "rails", "~> 3.1"
+  s.add_development_dependency 'rails', '~> 3.1.1'
 end
 

data/vendor/assets/javascripts/twitter/bootstrap.js

@@ -0,0 +1,7 @@
+//= require twitter/bootstrap/bootstrap-alerts
+//= require twitter/bootstrap/bootstrap-dropdown
+//= require twitter/bootstrap/bootstrap-modal
+//= require twitter/bootstrap/bootstrap-twipsy
+//= require twitter/bootstrap/bootstrap-popover
+//= require twitter/bootstrap/bootstrap-scrollspy
+//= require twitter/bootstrap/bootstrap-tabs

data/vendor/assets/stylesheets/twitter/bootstrap.css.less

@@ -0,0 +1 @@
+@import "twitter/bootstrap/bootstrap";

data/vendor/toolkit/twitter/bootstrap.less

@@ -0,0 +1 @@
+@import "bootstrap/bootstrap.less";

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter-bootstrap-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-04 00:00:00.000000000 +03:00
-default_executable: 
+date: 2011-10-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: less
-  requirement: &84477880 !ruby/object:Gem::Requirement
+  requirement: &82988600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84477880
+  version_requirements: *82988600
 - !ruby/object:Gem::Dependency
   name: less-rails
-  requirement: &84477550 !ruby/object:Gem::Requirement
+  requirement: &82983220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *84477550
+  version_requirements: *82983220
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &84477340 !ruby/object:Gem::Requirement
+  requirement: &82982760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84477340
+  version_requirements: *82982760
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &84477060 !ruby/object:Gem::Requirement
+  requirement: &82982400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84477060
+  version_requirements: *82982400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &84476820 !ruby/object:Gem::Requirement
+  requirement: &82982180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,18 +65,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84476820
+  version_requirements: *82982180
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &84476510 !ruby/object:Gem::Requirement
+  requirement: &82981930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.1.1
   type: :development
   prerelease: false
-  version_requirements: *84476510
+  version_requirements: *82981930
 description: twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for
   Rails 3.1 Asset Pipeline
 email:
@@ -91,32 +90,29 @@ files:
 - README.md
 - Rakefile
 - lib/twitter-bootstrap-rails.rb
-- lib/twitter-bootstrap-rails/engine.rb
-- lib/twitter-bootstrap-rails/railtie.rb
-- lib/twitter-bootstrap-rails/version.rb
+- lib/twitter/bootstrap/rails/bootstrap.rb
+- lib/twitter/bootstrap/rails/engine.rb
+- lib/twitter/bootstrap/rails/version.rb
 - twitter-bootstrap-rails.gemspec
-- vendor/assets/javascripts/bootstrap-alerts.js
-- vendor/assets/javascripts/bootstrap-dropdown.js
-- vendor/assets/javascripts/bootstrap-modal.js
-- vendor/assets/javascripts/bootstrap-popover.js
-- vendor/assets/javascripts/bootstrap-scrollspy.js
-- vendor/assets/javascripts/bootstrap-tabs.js
-- vendor/assets/javascripts/bootstrap-twipsy.js
-- vendor/assets/javascripts/bootstrap.js
-- vendor/assets/stylesheets/bootstrap.css
-- vendor/assets/stylesheets/bootstrap.css.less
-- vendor/assets/stylesheets/bootstrap.less
-- vendor/assets/stylesheets/bootstrap.min.css
-- vendor/assets/stylesheets/bootstrap/bootstrap.less
-- vendor/assets/stylesheets/bootstrap/forms.less
-- vendor/assets/stylesheets/bootstrap/mixins.less
-- vendor/assets/stylesheets/bootstrap/patterns.less
-- vendor/assets/stylesheets/bootstrap/reset.less
-- vendor/assets/stylesheets/bootstrap/scaffolding.less
-- vendor/assets/stylesheets/bootstrap/tables.less
-- vendor/assets/stylesheets/bootstrap/type.less
-- vendor/assets/stylesheets/bootstrap/variables.less
-has_rdoc: true
+- vendor/assets/javascripts/twitter/bootstrap.js
+- vendor/assets/javascripts/twitter/bootstrap/bootstrap-alerts.js
+- vendor/assets/javascripts/twitter/bootstrap/bootstrap-dropdown.js
+- vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js
+- vendor/assets/javascripts/twitter/bootstrap/bootstrap-popover.js
+- vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js
+- vendor/assets/javascripts/twitter/bootstrap/bootstrap-tabs.js
+- vendor/assets/javascripts/twitter/bootstrap/bootstrap-twipsy.js
+- vendor/assets/stylesheets/twitter/bootstrap.css.less
+- vendor/toolkit/twitter/bootstrap.less
+- vendor/toolkit/twitter/bootstrap/bootstrap.less
+- vendor/toolkit/twitter/bootstrap/forms.less
+- vendor/toolkit/twitter/bootstrap/mixins.less
+- vendor/toolkit/twitter/bootstrap/patterns.less
+- vendor/toolkit/twitter/bootstrap/reset.less
+- vendor/toolkit/twitter/bootstrap/scaffolding.less
+- vendor/toolkit/twitter/bootstrap/tables.less
+- vendor/toolkit/twitter/bootstrap/type.less
+- vendor/toolkit/twitter/bootstrap/variables.less
 homepage: https://github.com/seyhunak/twitter-bootstrap-rails
 licenses: []
 post_install_message: 
@@ -138,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: twitter-bootstrap-rails
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline

data/lib/twitter-bootstrap-rails/engine.rb

@@ -1,17 +0,0 @@
-module Twitter
-  module Bootstrap
-    module Rails
-      class Engine < ::Rails::Engine
-
-        config.after_initialize do |app|
-          twitter_bootstrap_less_files = config.root + 'vendor/stylesheets/bootstrap'
-          app.config.less.paths << twitter_bootstrap_less_files
-
-          puts app.config.less.paths.inspect
-        end
-
-	    end
-    end
-  end
-end
-

data/lib/twitter-bootstrap-rails/railtie.rb

@@ -1,8 +0,0 @@
-module Twitter
-  module Bootstrap
-    module Rails
-      class Railtie < ::Rails::Railtie; end
-    end
-  end
-end
-