twitter-bootstrap-rails 1.3.0 → 1.3.1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of twitter-bootstrap-rails might be problematic. Click here for more details.

Files changed (34) hide show
  1. data/Gemfile +1 -0
  2. data/README.md +57 -23
  3. data/lib/twitter-bootstrap-rails.rb +4 -6
  4. data/lib/twitter/bootstrap/rails/bootstrap.rb +2 -0
  5. data/lib/twitter/bootstrap/rails/engine.rb +15 -0
  6. data/lib/{twitter-bootstrap-rails → twitter/bootstrap/rails}/version.rb +1 -1
  7. data/twitter-bootstrap-rails.gemspec +2 -2
  8. data/vendor/assets/javascripts/twitter/bootstrap.js +7 -0
  9. data/vendor/assets/javascripts/{bootstrap-alerts.js → twitter/bootstrap/bootstrap-alerts.js} +0 -0
  10. data/vendor/assets/javascripts/{bootstrap-dropdown.js → twitter/bootstrap/bootstrap-dropdown.js} +0 -0
  11. data/vendor/assets/javascripts/{bootstrap-modal.js → twitter/bootstrap/bootstrap-modal.js} +0 -0
  12. data/vendor/assets/javascripts/{bootstrap-popover.js → twitter/bootstrap/bootstrap-popover.js} +0 -0
  13. data/vendor/assets/javascripts/{bootstrap-scrollspy.js → twitter/bootstrap/bootstrap-scrollspy.js} +0 -0
  14. data/vendor/assets/javascripts/{bootstrap-tabs.js → twitter/bootstrap/bootstrap-tabs.js} +0 -0
  15. data/vendor/assets/javascripts/{bootstrap-twipsy.js → twitter/bootstrap/bootstrap-twipsy.js} +0 -0
  16. data/vendor/assets/stylesheets/twitter/bootstrap.css.less +1 -0
  17. data/vendor/toolkit/twitter/bootstrap.less +1 -0
  18. data/vendor/{assets/stylesheets → toolkit/twitter}/bootstrap/bootstrap.less +0 -0
  19. data/vendor/{assets/stylesheets → toolkit/twitter}/bootstrap/forms.less +0 -0
  20. data/vendor/{assets/stylesheets → toolkit/twitter}/bootstrap/mixins.less +0 -0
  21. data/vendor/{assets/stylesheets → toolkit/twitter}/bootstrap/patterns.less +0 -0
  22. data/vendor/{assets/stylesheets → toolkit/twitter}/bootstrap/reset.less +0 -0
  23. data/vendor/{assets/stylesheets → toolkit/twitter}/bootstrap/scaffolding.less +0 -0
  24. data/vendor/{assets/stylesheets → toolkit/twitter}/bootstrap/tables.less +0 -0
  25. data/vendor/{assets/stylesheets → toolkit/twitter}/bootstrap/type.less +0 -0
  26. data/vendor/{assets/stylesheets → toolkit/twitter}/bootstrap/variables.less +0 -0
  27. metadata +38 -42
  28. data/lib/twitter-bootstrap-rails/engine.rb +0 -17
  29. data/lib/twitter-bootstrap-rails/railtie.rb +0 -8
  30. data/vendor/assets/javascripts/bootstrap.js +0 -8
  31. data/vendor/assets/stylesheets/bootstrap.css +0 -2362
  32. data/vendor/assets/stylesheets/bootstrap.css.less +0 -2
  33. data/vendor/assets/stylesheets/bootstrap.less +0 -1
  34. data/vendor/assets/stylesheets/bootstrap.min.css +0 -330
data/Gemfile CHANGED
@@ -2,3 +2,4 @@ source "http://rubygems.org"
2
2
 
3
3
  # Specify your gem's dependencies in twitter-bootstrap-rails.gemspec
4
4
  gemspec
5
+ gem 'less-rails', :path => ENV['LESS_RAILS_PATH'] if ENV['LESS_RAILS_PATH']
data/README.md CHANGED
@@ -2,10 +2,12 @@
2
2
  Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
3
3
  It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
4
4
 
5
+
5
6
  twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline
6
7
 
7
8
 
8
9
  ## Installing Gem
10
+
9
11
  Include Bootstrap in Gemfile;
10
12
 
11
13
  gem 'twitter-bootstrap-rails'
@@ -24,44 +26,70 @@ You can run bundle from command line
24
26
  Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less,
25
27
  a CSS preprocessor for faster and easier web development.
26
28
 
27
- ## Installing Less
28
-
29
- Include Less in Gemfile;
30
- gem 'less'
31
-
32
- Include less-rails in Gemfile;
33
- gem 'less-rails', :git => 'git://github.com/metaskills/less-rails.git'
34
-
35
29
  ## Using stylesheets with Less
36
30
 
37
31
  You have to require Bootstrap LESS (bootstrap.less) in your application.css
38
32
 
39
- /*
40
- *= require bootstrap
41
- */
33
+ /*
34
+ *= require twitter/bootstrap
35
+ */
42
36
 
43
37
  /* Your stylesheets goes here... */
38
+
44
39
 
45
40
  Now, you can override LESS files provided by Twitter Bootstrap
46
41
 
47
- i.e
48
-
49
- @import "bootstrap";
50
-
51
- // Baseline grid
52
- @basefont: 13px;
53
- @baseline: 18px;
42
+ @import "bootstrap";
43
+
44
+ // Baseline grid
45
+ @basefont: 13px;
46
+ @baseline: 18px;
54
47
 
55
48
 
56
- ## Using javascripts
49
+ ## Using Javascripts
57
50
 
58
51
  You have to require Bootstrap JS (bootstrap.js) in your application.js
59
52
 
60
- //= require bootstrap
53
+ //= require twitter/bootstrap
61
54
 
62
- $(document).ready(function(){
55
+ $(document).ready(function(){
63
56
  /* Your javascripts goes here... */
64
- });
57
+ });
58
+
59
+
60
+ ## Using With Coffeescript
61
+
62
+ Using Twitter Bootstrap with the CoffeeScript is easy.
63
+ Just create a "application.js.coffee" file to /app/assets/javascripts/ folder and put lines below.
64
+
65
+ $ ->
66
+ $("body > .topbar").scrollSpy()
67
+ $ ->
68
+ $(".tabs").tabs()
69
+ $ ->
70
+ $("a[rel=twipsy]").twipsy live: true
71
+ $ ->
72
+ $("a[rel=popover]").popover offset: 10
73
+ $ ->
74
+ $(".topbar-wrapper").dropdown()
75
+ $ ->
76
+ $(".alert-message").alert()
77
+ $ ->
78
+ domModal = $(".modal").modal(
79
+ backdrop: true
80
+ closeOnEscape: true
81
+ )
82
+ $(".open-modal").click ->
83
+ domModal.toggle()
84
+
85
+
86
+ ## Using Static CSS, JS (w/o Less)
87
+
88
+ twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest static CSS, JS files.
89
+
90
+ You can install from latest build (from branch);
91
+
92
+ gem 'twitter-bootstrap-rails', :git => "git://github.com/seyhunak/twitter-bootstrap-rails.git", :branch => "static"
65
93
 
66
94
 
67
95
  ## Changelog
@@ -69,6 +97,10 @@ You have to require Bootstrap JS (bootstrap.js) in your application.js
69
97
  <li>Version 0.0.5 deprecated</li>
70
98
  <li>Asset files updated to latest and removed version numbers</li>
71
99
  <li>Implemented Less::Rails Railtie to use with LESS</li>
100
+ <li>Fixed railtie to only initialize Less when installed</li>
101
+ <li>Created new branch for the static version of Bootstrap (w/o Less) - check static branch</li>
102
+ <li>Added path to support heroku deploy</li>
103
+ <li>Rake precompile issue fixed</li>
72
104
  </ul>
73
105
 
74
106
  ## Credits
@@ -77,12 +109,14 @@ Seyhun Akyürek - seyhunak [at] gmail com
77
109
  [Follow me on Twitter](http://twitter.com/seyhunak "Twitter")
78
110
 
79
111
 
80
- ## Contributors
112
+ ## Contributors & Patches
81
113
  <ul>
82
114
  <li>Daniel Morris</li>
83
115
  <li>Bradly Feeley</li>
84
116
  <li>Guilherme Moreira</li>
85
117
  <li>Alex Behar</li>
118
+ <li>Brandon Keene</li>
119
+ <li>Anthony Corcutt</li>
86
120
  </ul>
87
121
 
88
122
 
@@ -1,12 +1,10 @@
1
1
  module Twitter
2
2
  module Bootstrap
3
- module Rails
4
- if ::Rails.version < "3.1"
5
- require "twitter-bootstrap-rails/railtie"
6
- else
7
- require "twitter-bootstrap-rails/engine"
8
- end
3
+ module Rails
9
4
  end
10
5
  end
11
6
  end
12
7
 
8
+ require 'less-rails'
9
+ require 'twitter/bootstrap/rails/bootstrap'
10
+
@@ -0,0 +1,2 @@
1
+ require "twitter/bootstrap/rails/version"
2
+ require "twitter/bootstrap/rails/engine"
@@ -0,0 +1,15 @@
1
+ module Twitter
2
+ module Bootstrap
3
+ module Rails
4
+ class Engine < ::Rails::Engine
5
+
6
+ initializer 'twitter-bootstrap-rails.setup',
7
+ :after => 'less-rails.after.load_config_initializers',
8
+ :group => :all do |app|
9
+ app.config.less.paths << File.join(config.root, 'vendor', 'toolkit')
10
+ end
11
+
12
+ end
13
+ end
14
+ end
15
+ end
@@ -1,7 +1,7 @@
1
1
  module Twitter
2
2
  module Bootstrap
3
3
  module Rails
4
- VERSION = "1.3.0"
4
+ VERSION = "1.3.1"
5
5
  end
6
6
  end
7
7
  end
@@ -1,6 +1,6 @@
1
1
  # -*- encoding: utf-8 -*-
2
2
  $:.push File.expand_path("../lib", __FILE__)
3
- require "twitter-bootstrap-rails/version"
3
+ require "twitter/bootstrap/rails/version"
4
4
 
5
5
  Gem::Specification.new do |s|
6
6
  s.name = "twitter-bootstrap-rails"
@@ -24,6 +24,6 @@ Gem::Specification.new do |s|
24
24
  s.add_runtime_dependency 'railties'
25
25
  s.add_runtime_dependency 'actionpack'
26
26
  s.add_development_dependency "bundler"
27
- s.add_development_dependency "rails", "~> 3.1"
27
+ s.add_development_dependency 'rails', '~> 3.1.1'
28
28
  end
29
29
 
@@ -0,0 +1,7 @@
1
+ //= require twitter/bootstrap/bootstrap-alerts
2
+ //= require twitter/bootstrap/bootstrap-dropdown
3
+ //= require twitter/bootstrap/bootstrap-modal
4
+ //= require twitter/bootstrap/bootstrap-twipsy
5
+ //= require twitter/bootstrap/bootstrap-popover
6
+ //= require twitter/bootstrap/bootstrap-scrollspy
7
+ //= require twitter/bootstrap/bootstrap-tabs
@@ -0,0 +1 @@
1
+ @import "twitter/bootstrap/bootstrap";
@@ -0,0 +1 @@
1
+ @import "bootstrap/bootstrap.less";
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: twitter-bootstrap-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.0
4
+ version: 1.3.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,12 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-10-04 00:00:00.000000000 +03:00
13
- default_executable:
12
+ date: 2011-10-16 00:00:00.000000000Z
14
13
  dependencies:
15
14
  - !ruby/object:Gem::Dependency
16
15
  name: less
17
- requirement: &84477880 !ruby/object:Gem::Requirement
16
+ requirement: &82988600 !ruby/object:Gem::Requirement
18
17
  none: false
19
18
  requirements:
20
19
  - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
22
21
  version: '0'
23
22
  type: :runtime
24
23
  prerelease: false
25
- version_requirements: *84477880
24
+ version_requirements: *82988600
26
25
  - !ruby/object:Gem::Dependency
27
26
  name: less-rails
28
- requirement: &84477550 !ruby/object:Gem::Requirement
27
+ requirement: &82983220 !ruby/object:Gem::Requirement
29
28
  none: false
30
29
  requirements:
31
30
  - - ~>
@@ -33,10 +32,10 @@ dependencies:
33
32
  version: 2.0.1
34
33
  type: :runtime
35
34
  prerelease: false
36
- version_requirements: *84477550
35
+ version_requirements: *82983220
37
36
  - !ruby/object:Gem::Dependency
38
37
  name: railties
39
- requirement: &84477340 !ruby/object:Gem::Requirement
38
+ requirement: &82982760 !ruby/object:Gem::Requirement
40
39
  none: false
41
40
  requirements:
42
41
  - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
44
43
  version: '0'
45
44
  type: :runtime
46
45
  prerelease: false
47
- version_requirements: *84477340
46
+ version_requirements: *82982760
48
47
  - !ruby/object:Gem::Dependency
49
48
  name: actionpack
50
- requirement: &84477060 !ruby/object:Gem::Requirement
49
+ requirement: &82982400 !ruby/object:Gem::Requirement
51
50
  none: false
52
51
  requirements:
53
52
  - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
55
54
  version: '0'
56
55
  type: :runtime
57
56
  prerelease: false
58
- version_requirements: *84477060
57
+ version_requirements: *82982400
59
58
  - !ruby/object:Gem::Dependency
60
59
  name: bundler
61
- requirement: &84476820 !ruby/object:Gem::Requirement
60
+ requirement: &82982180 !ruby/object:Gem::Requirement
62
61
  none: false
63
62
  requirements:
64
63
  - - ! '>='
@@ -66,18 +65,18 @@ dependencies:
66
65
  version: '0'
67
66
  type: :development
68
67
  prerelease: false
69
- version_requirements: *84476820
68
+ version_requirements: *82982180
70
69
  - !ruby/object:Gem::Dependency
71
70
  name: rails
72
- requirement: &84476510 !ruby/object:Gem::Requirement
71
+ requirement: &82981930 !ruby/object:Gem::Requirement
73
72
  none: false
74
73
  requirements:
75
74
  - - ~>
76
75
  - !ruby/object:Gem::Version
77
- version: '3.1'
76
+ version: 3.1.1
78
77
  type: :development
79
78
  prerelease: false
80
- version_requirements: *84476510
79
+ version_requirements: *82981930
81
80
  description: twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for
82
81
  Rails 3.1 Asset Pipeline
83
82
  email:
@@ -91,32 +90,29 @@ files:
91
90
  - README.md
92
91
  - Rakefile
93
92
  - lib/twitter-bootstrap-rails.rb
94
- - lib/twitter-bootstrap-rails/engine.rb
95
- - lib/twitter-bootstrap-rails/railtie.rb
96
- - lib/twitter-bootstrap-rails/version.rb
93
+ - lib/twitter/bootstrap/rails/bootstrap.rb
94
+ - lib/twitter/bootstrap/rails/engine.rb
95
+ - lib/twitter/bootstrap/rails/version.rb
97
96
  - twitter-bootstrap-rails.gemspec
98
- - vendor/assets/javascripts/bootstrap-alerts.js
99
- - vendor/assets/javascripts/bootstrap-dropdown.js
100
- - vendor/assets/javascripts/bootstrap-modal.js
101
- - vendor/assets/javascripts/bootstrap-popover.js
102
- - vendor/assets/javascripts/bootstrap-scrollspy.js
103
- - vendor/assets/javascripts/bootstrap-tabs.js
104
- - vendor/assets/javascripts/bootstrap-twipsy.js
105
- - vendor/assets/javascripts/bootstrap.js
106
- - vendor/assets/stylesheets/bootstrap.css
107
- - vendor/assets/stylesheets/bootstrap.css.less
108
- - vendor/assets/stylesheets/bootstrap.less
109
- - vendor/assets/stylesheets/bootstrap.min.css
110
- - vendor/assets/stylesheets/bootstrap/bootstrap.less
111
- - vendor/assets/stylesheets/bootstrap/forms.less
112
- - vendor/assets/stylesheets/bootstrap/mixins.less
113
- - vendor/assets/stylesheets/bootstrap/patterns.less
114
- - vendor/assets/stylesheets/bootstrap/reset.less
115
- - vendor/assets/stylesheets/bootstrap/scaffolding.less
116
- - vendor/assets/stylesheets/bootstrap/tables.less
117
- - vendor/assets/stylesheets/bootstrap/type.less
118
- - vendor/assets/stylesheets/bootstrap/variables.less
119
- has_rdoc: true
97
+ - vendor/assets/javascripts/twitter/bootstrap.js
98
+ - vendor/assets/javascripts/twitter/bootstrap/bootstrap-alerts.js
99
+ - vendor/assets/javascripts/twitter/bootstrap/bootstrap-dropdown.js
100
+ - vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js
101
+ - vendor/assets/javascripts/twitter/bootstrap/bootstrap-popover.js
102
+ - vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js
103
+ - vendor/assets/javascripts/twitter/bootstrap/bootstrap-tabs.js
104
+ - vendor/assets/javascripts/twitter/bootstrap/bootstrap-twipsy.js
105
+ - vendor/assets/stylesheets/twitter/bootstrap.css.less
106
+ - vendor/toolkit/twitter/bootstrap.less
107
+ - vendor/toolkit/twitter/bootstrap/bootstrap.less
108
+ - vendor/toolkit/twitter/bootstrap/forms.less
109
+ - vendor/toolkit/twitter/bootstrap/mixins.less
110
+ - vendor/toolkit/twitter/bootstrap/patterns.less
111
+ - vendor/toolkit/twitter/bootstrap/reset.less
112
+ - vendor/toolkit/twitter/bootstrap/scaffolding.less
113
+ - vendor/toolkit/twitter/bootstrap/tables.less
114
+ - vendor/toolkit/twitter/bootstrap/type.less
115
+ - vendor/toolkit/twitter/bootstrap/variables.less
120
116
  homepage: https://github.com/seyhunak/twitter-bootstrap-rails
121
117
  licenses: []
122
118
  post_install_message:
@@ -138,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
138
134
  version: '0'
139
135
  requirements: []
140
136
  rubyforge_project: twitter-bootstrap-rails
141
- rubygems_version: 1.6.2
137
+ rubygems_version: 1.8.11
142
138
  signing_key:
143
139
  specification_version: 3
144
140
  summary: Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline
@@ -1,17 +0,0 @@
1
- module Twitter
2
- module Bootstrap
3
- module Rails
4
- class Engine < ::Rails::Engine
5
-
6
- config.after_initialize do |app|
7
- twitter_bootstrap_less_files = config.root + 'vendor/stylesheets/bootstrap'
8
- app.config.less.paths << twitter_bootstrap_less_files
9
-
10
- puts app.config.less.paths.inspect
11
- end
12
-
13
- end
14
- end
15
- end
16
- end
17
-
@@ -1,8 +0,0 @@
1
- module Twitter
2
- module Bootstrap
3
- module Rails
4
- class Railtie < ::Rails::Railtie; end
5
- end
6
- end
7
- end
8
-