twitter-bootstrap-rails 2.0.1.0 → 2.0.2

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.

Potentially problematic release.


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

Files changed (48) hide show
  1. data/README.md +20 -13
  2. data/lib/generators/bootstrap/install/install_generator.rb +12 -36
  3. data/lib/generators/bootstrap/install/templates/application.css +1 -0
  4. data/lib/generators/bootstrap/install/templates/bootstrap.less +6 -0
  5. data/lib/generators/bootstrap/layout/templates/layout.html.erb +4 -4
  6. data/lib/generators/bootstrap/layout/templates/layout.html.haml +4 -4
  7. data/lib/generators/bootstrap/layout/templates/layout.html.slim +4 -4
  8. data/lib/generators/bootstrap/themed/templates/_form.html.erb +3 -4
  9. data/lib/generators/bootstrap/themed/templates/edit.html.erb +2 -1
  10. data/lib/generators/bootstrap/themed/templates/index.html.erb +26 -25
  11. data/lib/generators/bootstrap/themed/templates/show.html.erb +3 -3
  12. data/lib/twitter/bootstrap/rails/version.rb +1 -1
  13. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js +5 -8
  14. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js +3 -3
  15. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-carousel.js +2 -5
  16. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-collapse.js +2 -2
  17. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-dropdown.js +2 -2
  18. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js +5 -6
  19. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-popover.js +2 -2
  20. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js +2 -2
  21. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tab.js +2 -2
  22. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js +2 -2
  23. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-transition.js +3 -3
  24. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js +2 -2
  25. data/vendor/assets/stylesheets/twitter/bootstrap.css.less +1 -0
  26. data/vendor/toolkit/twitter/bootstrap/bootstrap.less +1 -1
  27. data/vendor/toolkit/twitter/bootstrap/breadcrumbs.less +1 -1
  28. data/vendor/toolkit/twitter/bootstrap/button-groups.less +2 -4
  29. data/vendor/toolkit/twitter/bootstrap/buttons.less +7 -25
  30. data/vendor/toolkit/twitter/bootstrap/code.less +0 -13
  31. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +2 -1
  32. data/vendor/toolkit/twitter/bootstrap/forms.less +44 -51
  33. data/vendor/toolkit/twitter/bootstrap/labels.less +7 -23
  34. data/vendor/toolkit/twitter/bootstrap/mixins.less +25 -78
  35. data/vendor/toolkit/twitter/bootstrap/modals.less +0 -11
  36. data/vendor/toolkit/twitter/bootstrap/navbar.less +6 -13
  37. data/vendor/toolkit/twitter/bootstrap/navs.less +12 -21
  38. data/vendor/toolkit/twitter/bootstrap/reset.less +1 -1
  39. data/vendor/toolkit/twitter/bootstrap/responsive.less +6 -10
  40. data/vendor/toolkit/twitter/bootstrap/sprites.less +7 -9
  41. data/vendor/toolkit/twitter/bootstrap/tables.less +3 -14
  42. data/vendor/toolkit/twitter/bootstrap/thumbnails.less +2 -2
  43. data/vendor/toolkit/twitter/bootstrap/type.less +2 -3
  44. data/vendor/toolkit/twitter/bootstrap/variables.less +7 -15
  45. data/vendor/toolkit/twitter/bootstrap.less +1 -0
  46. metadata +14 -13
  47. data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less +0 -13
  48. data/vendor/toolkit/twitter/bootstrap_base.less +0 -2
@@ -21,21 +21,6 @@
21
21
  background-color: @grayLighter;
22
22
  }
23
23
 
24
- // Nav headers (for dropdowns and lists)
25
- .nav .nav-header {
26
- display: block;
27
- padding: 3px 15px;
28
- font-size: 11px;
29
- font-weight: bold;
30
- line-height: @baseLineHeight;
31
- color: @grayLight;
32
- text-shadow: 0 1px 0 rgba(255,255,255,.5);
33
- text-transform: uppercase;
34
- }
35
- // Space them out when they follow another list item (link)
36
- .nav li + .nav-header {
37
- margin-top: 9px;
38
- }
39
24
 
40
25
 
41
26
  // NAV LIST
@@ -48,12 +33,21 @@
48
33
  }
49
34
  .nav-list > li > a,
50
35
  .nav-list .nav-header {
36
+ display: block;
37
+ padding: 3px 15px;
51
38
  margin-left: -15px;
52
39
  margin-right: -15px;
53
40
  text-shadow: 0 1px 0 rgba(255,255,255,.5);
54
41
  }
55
- .nav-list > li > a {
56
- padding: 3px 15px;
42
+ .nav-list .nav-header {
43
+ font-size: 11px;
44
+ font-weight: bold;
45
+ line-height: @baseLineHeight;
46
+ color: @grayLight;
47
+ text-transform: uppercase;
48
+ }
49
+ .nav-list > li + .nav-header {
50
+ margin-top: 9px;
57
51
  }
58
52
  .nav-list .active > a,
59
53
  .nav-list .active > a:hover {
@@ -158,7 +152,7 @@
158
152
  }
159
153
  .nav-tabs.nav-stacked > li > a {
160
154
  border: 1px solid #ddd;
161
- .border-radius(0);
155
+ .border-radius(0px);
162
156
  }
163
157
  .nav-tabs.nav-stacked > li:first-child > a {
164
158
  .border-radius(4px 4px 0 0);
@@ -255,9 +249,6 @@
255
249
  .tabbable {
256
250
  .clearfix();
257
251
  }
258
- .tab-content {
259
- overflow: hidden; // prevent content from running below tabs
260
- }
261
252
 
262
253
  // Remove border on bottom, left, right
263
254
  .tabs-below .nav-tabs,
@@ -108,7 +108,7 @@ input[type="button"],
108
108
  input[type="reset"],
109
109
  input[type="submit"] {
110
110
  cursor: pointer; // Cursors on all buttons applied consistently
111
- -webkit-appearance: button; // Style clickable inputs in iOS
111
+ -webkit-appearance: button; // Style clicable inputs in iOS
112
112
  }
113
113
  input[type="search"] { // Appearance in Safari/Chrome
114
114
  -webkit-appearance: textfield;
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap Responsive v2.0.1
2
+ * Bootstrap Responsive v2.0.0
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -56,7 +56,7 @@
56
56
  .uneditable-input {
57
57
  display: block;
58
58
  width: 100%;
59
- min-height: 28px; /* Make inputs at least the height of their button counterpart */
59
+ height: 28px; /* Make inputs at least the height of their button counterpart */
60
60
  /* Makes inputs behave like true block-level elements */
61
61
  -webkit-box-sizing: border-box; /* Older Webkit */
62
62
  -moz-box-sizing: border-box; /* Older FF */
@@ -123,7 +123,7 @@
123
123
  // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
124
124
  // --------------------------------------------------
125
125
 
126
- @media (max-width: 767px) {
126
+ @media (max-width: 768px) {
127
127
  // GRID & CONTAINERS
128
128
  // -----------------
129
129
  // Remove width from containers
@@ -154,7 +154,7 @@
154
154
  // PORTRAIT TABLET TO DEFAULT DESKTOP
155
155
  // ----------------------------------
156
156
 
157
- @media (min-width: 768px) and (max-width: 979px) {
157
+ @media (min-width: 768px) and (max-width: 980px) {
158
158
 
159
159
  // Fixed grid
160
160
  #gridSystem > .generate(12, 42px, 20px);
@@ -171,7 +171,7 @@
171
171
 
172
172
  // TABLETS AND BELOW
173
173
  // -----------------
174
- @media (max-width: 979px) {
174
+ @media (max-width: 980px) {
175
175
 
176
176
  // UNFIX THE TOPBAR
177
177
  // ----------------
@@ -215,10 +215,6 @@
215
215
  .navbar .nav > .divider-vertical {
216
216
  display: none;
217
217
  }
218
- .navbar .nav .nav-header {
219
- color: @navbarText;
220
- text-shadow: none;
221
- }
222
218
  // Nav and dropdown links in navbar
223
219
  .navbar .nav > li > a,
224
220
  .navbar .dropdown-menu a {
@@ -246,7 +242,7 @@
246
242
  padding: 0;
247
243
  background-color: transparent;
248
244
  border: none;
249
- .border-radius(0);
245
+ .border-radius(0px);
250
246
  .box-shadow(none);
251
247
  }
252
248
  .navbar .dropdown-menu:before,
@@ -6,29 +6,27 @@
6
6
  // ICONS
7
7
  // -----
8
8
 
9
- // All icons receive the styles of the <i> tag with a base class
10
- // of .i and are then given a unique class to add width, height,
9
+ // All icons receive the styles of the <i> tag with a base class
10
+ // of .i and are then given a unique class to add width, height,
11
11
  // and background-position. Your resulting HTML will look like
12
- // <i class="icon-inbox"></i>.
12
+ // <i class="i icon-inbox"></i>.
13
13
 
14
14
  // For the white version of the icons, just add the .icon-white class:
15
- // <i class="icon-inbox icon-white"></i>
15
+ // <i class="i icon-inbox icon-white"></i>
16
16
 
17
- [class^="icon-"],
18
- [class*=" icon-"] {
17
+ [class^="icon-"] {
19
18
  display: inline-block;
20
19
  width: 14px;
21
20
  height: 14px;
22
- line-height: 14px;
23
21
  vertical-align: text-top;
24
- background-image: url(@iconSpritePath);
22
+ background-image: asset-url('twitter/bootstrap/glyphicons-halflings.png');
25
23
  background-position: 14px 14px;
26
24
  background-repeat: no-repeat;
27
25
 
28
26
  .ie7-restore-right-whitespace();
29
27
  }
30
28
  .icon-white {
31
- background-image: url(@iconWhiteSpritePath);
29
+ background-image: asset-url('twitter/bootstrap/glyphicons-halflings-white.png');
32
30
  }
33
31
 
34
32
  .icon-glass { background-position: 0 0; }
@@ -25,16 +25,15 @@ table {
25
25
  padding: 8px;
26
26
  line-height: @baseLineHeight;
27
27
  text-align: left;
28
- vertical-align: top;
29
28
  border-top: 1px solid #ddd;
30
29
  }
31
30
  th {
32
31
  font-weight: bold;
33
- }
34
- // Bottom align for column headings
35
- thead th {
36
32
  vertical-align: bottom;
37
33
  }
34
+ td {
35
+ vertical-align: top;
36
+ }
38
37
  // Remove top border from thead by default
39
38
  thead:first-child tr th,
40
39
  thead:first-child tr td {
@@ -114,16 +113,6 @@ table {
114
113
  }
115
114
 
116
115
 
117
- // HOVER EFFECT
118
- // ------------
119
- // Placed here since it has to come after the potential zebra striping
120
- .table {
121
- tbody tr:hover td,
122
- tbody tr:hover th {
123
- background-color: #f5f5f5;
124
- }
125
- }
126
-
127
116
 
128
117
  // TABLE CELL SIZING
129
118
  // -----------------
@@ -2,13 +2,13 @@
2
2
  // ----------
3
3
 
4
4
  .thumbnails {
5
- margin-left: -@gridGutterWidth;
5
+ margin-left: -20px;
6
6
  list-style: none;
7
7
  .clearfix();
8
8
  }
9
9
  .thumbnails > li {
10
10
  float: left;
11
- margin: 0 0 @baseLineHeight @gridGutterWidth;
11
+ margin: 0 0 @baseLineHeight 20px;
12
12
  }
13
13
  .thumbnail {
14
14
  display: block;
@@ -110,8 +110,7 @@ ol {
110
110
  li {
111
111
  line-height: @baseLineHeight;
112
112
  }
113
- ul.unstyled,
114
- ol.unstyled {
113
+ ul.unstyled {
115
114
  margin-left: 0;
116
115
  list-style: none;
117
116
  }
@@ -138,7 +137,7 @@ dd {
138
137
  hr {
139
138
  margin: @baseLineHeight 0;
140
139
  border: 0;
141
- border-top: 1px solid @hrBorder;
140
+ border-top: 1px solid #e5e5e5;
142
141
  border-bottom: 1px solid @white;
143
142
  }
144
143
 
@@ -47,28 +47,20 @@
47
47
  // Z-index master list
48
48
  // Used for a bird's eye view of components dependent on the z-axis
49
49
  // Try to avoid customizing these :)
50
- @zindexDropdown: 1000;
51
- @zindexPopover: 1010;
52
- @zindexTooltip: 1020;
53
- @zindexFixedNavbar: 1030;
54
- @zindexModalBackdrop: 1040;
55
- @zindexModal: 1050;
56
-
57
- // Sprite icons path
58
- @iconSpritePath: "../img/glyphicons-halflings.png";
59
- @iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
50
+ @zindexDropdown: 1000;
51
+ @zindexPopover: 1010;
52
+ @zindexTooltip: 1020;
53
+ @zindexFixedNavbar: 1030;
54
+ @zindexModalBackdrop: 1040;
55
+ @zindexModal: 1050;
60
56
 
61
57
  // Input placeholder text color
62
- @placeholderText: @grayLight;
63
-
64
- // Hr border color
65
- @hrBorder: @grayLighter;
58
+ @placeholderText: @grayLight;
66
59
 
67
60
  // Navbar
68
61
  @navbarHeight: 40px;
69
62
  @navbarBackground: @grayDarker;
70
63
  @navbarBackgroundHighlight: @grayDark;
71
- @navbarLinkBackgroundHover: transparent;
72
64
 
73
65
  @navbarText: @grayLight;
74
66
  @navbarLinkColor: @grayLight;
@@ -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: 2.0.1.0
4
+ version: 2.0.2
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-02-18 00:00:00.000000000 Z
12
+ date: 2012-02-06 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
16
- requirement: &72451470 !ruby/object:Gem::Requirement
16
+ requirement: &69818520 !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: *72451470
24
+ version_requirements: *69818520
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: actionpack
27
- requirement: &72451060 !ruby/object:Gem::Requirement
27
+ requirement: &69817160 !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: *72451060
35
+ version_requirements: *69817160
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: less-rails
38
- requirement: &72450830 !ruby/object:Gem::Requirement
38
+ requirement: &69816460 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
42
42
  - !ruby/object:Gem::Version
43
- version: 2.1.6
43
+ version: 2.1.5
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *72450830
46
+ version_requirements: *69816460
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rails
49
- requirement: &72905200 !ruby/object:Gem::Requirement
49
+ requirement: &69815810 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: '3.1'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *72905200
57
+ version_requirements: *69815810
58
58
  description: twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for
59
59
  Rails 3.1 Asset Pipeline
60
60
  email:
@@ -84,9 +84,9 @@ files:
84
84
  - lib/generators/bootstrap/themed/templates/index.html.haml
85
85
  - lib/generators/bootstrap/themed/templates/index.html.slim
86
86
  - lib/generators/bootstrap/install/templates/bootstrap.coffee
87
- - lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less
88
87
  - lib/generators/bootstrap/install/templates/application.js
89
88
  - lib/generators/bootstrap/install/templates/application.css
89
+ - lib/generators/bootstrap/install/templates/bootstrap.less
90
90
  - lib/generators/bootstrap/install/install_generator.rb
91
91
  - lib/twitter-bootstrap-rails.rb
92
92
  - lib/twitter/bootstrap/rails/bootstrap.rb
@@ -94,6 +94,7 @@ files:
94
94
  - lib/twitter/bootstrap/rails/engine.rb
95
95
  - vendor/assets/images/twitter/bootstrap/glyphicons-halflings-white.png
96
96
  - vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png
97
+ - vendor/assets/stylesheets/twitter/bootstrap.css.less
97
98
  - vendor/assets/javascripts/twitter/bootstrap.js
98
99
  - vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js
99
100
  - vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js
@@ -107,7 +108,7 @@ files:
107
108
  - vendor/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js
108
109
  - vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js
109
110
  - vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js
110
- - vendor/toolkit/twitter/bootstrap_base.less
111
+ - vendor/toolkit/twitter/bootstrap.less
111
112
  - vendor/toolkit/twitter/bootstrap/thumbnails.less
112
113
  - vendor/toolkit/twitter/bootstrap/code.less
113
114
  - vendor/toolkit/twitter/bootstrap/navbar.less
@@ -1,13 +0,0 @@
1
- @import "twitter/bootstrap/bootstrap";
2
- @import "twitter/bootstrap/responsive";
3
-
4
- // Your custom LESS stylesheets goes here
5
- //
6
- // Since bootstrap was imported above you have access to its mixins which
7
- // you may use and inherit here
8
- //
9
- // If you'd like to override bootstrap's own variables, you can do so here as well
10
- // See http://twitter.github.com/bootstrap/less.html for their names and documentation
11
- //
12
- // Example:
13
- // @linkColor: #ff0000;
@@ -1,2 +0,0 @@
1
- @import "bootstrap/variables.less";
2
- @import "bootstrap/mixins.less";