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
@@ -0,0 +1,146 @@
1
+ // TABLETS AND BELOW
2
+ // -----------------
3
+ @media (max-width: 979px) {
4
+
5
+ // UNFIX THE TOPBAR
6
+ // ----------------
7
+ // Remove any padding from the body
8
+ body {
9
+ padding-top: 0;
10
+ }
11
+ // Unfix the navbar
12
+ .navbar-fixed-top {
13
+ position: static;
14
+ margin-bottom: @baseLineHeight;
15
+ }
16
+ .navbar-fixed-top .navbar-inner {
17
+ padding: 5px;
18
+ }
19
+ .navbar .container {
20
+ width: auto;
21
+ padding: 0;
22
+ }
23
+ // Account for brand name
24
+ .navbar .brand {
25
+ padding-left: 10px;
26
+ padding-right: 10px;
27
+ margin: 0 0 0 -5px;
28
+ }
29
+
30
+ // COLLAPSIBLE NAVBAR
31
+ // ------------------
32
+ // Nav collapse clears brand
33
+ .nav-collapse {
34
+ clear: both;
35
+ }
36
+ // Block-level the nav
37
+ .nav-collapse .nav {
38
+ float: none;
39
+ margin: 0 0 (@baseLineHeight / 2);
40
+ }
41
+ .nav-collapse .nav > li {
42
+ float: none;
43
+ }
44
+ .nav-collapse .nav > li > a {
45
+ margin-bottom: 2px;
46
+ }
47
+ .nav-collapse .nav > .divider-vertical {
48
+ display: none;
49
+ }
50
+ .nav-collapse .nav .nav-header {
51
+ color: @navbarText;
52
+ text-shadow: none;
53
+ }
54
+ // Nav and dropdown links in navbar
55
+ .nav-collapse .nav > li > a,
56
+ .nav-collapse .dropdown-menu a {
57
+ padding: 6px 15px;
58
+ font-weight: bold;
59
+ color: @navbarLinkColor;
60
+ .border-radius(3px);
61
+ }
62
+ // Buttons
63
+ .nav-collapse .btn {
64
+ padding: 4px 10px 4px;
65
+ font-weight: normal;
66
+ .border-radius(4px);
67
+ }
68
+ .nav-collapse .dropdown-menu li + li a {
69
+ margin-bottom: 2px;
70
+ }
71
+ .nav-collapse .nav > li > a:hover,
72
+ .nav-collapse .dropdown-menu a:hover {
73
+ background-color: @navbarBackground;
74
+ }
75
+ // Buttons in the navbar
76
+ .nav-collapse.in .btn-group {
77
+ margin-top: 5px;
78
+ padding: 0;
79
+ }
80
+ // Dropdowns in the navbar
81
+ .nav-collapse .dropdown-menu {
82
+ position: static;
83
+ top: auto;
84
+ left: auto;
85
+ float: none;
86
+ display: block;
87
+ max-width: none;
88
+ margin: 0 15px;
89
+ padding: 0;
90
+ background-color: transparent;
91
+ border: none;
92
+ .border-radius(0);
93
+ .box-shadow(none);
94
+ }
95
+ .nav-collapse .dropdown-menu:before,
96
+ .nav-collapse .dropdown-menu:after {
97
+ display: none;
98
+ }
99
+ .nav-collapse .dropdown-menu .divider {
100
+ display: none;
101
+ }
102
+ // Forms in navbar
103
+ .nav-collapse .navbar-form,
104
+ .nav-collapse .navbar-search {
105
+ float: none;
106
+ padding: (@baseLineHeight / 2) 15px;
107
+ margin: (@baseLineHeight / 2) 0;
108
+ border-top: 1px solid @navbarBackground;
109
+ border-bottom: 1px solid @navbarBackground;
110
+ .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)");
111
+ }
112
+ // Pull right (secondary) nav content
113
+ .navbar .nav-collapse .nav.pull-right {
114
+ float: none;
115
+ margin-left: 0;
116
+ }
117
+ // Hide everything in the navbar save .brand and toggle button */
118
+ .nav-collapse,
119
+ .nav-collapse.collapse {
120
+ overflow: hidden;
121
+ height: 0;
122
+ }
123
+ // Navbar button
124
+ .navbar .btn-navbar {
125
+ display: block;
126
+ }
127
+
128
+ // STATIC NAVBAR
129
+ // -------------
130
+ .navbar-static .navbar-inner {
131
+ padding-left: 10px;
132
+ padding-right: 10px;
133
+ }
134
+ }
135
+
136
+
137
+ // DEFAULT DESKTOP
138
+ // ---------------
139
+
140
+ // Required to make the collapsing navbar work on regular desktops
141
+ @media (min-width: 980px) {
142
+ .nav-collapse.collapse {
143
+ height: auto !important;
144
+ overflow: visible !important;
145
+ }
146
+ }
@@ -0,0 +1,41 @@
1
+ // RESPONSIVE CLASSES
2
+ // ------------------
3
+
4
+ // Hide from screenreaders and browsers
5
+ // Credit: HTML5 Boilerplate
6
+ .hidden {
7
+ display: none;
8
+ visibility: hidden;
9
+ }
10
+
11
+ // Visibility utilities
12
+
13
+ // For desktops
14
+ .visible-phone { display: none !important; }
15
+ .visible-tablet { display: none !important; }
16
+ .visible-desktop { } // Don't set initially
17
+ .hidden-phone { }
18
+ .hidden-tablet { }
19
+ .hidden-desktop { display: none !important; }
20
+
21
+ // Phones only
22
+ @media (max-width: 767px) {
23
+ // Show
24
+ .visible-phone { display: inherit !important; } // Use inherit to restore previous behavior
25
+ // Hide
26
+ .hidden-phone { display: none !important; }
27
+ // Hide everything else
28
+ .hidden-desktop { display: inherit !important; }
29
+ .visible-desktop { display: none !important; }
30
+ }
31
+
32
+ // Tablets & small desktops only
33
+ @media (min-width: 768px) and (max-width: 979px) {
34
+ // Show
35
+ .visible-tablet { display: inherit !important; }
36
+ // Hide
37
+ .hidden-tablet { display: none !important; }
38
+ // Hide everything else
39
+ .hidden-desktop { display: inherit !important; }
40
+ .visible-desktop { display: none !important ; }
41
+ }
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap Responsive v2.0.2
2
+ * Bootstrap Responsive v2.0.3
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -8,6 +8,7 @@
8
8
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
9
9
  */
10
10
 
11
+
11
12
  // Responsive.less
12
13
  // For phone and tablet devices
13
14
  // -------------------------------------------------------------
@@ -24,348 +25,24 @@
24
25
  // RESPONSIVE CLASSES
25
26
  // ------------------
26
27
 
27
- // Hide from screenreaders and browsers
28
- // Credit: HTML5 Boilerplate
29
- .hidden {
30
- display: none;
31
- visibility: hidden;
32
- }
33
-
34
- // Visibility utilities
35
-
36
- // For desktops
37
- .visible-phone { display: none; }
38
- .visible-tablet { display: none; }
39
- .visible-desktop { display: block; }
40
- .hidden-phone { display: block; }
41
- .hidden-tablet { display: block; }
42
- .hidden-desktop { display: none; }
43
-
44
- // Phones only
45
- @media (max-width: 767px) {
46
- // Show
47
- .visible-phone { display: block; }
48
- // Hide
49
- .hidden-phone { display: none; }
50
- // Hide everything else
51
- .hidden-desktop { display: block; }
52
- .visible-desktop { display: none; }
53
- }
54
-
55
- // Tablets & small desktops only
56
- @media (min-width: 768px) and (max-width: 979px) {
57
- // Show
58
- .visible-tablet { display: block; }
59
- // Hide
60
- .hidden-tablet { display: none; }
61
- // Hide everything else
62
- .hidden-desktop { display: block; }
63
- .visible-desktop { display: none; }
64
- }
65
-
66
-
67
- // UP TO LANDSCAPE PHONE
68
- // ---------------------
69
-
70
- @media (max-width: 480px) {
71
-
72
- // Smooth out the collapsing/expanding nav
73
- .nav-collapse {
74
- -webkit-transform: translate3d(0, 0, 0); // activate the GPU
75
- }
76
-
77
- // Block level the page header small tag for readability
78
- .page-header h1 small {
79
- display: block;
80
- line-height: @baseLineHeight;
81
- }
82
-
83
- // Update checkboxes for iOS
84
- input[type="checkbox"],
85
- input[type="radio"] {
86
- border: 1px solid #ccc;
87
- }
88
-
89
- // Remove the horizontal form styles
90
- .form-horizontal .control-group > label {
91
- float: none;
92
- width: auto;
93
- padding-top: 0;
94
- text-align: left;
95
- }
96
- // Move over all input controls and content
97
- .form-horizontal .controls {
98
- margin-left: 0;
99
- }
100
- // Move the options list down to align with labels
101
- .form-horizontal .control-list {
102
- padding-top: 0; // has to be padding because margin collaspes
103
- }
104
- // Move over buttons in .form-actions to align with .controls
105
- .form-horizontal .form-actions {
106
- padding-left: 10px;
107
- padding-right: 10px;
108
- }
109
-
110
- // Modals
111
- .modal {
112
- position: absolute;
113
- top: 10px;
114
- left: 10px;
115
- right: 10px;
116
- width: auto;
117
- margin: 0;
118
- &.fade.in { top: auto; }
119
- }
120
- .modal-header .close {
121
- padding: 10px;
122
- margin: -10px;
123
- }
124
-
125
- // Carousel
126
- .carousel-caption {
127
- position: static;
128
- }
129
-
130
- }
131
-
132
-
133
-
134
- // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
135
- // --------------------------------------------------
136
-
137
- @media (max-width: 767px) {
138
-
139
- // Padding to set content in a bit
140
- body {
141
- padding-left: 20px;
142
- padding-right: 20px;
143
- }
144
- .navbar-fixed-top {
145
- margin-left: -20px;
146
- margin-right: -20px;
147
- }
148
-
149
- // GRID & CONTAINERS
150
- // -----------------
151
- // Remove width from containers
152
- .container {
153
- width: auto;
154
- }
155
- // Fluid rows
156
- .row-fluid {
157
- width: 100%;
158
- }
159
- // Undo negative margin on rows
160
- .row {
161
- margin-left: 0;
162
- }
163
- // Make all columns even
164
- .row > [class*="span"],
165
- .row-fluid > [class*="span"] {
166
- float: none;
167
- display: block;
168
- width: auto;
169
- margin: 0;
170
- }
171
-
172
- // THUMBNAILS
173
- // ----------
174
- .thumbnails [class*="span"] {
175
- width: auto;
176
- }
28
+ @import "responsive-utilities.less";
177
29
 
178
- // FORM FIELDS
179
- // -----------
180
- // Make span* classes full width
181
- input[class*="span"],
182
- select[class*="span"],
183
- textarea[class*="span"],
184
- .uneditable-input {
185
- .input-block-level();
186
- }
187
- // But don't let it screw up prepend/append inputs
188
- .input-prepend input[class*="span"],
189
- .input-append input[class*="span"] {
190
- width: auto;
191
- }
192
30
 
193
- }
194
-
195
-
196
-
197
- // PORTRAIT TABLET TO DEFAULT DESKTOP
198
- // ----------------------------------
199
-
200
- @media (min-width: 768px) and (max-width: 979px) {
201
-
202
- // Fixed grid
203
- #grid > .core(42px, 20px);
204
-
205
- // Fluid grid
206
- #grid > .fluid(5.801104972%, 2.762430939%);
207
-
208
- // Input grid
209
- #grid > .input(42px, 20px);
210
-
211
- }
212
-
213
-
214
-
215
- // TABLETS AND BELOW
216
- // -----------------
217
- @media (max-width: 979px) {
218
-
219
- // UNFIX THE TOPBAR
220
- // ----------------
221
- // Remove any padding from the body
222
- body {
223
- padding-top: 0;
224
- }
225
- // Unfix the navbar
226
- .navbar-fixed-top {
227
- position: static;
228
- margin-bottom: @baseLineHeight;
229
- }
230
- .navbar-fixed-top .navbar-inner {
231
- padding: 5px;
232
- }
233
- .navbar .container {
234
- width: auto;
235
- padding: 0;
236
- }
237
- // Account for brand name
238
- .navbar .brand {
239
- padding-left: 10px;
240
- padding-right: 10px;
241
- margin: 0 0 0 -5px;
242
- }
243
- // Nav collapse clears brand
244
- .navbar .nav-collapse {
245
- clear: left;
246
- }
247
- // Block-level the nav
248
- .navbar .nav {
249
- float: none;
250
- margin: 0 0 (@baseLineHeight / 2);
251
- }
252
- .navbar .nav > li {
253
- float: none;
254
- }
255
- .navbar .nav > li > a {
256
- margin-bottom: 2px;
257
- }
258
- .navbar .nav > .divider-vertical {
259
- display: none;
260
- }
261
- .navbar .nav .nav-header {
262
- color: @navbarText;
263
- text-shadow: none;
264
- }
265
- // Nav and dropdown links in navbar
266
- .navbar .nav > li > a,
267
- .navbar .dropdown-menu a {
268
- padding: 6px 15px;
269
- font-weight: bold;
270
- color: @navbarLinkColor;
271
- .border-radius(3px);
272
- }
273
- .navbar .dropdown-menu li + li a {
274
- margin-bottom: 2px;
275
- }
276
- .navbar .nav > li > a:hover,
277
- .navbar .dropdown-menu a:hover {
278
- background-color: @navbarBackground;
279
- }
280
- // Dropdowns in the navbar
281
- .navbar .dropdown-menu {
282
- position: static;
283
- top: auto;
284
- left: auto;
285
- float: none;
286
- display: block;
287
- max-width: none;
288
- margin: 0 15px;
289
- padding: 0;
290
- background-color: transparent;
291
- border: none;
292
- .border-radius(0);
293
- .box-shadow(none);
294
- }
295
- .navbar .dropdown-menu:before,
296
- .navbar .dropdown-menu:after {
297
- display: none;
298
- }
299
- .navbar .dropdown-menu .divider {
300
- display: none;
301
- }
302
- // Forms in navbar
303
- .navbar-form,
304
- .navbar-search {
305
- float: none;
306
- padding: (@baseLineHeight / 2) 15px;
307
- margin: (@baseLineHeight / 2) 0;
308
- border-top: 1px solid @navbarBackground;
309
- border-bottom: 1px solid @navbarBackground;
310
- @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
311
- .box-shadow(@shadow);
312
- }
313
- // Pull right (secondary) nav content
314
- .navbar .nav.pull-right {
315
- float: none;
316
- margin-left: 0;
317
- }
318
- // Static navbar
319
- .navbar-static .navbar-inner {
320
- padding-left: 10px;
321
- padding-right: 10px;
322
- }
323
- // Navbar button
324
- .btn-navbar {
325
- display: block;
326
- }
327
-
328
- // Hide everything in the navbar save .brand and toggle button */
329
- .nav-collapse {
330
- overflow: hidden;
331
- height: 0;
332
- }
333
- }
334
-
335
-
336
-
337
- // DEFAULT DESKTOP
338
- // ---------------
339
-
340
- @media (min-width: 980px) {
341
- .nav-collapse.collapse {
342
- height: auto !important;
343
- overflow: visible !important;
344
- }
345
- }
346
-
347
-
348
-
349
- // LARGE DESKTOP & UP
31
+ // MEDIA QUERIES
350
32
  // ------------------
351
33
 
352
- @media (min-width: 1200px) {
34
+ // Phones to portrait tablets and narrow desktops
35
+ @import "responsive-767px-max.less";
353
36
 
354
- // Fixed grid
355
- #grid > .core(70px, 30px);
37
+ // Tablets to regular desktops
38
+ @import "responsive-768px-979px.less";
356
39
 
357
- // Fluid grid
358
- #grid > .fluid(5.982905983%, 2.564102564%);
40
+ // Large desktops
41
+ @import "responsive-1200px-min.less";
359
42
 
360
- // Input grid
361
- #grid > .input(70px, 30px);
362
43
 
363
- // Thumbnails
364
- .thumbnails {
365
- margin-left: -30px;
366
- }
367
- .thumbnails > li {
368
- margin-left: 30px;
369
- }
44
+ // RESPONSIVE NAVBAR
45
+ // ------------------
370
46
 
371
- }
47
+ // From 979px and below, show a button to toggle navbar contents
48
+ @import "responsive-navbar.less";