twitter-bootstrap-rails 2.1.0 → 2.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. data/README.md +10 -0
  2. data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less +0 -1
  3. data/lib/generators/bootstrap/layout/templates/layout.html.erb +20 -4
  4. data/lib/generators/bootstrap/layout/templates/layout.html.haml +6 -3
  5. data/lib/generators/bootstrap/layout/templates/layout.html.slim +5 -3
  6. data/lib/generators/bootstrap/themed/templates/edit.html.erb +1 -1
  7. data/lib/generators/bootstrap/themed/templates/edit.html.haml +1 -1
  8. data/lib/generators/bootstrap/themed/templates/edit.html.slim +1 -1
  9. data/lib/generators/bootstrap/themed/templates/index.html.erb +1 -1
  10. data/lib/generators/bootstrap/themed/templates/index.html.haml +1 -1
  11. data/lib/generators/bootstrap/themed/templates/index.html.slim +1 -1
  12. data/lib/generators/bootstrap/themed/templates/new.html.erb +1 -1
  13. data/lib/generators/bootstrap/themed/templates/new.html.haml +1 -1
  14. data/lib/generators/bootstrap/themed/templates/new.html.slim +1 -1
  15. data/lib/generators/bootstrap/themed/templates/show.html.erb +1 -1
  16. data/lib/generators/bootstrap/themed/templates/show.html.haml +1 -1
  17. data/lib/generators/bootstrap/themed/templates/show.html.slim +1 -1
  18. data/lib/twitter/bootstrap/rails/twitter-bootstrap-breadcrumbs.rb +1 -1
  19. data/lib/twitter/bootstrap/rails/version.rb +1 -1
  20. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js +5 -1
  21. data/vendor/toolkit/fontawesome.less +5 -5
  22. data/vendor/toolkit/twitter/bootstrap/type.less +10 -1
  23. metadata +13 -13
data/README.md CHANGED
@@ -5,6 +5,7 @@ twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails 3.1 A
5
5
 
6
6
  [![Build Status](https://secure.travis-ci.org/seyhunak/twitter-bootstrap-rails.png)](http://travis-ci.org/seyhunak/twitter-bootstrap-rails)
7
7
  [![Dependency Status](https://gemnasium.com/seyhunak/twitter-bootstrap-rails.png)](https://gemnasium.com/seyhunak/twitter-bootstrap-rails)
8
+ [![Code Climate](https://codeclimate.com/badge.png)](https://github.com/seyhunak/twitter-bootstrap-rails)
8
9
 
9
10
 
10
11
  ## Screencasts
@@ -180,6 +181,7 @@ gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootst
180
181
  <li>Released gem v.2.0.8</li>
181
182
  <li>Released gem v.2.0.9 (Bootstrap 2.0.4 and FontAwesome 2.0 support)</li>
182
183
  <li>Released gem v.2.1.0 (JRuby support)</li>
184
+ <li>Released gem v.2.1.1 (minor fixes)</li>
183
185
  </ul>
184
186
 
185
187
 
@@ -223,6 +225,14 @@ Seyhun Akyürek - seyhunak [at] gmail com
223
225
 
224
226
  [Visit My Blog](http://www.seyhunakyurek.com/ "Visit My Blog")
225
227
 
228
+
229
+ ## Want to Donate?
230
+ <img src="https://www.paypalobjects.com/en_US/i/logo/PayPal_mark_50x34.gif"></img>
231
+
232
+ [Want to donate for my efforts?. Show your love](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=W8ZLWQBREFP4U
233
+ "Donate")
234
+
235
+
226
236
  ## Score me
227
237
  <img src="https://addons.opera.com/media/extensions/55/14355/1.0.1-rev1/icons/icon_64x64.png"></img>
228
238
 
data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less CHANGED
@@ -1,7 +1,6 @@
1
1
  @import "twitter/bootstrap/bootstrap";
2
2
  body {
3
3
  padding-top: 60px;
4
- padding-left: 20px;
5
4
  }
6
5
 
7
6
  @import "twitter/bootstrap/responsive";
data/lib/generators/bootstrap/layout/templates/layout.html.erb CHANGED
@@ -2,6 +2,7 @@
2
2
  <html lang="en">
3
3
  <head>
4
4
  <meta charset="utf-8">
5
+ <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
5
6
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
6
7
  <title><%%= content_for?(:title) ? yield(:title) : "<%= app_name %>" %></title>
7
8
  <%%= csrf_meta_tags %>
@@ -13,10 +14,25 @@
13
14
 
14
15
  <%%= stylesheet_link_tag "application", :media => "all" %>
15
16
 
16
- <link href="images/favicon.ico" rel="shortcut icon">
17
- <link href="images/apple-touch-icon.png" rel="apple-touch-icon">
18
- <link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon" sizes="72x72">
19
- <link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon" sizes="114x114">
17
+ <!-- For third-generation iPad with high-resolution Retina display: -->
18
+ <!-- Size should be 144 x 144 pixels -->
19
+ <%%= favicon_link_tag 'images/apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144' %>
20
+
21
+ <!-- For iPhone with high-resolution Retina display: -->
22
+ <!-- Size should be 114 x 114 pixels -->
23
+ <%%= favicon_link_tag 'images/apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114' %>
24
+
25
+ <!-- For first- and second-generation iPad: -->
26
+ <!-- Size should be 72 x 72 pixels -->
27
+ <%%= favicon_link_tag 'images/apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72' %>
28
+
29
+ <!-- For non-Retina iPhone, iPod Touch, and Android 2.1+ devices: -->
30
+ <!-- Size should be 57 x 57 pixels -->
31
+ <%%= favicon_link_tag 'images/apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png' %>
32
+
33
+ <!-- For all other devices -->
34
+ <!-- Size should be 32 x 32 pixels -->
35
+ <%%= favicon_link_tag 'images/favicon.ico', :rel => 'shortcut icon' %>
20
36
  </head>
21
37
  <body>
22
38
 
data/lib/generators/bootstrap/layout/templates/layout.html.haml CHANGED
@@ -2,6 +2,7 @@
2
2
  %html(lang="en")
3
3
  %head
4
4
  %meta(charset="utf-8")
5
+ %meta(http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1")
5
6
  %meta(name="viewport" content="width=device-width, initial-scale=1.0")
6
7
  %title= content_for?(:title) ? yield(:title) : "<%= app_name %>"
7
8
  = csrf_meta_tags
@@ -9,10 +10,12 @@
9
10
  /[if lt IE 9]
10
11
  = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
11
12
  = stylesheet_link_tag "application", :media => "all"
13
+ %link(href="images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144")
14
+ %link(href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114")
15
+ %link(href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72")
16
+ %link(href="images/apple-touch-icon.png" rel="apple-touch-icon-precomposed")
12
17
  %link(href="images/favicon.ico" rel="shortcut icon")
13
- %link(href="images/apple-touch-icon.png" rel="apple-touch-icon")
14
- %link(href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon" sizes="72x72")
15
- %link(href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon" sizes="114x114")
18
+
16
19
 
17
20
  %body
18
21
  .navbar.navbar-fixed-top
data/lib/generators/bootstrap/layout/templates/layout.html.slim CHANGED
@@ -2,6 +2,7 @@ doctype html
2
2
  html lang="en"
3
3
  head
4
4
  meta charset="utf-8"
5
+ meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"
5
6
  meta name="viewport" content="width=device-width, initial-scale=1.0"
6
7
  title= content_for?(:title) ? yield(:title) : "<%= app_name %>"
7
8
  = csrf_meta_tags
@@ -10,10 +11,11 @@ html lang="en"
10
11
  /[if lt IE 9]
11
12
  = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
12
13
  = stylesheet_link_tag "application", :media => "all"
14
+ link href="images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144"
15
+ link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114"
16
+ link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72"
17
+ link href="images/apple-touch-icon.png" rel="apple-touch-icon-precomposed"
13
18
  link href="images/favicon.ico" rel="shortcut icon"
14
- link href="images/apple-touch-icon.png" rel="apple-touch-icon"
15
- link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon" sizes="72x72"
16
- link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon" sizes="114x114"
17
19
 
18
20
  body
19
21
  .navbar.navbar-fixed-top
data/lib/generators/bootstrap/themed/templates/edit.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <%%- model_class = @<%= resource_name %>.class -%>
1
+ <%%- model_class = <%= resource_name.classify %> -%>
2
2
  <div class="page-header">
3
3
  <h1><%%=t '.title', :default => t('helpers.titles.edit', :model => model_class.model_name.human,
4
4
  :default => "Edit #{model_class.model_name.human}") %></h1>
data/lib/generators/bootstrap/themed/templates/edit.html.haml CHANGED
@@ -1,4 +1,4 @@
1
- - model_class = @<%= resource_name %>.class
1
+ - model_class = <%= resource_name.classify %>
2
2
  .page-header
3
3
  %h1=t '.title', :default => t('helpers.titles.edit', :model => model_class.model_name.human, :default => "Edit #{model_class.model_name.human}")
4
4
  = render :partial => "form"
data/lib/generators/bootstrap/themed/templates/edit.html.slim CHANGED
@@ -1,4 +1,4 @@
1
- - model_class = @<%= resource_name %>.class
1
+ - model_class = <%= resource_name.classify %>
2
2
  div class="page-header"
3
3
  h1=t '.title', :default => t('helpers.titles.edit', :model => model_class.model_name.human, :default => "Edit #{model_class.model_name.human}")
4
4
  = render :partial => "form"
data/lib/generators/bootstrap/themed/templates/index.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <%%- model_class = <%= resource_name.classify %>.new.class -%>
1
+ <%%- model_class = <%= resource_name.classify %> -%>
2
2
  <div class="page-header">
3
3
  <h1><%%=t '.title', :default => model_class.model_name.human.pluralize %></h1>
4
4
  </div>
data/lib/generators/bootstrap/themed/templates/index.html.haml CHANGED
@@ -1,4 +1,4 @@
1
- - model_class = <%= resource_name.classify %>.new.class
1
+ - model_class = <%= resource_name.classify %>
2
2
  .page-header
3
3
  %h1=t '.title', :default => model_class.model_name.human.pluralize
4
4
  %table.table.table-striped
data/lib/generators/bootstrap/themed/templates/index.html.slim CHANGED
@@ -1,4 +1,4 @@
1
- - model_class = <%= resource_name.classify %>.new.class
1
+ - model_class = <%= resource_name.classify %>
2
2
  div class="page-header"
3
3
  h1=t '.title', :default => model_class.model_name.human.pluralize
4
4
  table class="table table-striped"
data/lib/generators/bootstrap/themed/templates/new.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <%%- model_class = @<%= resource_name %>.class -%>
1
+ <%%- model_class = <%= resource_name.classify %> -%>
2
2
  <div class="page-header">
3
3
  <h1><%%=t '.title', :default => t('helpers.titles.new', :model => model_class.model_name.human,
4
4
  :default => "New #{model_class.model_name.human}") %></h1>
data/lib/generators/bootstrap/themed/templates/new.html.haml CHANGED
@@ -1,4 +1,4 @@
1
- - model_class = @<%= resource_name %>.class
1
+ - model_class = <%= resource_name.classify %>
2
2
  .page-header
3
3
  %h1=t '.title', :default => t('helpers.titles.new', :model => model_class.model_name.human, :default => "New #{model_class.model_name.human}")
4
4
  = render :partial => "form"
data/lib/generators/bootstrap/themed/templates/new.html.slim CHANGED
@@ -1,4 +1,4 @@
1
- - model_class = @<%= resource_name %>.class
1
+ - model_class = <%= resource_name.classify %>
2
2
  div class="page-header"
3
3
  h1=t '.title', :default => t('helpers.titles.new', :model => model_class.model_name.human, :default => "New #{model_class.model_name.human}")
4
4
  = render :partial => "form"
data/lib/generators/bootstrap/themed/templates/show.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <%%- model_class = @<%= resource_name %>.class -%>
1
+ <%%- model_class = <%= resource_name.classify %> -%>
2
2
  <div class="page-header">
3
3
  <h1><%%=t '.title', :default => model_class.model_name.human %></h1>
4
4
  </div>
data/lib/generators/bootstrap/themed/templates/show.html.haml CHANGED
@@ -1,4 +1,4 @@
1
- - model_class = @<%= resource_name %>.class
1
+ - model_class = <%= resource_name.classify %>
2
2
  .page-header
3
3
  %h1=t '.title', :default => model_class.model_name.human
4
4
 
data/lib/generators/bootstrap/themed/templates/show.html.slim CHANGED
@@ -1,4 +1,4 @@
1
- - model_class = @<%= resource_name %>.class
1
+ - model_class = <%= resource_name.classify %>
2
2
  div class="page-header"
3
3
  h1=t '.title', :default => model_class.model_name.human
4
4
 
data/lib/twitter/bootstrap/rails/twitter-bootstrap-breadcrumbs.rb CHANGED
@@ -17,7 +17,7 @@ module Twitter
17
17
 
18
18
  def add_breadcrumb name, url = '', options = {}
19
19
  @breadcrumbs ||= []
20
- url = eval(url) if url =~ /_path|_url|@/
20
+ url = eval(url.to_s) if url =~ /_path|_url|@/
21
21
  @breadcrumbs << {:name => name, :url => url, :options => options}
22
22
  end
23
23
 
data/lib/twitter/bootstrap/rails/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Twitter
2
2
  module Bootstrap
3
3
  module Rails
4
- VERSION = "2.1.0"
4
+ VERSION = "2.1.1"
5
5
  end
6
6
  end
7
7
  end
data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js CHANGED
@@ -230,7 +230,11 @@
230
230
 
231
231
  , blur: function (e) {
232
232
  var that = this
233
- setTimeout(function () { that.hide() }, 150)
233
+ setTimeout(function () {
234
+ if (!that.$menu.is(':hover')) {
235
+ that.hide();
236
+ }
237
+ }, 150)
234
238
  }
235
239
 
236
240
  , click: function (e) {
data/vendor/toolkit/fontawesome.less CHANGED
@@ -24,11 +24,11 @@
24
24
 
25
25
  @font-face {
26
26
  font-family: 'FontAwesome';
27
- src: url(@fontAwesomeEotPath);
28
- src: url('@{@fontAwesomeEotPath}?#iefix') format('embedded-opentype'),
29
- url(@fontAwesomeWoffPath) format('woff'),
30
- url(@fontAwesomeTtfPath) format('truetype'),
31
- url('@{@fontAwesomeSvgPath}#FontAwesome') format('svg');
27
+ src: asset-url(@fontAwesomeEotPath);
28
+ src: asset-url("@{fontAwesomeEotPath}?#iefix") format('embedded-opentype'),
29
+ asset-url(@fontAwesomeWoffPath) format('woff'),
30
+ asset-url(@fontAwesomeTtfPath) format('truetype'),
31
+ asset-url('@{fontAwesomeSvgPath}#FontAwesome') format('svg');
32
32
  font-weight: normal;
33
33
  font-style: normal;
34
34
  }
data/vendor/toolkit/twitter/bootstrap/type.less CHANGED
@@ -124,7 +124,11 @@ dd {
124
124
  }
125
125
  dt {
126
126
  font-weight: bold;
127
- line-height: @baseLineHeight - 1; // fix jank Helvetica Neue font bug
127
+ // The following fix causes the issue: https://github.com/twitter/bootstrap/issues/3806
128
+ // which is a problem in the bootstrap:themed show view as noted here:
129
+ // https://github.com/seyhunak/twitter-bootstrap-rails/issues/274
130
+ // so we're commenting it out.
131
+ //line-height: @baseLineHeight - 1; // fix jank Helvetica Neue font bug
128
132
  }
129
133
  dd {
130
134
  margin-left: @baseLineHeight / 2;
@@ -141,6 +145,11 @@ dd {
141
145
  dd {
142
146
  margin-left: 130px;
143
147
  }
148
+ &:after {
149
+ display: table;
150
+ content: "";
151
+ clear: both;
152
+ }
144
153
  }
145
154
 
146
155
  // MISC
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: 2.1.0
4
+ version: 2.1.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-06-11 00:00:00.000000000 Z
12
+ date: 2012-07-17 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
16
- requirement: &70342933505780 !ruby/object:Gem::Requirement
16
+ requirement: &70109523796320 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.1'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70342933505780
24
+ version_requirements: *70109523796320
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: actionpack
27
- requirement: &70342933504660 !ruby/object:Gem::Requirement
27
+ requirement: &70109523795820 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
32
32
  version: '3.1'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70342933504660
35
+ version_requirements: *70109523795820
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: therubyracer
38
- requirement: &70342933503540 !ruby/object:Gem::Requirement
38
+ requirement: &70109523795320 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
- - - ~>
41
+ - - =
42
42
  - !ruby/object:Gem::Version
43
43
  version: 0.10.1
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70342933503540
46
+ version_requirements: *70109523795320
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: less-rails
49
- requirement: &70342933501060 !ruby/object:Gem::Requirement
49
+ requirement: &70109523794860 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 2.2.2
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70342933501060
57
+ version_requirements: *70109523794860
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rails
60
- requirement: &70342933500180 !ruby/object:Gem::Requirement
60
+ requirement: &70109523794400 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
65
65
  version: '3.1'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70342933500180
68
+ version_requirements: *70109523794400
69
69
  description: twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for
70
70
  Rails 3.1 Asset Pipeline
71
71
  email: