twitter-bootstrap-rails 2.0.6 → 2.0.7

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 (53) hide show
  1. data/README.md +40 -22
  2. data/app/helpers/flash_block_helper.rb +17 -0
  3. data/app/helpers/twitter_breadcrumbs_helper.rb +5 -0
  4. data/app/views/twitter-bootstrap/_breadcrumbs.html.erb +14 -0
  5. data/lib/generators/bootstrap/layout/templates/layout.html.erb +1 -5
  6. data/lib/generators/bootstrap/layout/templates/layout.html.haml +1 -5
  7. data/lib/generators/bootstrap/layout/templates/layout.html.slim +1 -5
  8. data/lib/generators/bootstrap/themed/templates/show.html.erb +4 -4
  9. data/lib/twitter/bootstrap/rails/engine.rb +1 -1
  10. data/lib/twitter/bootstrap/rails/version.rb +1 -1
  11. data/vendor/assets/images/twitter/bootstrap/glyphicons-halflings-white.png +0 -0
  12. data/vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png +0 -0
  13. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js +28 -32
  14. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js +29 -33
  15. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-carousel.js +27 -19
  16. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-collapse.js +45 -26
  17. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-dropdown.js +18 -10
  18. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js +25 -17
  19. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-popover.js +13 -10
  20. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js +43 -17
  21. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tab.js +12 -7
  22. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js +40 -35
  23. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-transition.js +30 -20
  24. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js +25 -11
  25. data/vendor/toolkit/twitter/bootstrap/accordion.less +5 -0
  26. data/vendor/toolkit/twitter/bootstrap/bootstrap.less +2 -3
  27. data/vendor/toolkit/twitter/bootstrap/button-groups.less +55 -36
  28. data/vendor/toolkit/twitter/bootstrap/buttons.less +15 -11
  29. data/vendor/toolkit/twitter/bootstrap/close.less +12 -1
  30. data/vendor/toolkit/twitter/bootstrap/code.less +4 -4
  31. data/vendor/toolkit/twitter/bootstrap/component-animations.less +5 -5
  32. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +15 -20
  33. data/vendor/toolkit/twitter/bootstrap/forms.less +58 -29
  34. data/vendor/toolkit/twitter/bootstrap/labels-badges.less +55 -0
  35. data/vendor/toolkit/twitter/bootstrap/layouts.less +1 -1
  36. data/vendor/toolkit/twitter/bootstrap/mixins.less +53 -36
  37. data/vendor/toolkit/twitter/bootstrap/modals.less +1 -1
  38. data/vendor/toolkit/twitter/bootstrap/navbar.less +64 -41
  39. data/vendor/toolkit/twitter/bootstrap/navs.less +36 -36
  40. data/vendor/toolkit/twitter/bootstrap/progress-bars.less +14 -6
  41. data/vendor/toolkit/twitter/bootstrap/reset.less +3 -3
  42. data/vendor/toolkit/twitter/bootstrap/responsive-1200px-min.less +26 -0
  43. data/vendor/toolkit/twitter/bootstrap/responsive-767px-max.less +149 -0
  44. data/vendor/toolkit/twitter/bootstrap/responsive-768px-979px.less +17 -0
  45. data/vendor/toolkit/twitter/bootstrap/responsive-navbar.less +146 -0
  46. data/vendor/toolkit/twitter/bootstrap/responsive-utilities.less +41 -0
  47. data/vendor/toolkit/twitter/bootstrap/responsive.less +14 -337
  48. data/vendor/toolkit/twitter/bootstrap/sprites.less +39 -6
  49. data/vendor/toolkit/twitter/bootstrap/tables.less +22 -5
  50. data/vendor/toolkit/twitter/bootstrap/thumbnails.less +14 -2
  51. data/vendor/toolkit/twitter/bootstrap/type.less +7 -6
  52. data/vendor/toolkit/twitter/bootstrap/variables.less +10 -6
  53. metadata +31 -11
@@ -6,8 +6,8 @@
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
12
  // <i class="icon-inbox"></i>.
13
13
 
@@ -19,13 +19,13 @@
19
19
  display: inline-block;
20
20
  width: 14px;
21
21
  height: 14px;
22
+ .ie7-restore-right-whitespace();
22
23
  line-height: 14px;
23
24
  vertical-align: text-top;
24
25
  background-image: url(@iconSpritePath);
25
26
  background-position: 14px 14px;
26
27
  background-repeat: no-repeat;
27
28
 
28
- .ie7-restore-right-whitespace();
29
29
  }
30
30
  .icon-white {
31
31
  background-image: url(@iconWhiteSpritePath);
@@ -149,10 +149,43 @@
149
149
  .icon-comment { background-position: -240px -120px; }
150
150
  .icon-magnet { background-position: -264px -120px; }
151
151
  .icon-chevron-up { background-position: -288px -120px; }
152
- .icon-chevron-down { background-position: -313px -119px; } // 1px off
152
+ .icon-chevron-down { background-position: -313px -119px; } // 1px, 1px off
153
153
  .icon-retweet { background-position: -336px -120px; }
154
154
  .icon-shopping-cart { background-position: -360px -120px; }
155
155
  .icon-folder-close { background-position: -384px -120px; }
156
156
  .icon-folder-open { background-position: -408px -120px; }
157
- .icon-resize-vertical { background-position: -432px -119px; }
158
- .icon-resize-horizontal { background-position: -456px -118px; }
157
+ .icon-resize-vertical { background-position: -432px -119px; } // 1px, 1px off
158
+ .icon-resize-horizontal { background-position: -456px -118px; } // 1px, 2px off
159
+
160
+ .icon-hdd { background-position: 0 -144px; }
161
+ .icon-bullhorn { background-position: -24px -144px; }
162
+ .icon-bell { background-position: -48px -144px; }
163
+ .icon-certificate { background-position: -72px -144px; }
164
+ .icon-thumbs-up { background-position: -96px -144px; }
165
+ .icon-thumbs-down { background-position: -120px -144px; }
166
+ .icon-hand-right { background-position: -144px -144px; }
167
+ .icon-hand-left { background-position: -168px -144px; }
168
+ .icon-hand-up { background-position: -192px -144px; }
169
+ .icon-hand-down { background-position: -216px -144px; }
170
+ .icon-circle-arrow-right { background-position: -240px -144px; }
171
+ .icon-circle-arrow-left { background-position: -264px -144px; }
172
+ .icon-circle-arrow-up { background-position: -288px -144px; }
173
+ .icon-circle-arrow-down { background-position: -312px -144px; }
174
+ .icon-globe { background-position: -336px -144px; }
175
+ .icon-wrench { background-position: -360px -144px; }
176
+ .icon-tasks { background-position: -384px -144px; }
177
+ .icon-filter { background-position: -408px -144px; }
178
+ .icon-briefcase { background-position: -432px -144px; }
179
+ .icon-fullscreen { background-position: -456px -144px; }
180
+
181
+
182
+
183
+
184
+
185
+
186
+
187
+
188
+
189
+
190
+
191
+
@@ -9,9 +9,9 @@
9
9
 
10
10
  table {
11
11
  max-width: 100%;
12
+ background-color: @tableBackground;
12
13
  border-collapse: collapse;
13
14
  border-spacing: 0;
14
- background-color: @tableBackground;
15
15
  }
16
16
 
17
17
  // BASELINE STYLES
@@ -37,6 +37,8 @@ table {
37
37
  vertical-align: bottom;
38
38
  }
39
39
  // Remove top border from thead by default
40
+ caption + thead tr:first-child th,
41
+ caption + thead tr:first-child td,
40
42
  colgroup + thead tr:first-child th,
41
43
  colgroup + thead tr:first-child td,
42
44
  thead:first-child tr:first-child th,
@@ -67,15 +69,21 @@ table {
67
69
 
68
70
  .table-bordered {
69
71
  border: 1px solid @tableBorder;
70
- border-left: 0;
71
72
  border-collapse: separate; // Done so we can round those corners!
72
73
  *border-collapse: collapsed; // IE7 can't round corners anyway
74
+ border-left: 0;
73
75
  .border-radius(4px);
74
76
  th,
75
77
  td {
76
78
  border-left: 1px solid @tableBorder;
77
79
  }
78
80
  // Prevent a double border
81
+ caption + thead tr:first-child th,
82
+ caption + tbody tr:first-child th,
83
+ caption + tbody tr:first-child td,
84
+ colgroup + thead tr:first-child th,
85
+ colgroup + tbody tr:first-child th,
86
+ colgroup + tbody tr:first-child td,
79
87
  thead:first-child tr:first-child th,
80
88
  tbody:first-child tr:first-child th,
81
89
  tbody:first-child tr:first-child td {
@@ -84,20 +92,29 @@ table {
84
92
  // For first th or td in the first row in the first thead or tbody
85
93
  thead:first-child tr:first-child th:first-child,
86
94
  tbody:first-child tr:first-child td:first-child {
87
- .border-radius(4px 0 0 0);
95
+ -webkit-border-top-left-radius: 4px;
96
+ border-top-left-radius: 4px;
97
+ -moz-border-radius-topleft: 4px;
88
98
  }
89
99
  thead:first-child tr:first-child th:last-child,
90
100
  tbody:first-child tr:first-child td:last-child {
91
- .border-radius(0 4px 0 0);
101
+ -webkit-border-top-right-radius: 4px;
102
+ border-top-right-radius: 4px;
103
+ -moz-border-radius-topright: 4px;
92
104
  }
93
105
  // For first th or td in the first row in the first thead or tbody
94
106
  thead:last-child tr:last-child th:first-child,
95
107
  tbody:last-child tr:last-child td:first-child {
96
108
  .border-radius(0 0 0 4px);
109
+ -webkit-border-bottom-left-radius: 4px;
110
+ border-bottom-left-radius: 4px;
111
+ -moz-border-radius-bottomleft: 4px;
97
112
  }
98
113
  thead:last-child tr:last-child th:last-child,
99
114
  tbody:last-child tr:last-child td:last-child {
100
- .border-radius(0 0 4px 0);
115
+ -webkit-border-bottom-right-radius: 4px;
116
+ border-bottom-right-radius: 4px;
117
+ -moz-border-radius-bottomright: 4px;
101
118
  }
102
119
  }
103
120
 
@@ -1,15 +1,26 @@
1
1
  // THUMBNAILS
2
2
  // ----------
3
+ // Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
3
4
 
5
+ // Make wrapper ul behave like the grid
4
6
  .thumbnails {
5
7
  margin-left: -@gridGutterWidth;
6
8
  list-style: none;
7
9
  .clearfix();
8
10
  }
11
+ // Fluid rows have no left margin
12
+ .row-fluid .thumbnails {
13
+ margin-left: 0;
14
+ }
15
+
16
+ // Float li to make thumbnails appear in a row
9
17
  .thumbnails > li {
10
- float: left;
11
- margin: 0 0 @baseLineHeight @gridGutterWidth;
18
+ float: left; // Explicity set the float since we don't require .span* classes
19
+ margin-bottom: @baseLineHeight;
20
+ margin-left: @gridGutterWidth;
12
21
  }
22
+
23
+ // The actual thumbnail (can be `a` or `div`)
13
24
  .thumbnail {
14
25
  display: block;
15
26
  padding: 4px;
@@ -23,6 +34,7 @@ a.thumbnail:hover {
23
34
  border-color: @linkColor;
24
35
  .box-shadow(0 1px 4px rgba(0,105,214,.25));
25
36
  }
37
+
26
38
  // Images and captions
27
39
  .thumbnail > img {
28
40
  display: block;
@@ -52,8 +52,8 @@ h2 {
52
52
  }
53
53
  }
54
54
  h3 {
55
- line-height: @baseLineHeight * 1.5;
56
55
  font-size: 18px;
56
+ line-height: @baseLineHeight * 1.5;
57
57
  small {
58
58
  font-size: 14px;
59
59
  }
@@ -136,9 +136,10 @@ dd {
136
136
  .dl-horizontal {
137
137
  dt {
138
138
  float: left;
139
- clear: left;
140
139
  width: 120px;
140
+ clear: left;
141
141
  text-align: right;
142
+ .text-overflow();
142
143
  }
143
144
  dd {
144
145
  margin-left: 130px;
@@ -169,8 +170,8 @@ em {
169
170
 
170
171
  // Abbreviations and acronyms
171
172
  abbr[title] {
172
- border-bottom: 1px dotted #ddd;
173
173
  cursor: help;
174
+ border-bottom: 1px dotted #ddd;
174
175
  }
175
176
  abbr.initialism {
176
177
  font-size: 90%;
@@ -198,10 +199,10 @@ blockquote {
198
199
  // Float right with text-align: right
199
200
  &.pull-right {
200
201
  float: right;
201
- padding-left: 0;
202
202
  padding-right: 15px;
203
- border-left: 0;
203
+ padding-left: 0;
204
204
  border-right: 5px solid @grayLighter;
205
+ border-left: 0;
205
206
  p,
206
207
  small {
207
208
  text-align: right;
@@ -221,8 +222,8 @@ blockquote:after {
221
222
  address {
222
223
  display: block;
223
224
  margin-bottom: @baseLineHeight;
224
- line-height: @baseLineHeight;
225
225
  font-style: normal;
226
+ line-height: @baseLineHeight;
226
227
  }
227
228
 
228
229
  // Misc
@@ -45,10 +45,14 @@
45
45
 
46
46
  // Typography
47
47
  // -------------------------
48
+ @sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
49
+ @serifFontFamily: Georgia, "Times New Roman", Times, serif;
50
+ @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace;
51
+
48
52
  @baseFontSize: 13px;
49
- @baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
53
+ @baseFontFamily: @sansFontFamily;
50
54
  @baseLineHeight: 18px;
51
- @altFontFamily: Georgia, "Times New Roman", Times, serif;
55
+ @altFontFamily: @serifFontFamily;
52
56
 
53
57
  @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
54
58
  @headingsFontWeight: bold; // instead of browser default, bold
@@ -67,7 +71,7 @@
67
71
  // -------------------------
68
72
  @btnBackground: @white;
69
73
  @btnBackgroundHighlight: darken(@white, 10%);
70
- @btnBorder: darken(@white, 20%);
74
+ @btnBorder: #ccc;
71
75
 
72
76
  @btnPrimaryBackground: @linkColor;
73
77
  @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
@@ -92,8 +96,9 @@
92
96
  // -------------------------
93
97
  @inputBackground: @white;
94
98
  @inputBorder: #ccc;
99
+ @inputBorderRadius: 3px;
95
100
  @inputDisabledBackground: @grayLighter;
96
-
101
+ @formActionsBackground: #f5f5f5;
97
102
 
98
103
  // Dropdowns
99
104
  // -------------------------
@@ -154,6 +159,7 @@
154
159
  @navbarSearchBackgroundFocus: @white;
155
160
  @navbarSearchBorder: darken(@navbarSearchBackground, 30%);
156
161
  @navbarSearchPlaceholderColor: #ccc;
162
+ @navbarBrandColor: @navbarLinkColor;
157
163
 
158
164
 
159
165
  // Hero unit
@@ -183,7 +189,6 @@
183
189
 
184
190
 
185
191
 
186
-
187
192
  // GRID
188
193
  // --------------------------------------------------
189
194
 
@@ -194,7 +199,6 @@
194
199
  @gridGutterWidth: 20px;
195
200
  @gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
196
201
 
197
-
198
202
  // Fluid grid
199
203
  // -------------------------
200
204
  @fluidGridColumnWidth: 6.382978723%;
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.6
4
+ version: 2.0.7
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-04-07 00:00:00.000000000 Z
12
+ date: 2012-05-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
16
- requirement: &70296103357040 !ruby/object:Gem::Requirement
16
+ requirement: &70182731757680 !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: *70296103357040
24
+ version_requirements: *70182731757680
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: actionpack
27
- requirement: &70296103356000 !ruby/object:Gem::Requirement
27
+ requirement: &70182731755340 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,21 +32,32 @@ dependencies:
32
32
  version: '3.1'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70296103356000
35
+ version_requirements: *70182731755340
36
+ - !ruby/object:Gem::Dependency
37
+ name: therubyracer
38
+ requirement: &70182731770260 !ruby/object:Gem::Requirement
39
+ none: false
40
+ requirements:
41
+ - - ~>
42
+ - !ruby/object:Gem::Version
43
+ version: 0.10.1
44
+ type: :runtime
45
+ prerelease: false
46
+ version_requirements: *70182731770260
36
47
  - !ruby/object:Gem::Dependency
37
48
  name: less-rails
38
- requirement: &70296103354740 !ruby/object:Gem::Requirement
49
+ requirement: &70182731767820 !ruby/object:Gem::Requirement
39
50
  none: false
40
51
  requirements:
41
52
  - - ~>
42
53
  - !ruby/object:Gem::Version
43
- version: 2.2.0
54
+ version: 2.2.2
44
55
  type: :runtime
45
56
  prerelease: false
46
- version_requirements: *70296103354740
57
+ version_requirements: *70182731767820
47
58
  - !ruby/object:Gem::Dependency
48
59
  name: rails
49
- requirement: &70296104777620 !ruby/object:Gem::Requirement
60
+ requirement: &70182731765800 !ruby/object:Gem::Requirement
50
61
  none: false
51
62
  requirements:
52
63
  - - ! '>='
@@ -54,7 +65,7 @@ dependencies:
54
65
  version: '3.1'
55
66
  type: :development
56
67
  prerelease: false
57
- version_requirements: *70296104777620
68
+ version_requirements: *70182731765800
58
69
  description: twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for
59
70
  Rails 3.1 Asset Pipeline
60
71
  email:
@@ -132,6 +143,7 @@ files:
132
143
  - vendor/toolkit/twitter/bootstrap/forms.less
133
144
  - vendor/toolkit/twitter/bootstrap/grid.less
134
145
  - vendor/toolkit/twitter/bootstrap/hero-unit.less
146
+ - vendor/toolkit/twitter/bootstrap/labels-badges.less
135
147
  - vendor/toolkit/twitter/bootstrap/labels.less
136
148
  - vendor/toolkit/twitter/bootstrap/layouts.less
137
149
  - vendor/toolkit/twitter/bootstrap/mixins.less
@@ -143,6 +155,11 @@ files:
143
155
  - vendor/toolkit/twitter/bootstrap/popovers.less
144
156
  - vendor/toolkit/twitter/bootstrap/progress-bars.less
145
157
  - vendor/toolkit/twitter/bootstrap/reset.less
158
+ - vendor/toolkit/twitter/bootstrap/responsive-1200px-min.less
159
+ - vendor/toolkit/twitter/bootstrap/responsive-767px-max.less
160
+ - vendor/toolkit/twitter/bootstrap/responsive-768px-979px.less
161
+ - vendor/toolkit/twitter/bootstrap/responsive-navbar.less
162
+ - vendor/toolkit/twitter/bootstrap/responsive-utilities.less
146
163
  - vendor/toolkit/twitter/bootstrap/responsive.less
147
164
  - vendor/toolkit/twitter/bootstrap/scaffolding.less
148
165
  - vendor/toolkit/twitter/bootstrap/sprites.less
@@ -154,6 +171,9 @@ files:
154
171
  - vendor/toolkit/twitter/bootstrap/variables.less
155
172
  - vendor/toolkit/twitter/bootstrap/wells.less
156
173
  - vendor/toolkit/twitter/bootstrap_base.less
174
+ - app/helpers/flash_block_helper.rb
175
+ - app/helpers/twitter_breadcrumbs_helper.rb
176
+ - app/views/twitter-bootstrap/_breadcrumbs.html.erb
157
177
  - Rakefile
158
178
  - README.md
159
179
  homepage: https://github.com/seyhunak/twitter-bootstrap-rails