twitter-bootswatch-rails 3.0.2.0 → 3.0.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (39) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/twitter/bootstrap/affix.js +1 -1
  3. data/app/assets/javascripts/twitter/bootstrap/alert.js +1 -1
  4. data/app/assets/javascripts/twitter/bootstrap/button.js +11 -5
  5. data/app/assets/javascripts/twitter/bootstrap/carousel.js +5 -5
  6. data/app/assets/javascripts/twitter/bootstrap/collapse.js +1 -1
  7. data/app/assets/javascripts/twitter/bootstrap/dropdown.js +5 -5
  8. data/app/assets/javascripts/twitter/bootstrap/modal.js +1 -1
  9. data/app/assets/javascripts/twitter/bootstrap/popover.js +1 -1
  10. data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +2 -2
  11. data/app/assets/javascripts/twitter/bootstrap/tab.js +1 -1
  12. data/app/assets/javascripts/twitter/bootstrap/tooltip.js +1 -1
  13. data/app/assets/javascripts/twitter/bootstrap/transition.js +1 -1
  14. data/lib/generators/bootswatch/import/import_generator.rb +1 -1
  15. data/lib/generators/bootswatch/install/templates/mixins.less.tt +37 -50
  16. data/lib/generators/bootswatch/install/templates/variables.less.tt +15 -10
  17. data/lib/twitter/bootswatch/rails/version.rb +1 -1
  18. data/vendor/toolkit/twitter/bootstrap/badges.less +6 -6
  19. data/vendor/toolkit/twitter/bootstrap/button-groups.less +7 -33
  20. data/vendor/toolkit/twitter/bootstrap/buttons.less +2 -5
  21. data/vendor/toolkit/twitter/bootstrap/carousel.less +1 -0
  22. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +3 -8
  23. data/vendor/toolkit/twitter/bootstrap/forms.less +11 -0
  24. data/vendor/toolkit/twitter/bootstrap/glyphicons.less +5 -5
  25. data/vendor/toolkit/twitter/bootstrap/grid.less +12 -26
  26. data/vendor/toolkit/twitter/bootstrap/input-groups.less +1 -1
  27. data/vendor/toolkit/twitter/bootstrap/jumbotron.less +8 -2
  28. data/vendor/toolkit/twitter/bootstrap/labels.less +6 -0
  29. data/vendor/toolkit/twitter/bootstrap/mixins.less +37 -50
  30. data/vendor/toolkit/twitter/bootstrap/modals.less +2 -5
  31. data/vendor/toolkit/twitter/bootstrap/navbar.less +41 -53
  32. data/vendor/toolkit/twitter/bootstrap/navs.less +0 -20
  33. data/vendor/toolkit/twitter/bootstrap/panels.less +11 -1
  34. data/vendor/toolkit/twitter/bootstrap/progress-bars.less +0 -12
  35. data/vendor/toolkit/twitter/bootstrap/tables.less +17 -22
  36. data/vendor/toolkit/twitter/bootstrap/thumbnails.less +9 -3
  37. data/vendor/toolkit/twitter/bootstrap/type.less +54 -52
  38. data/vendor/toolkit/twitter/bootstrap/variables.less +15 -10
  39. metadata +3 -3
@@ -1,7 +1,7 @@
1
1
  module Twitter
2
2
  module Bootswatch
3
3
  module Rails
4
- VERSION = '3.0.2.0'
4
+ VERSION = '3.0.3.0'
5
5
  end
6
6
  end
7
7
  end
@@ -22,6 +22,12 @@
22
22
  &:empty {
23
23
  display: none;
24
24
  }
25
+
26
+ // Quick fix for badges in buttons
27
+ .btn & {
28
+ position: relative;
29
+ top: -1px;
30
+ }
25
31
  }
26
32
 
27
33
  // Hover state, but only for links
@@ -34,12 +40,6 @@ a.badge {
34
40
  }
35
41
  }
36
42
 
37
- // Quick fix for labels/badges in buttons
38
- .btn .badge {
39
- position: relative;
40
- top: -1px;
41
- }
42
-
43
43
  // Account for counters in navs
44
44
  a.list-group-item.active > .badge,
45
45
  .nav-pills > .active > a > .badge {
@@ -2,37 +2,6 @@
2
2
  // Button groups
3
3
  // --------------------------------------------------
4
4
 
5
- // Button carets
6
- //
7
- // Match the button text color to the arrow/caret for indicating dropdown-ness.
8
-
9
- .caret {
10
- .btn-default & {
11
- border-top-color: @btn-default-color;
12
- }
13
- .btn-primary &,
14
- .btn-success &,
15
- .btn-warning &,
16
- .btn-danger &,
17
- .btn-info & {
18
- border-top-color: #fff;
19
- }
20
- }
21
- .dropup {
22
- .btn-default .caret {
23
- border-bottom-color: @btn-default-color;
24
- }
25
- .btn-primary,
26
- .btn-success,
27
- .btn-warning,
28
- .btn-danger,
29
- .btn-info {
30
- .caret {
31
- border-bottom-color: #fff;
32
- }
33
- }
34
- }
35
-
36
5
  // Make the div behave like a button
37
6
  .btn-group,
38
7
  .btn-group-vertical {
@@ -178,7 +147,8 @@
178
147
 
179
148
  .btn-group-vertical {
180
149
  > .btn,
181
- > .btn-group {
150
+ > .btn-group,
151
+ > .btn-group > .btn {
182
152
  display: block;
183
153
  float: none;
184
154
  width: 100%;
@@ -238,11 +208,15 @@
238
208
  width: 100%;
239
209
  table-layout: fixed;
240
210
  border-collapse: separate;
241
- .btn {
211
+ > .btn,
212
+ > .btn-group {
242
213
  float: none;
243
214
  display: table-cell;
244
215
  width: 1%;
245
216
  }
217
+ > .btn-group .btn {
218
+ width: 100%;
219
+ }
246
220
  }
247
221
 
248
222
 
@@ -6,7 +6,6 @@
6
6
  // Base styles
7
7
  // --------------------------------------------------
8
8
 
9
- // Core styles
10
9
  .btn {
11
10
  display: inline-block;
12
11
  margin-bottom: 0; // For input.btn
@@ -45,7 +44,6 @@
45
44
  .opacity(.65);
46
45
  .box-shadow(none);
47
46
  }
48
-
49
47
  }
50
48
 
51
49
 
@@ -123,13 +121,12 @@
123
121
  // line-height: ensure even-numbered height of button next to large input
124
122
  .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
125
123
  }
126
- .btn-sm,
127
- .btn-xs {
124
+ .btn-sm {
128
125
  // line-height: ensure proper height of button next to small input
129
126
  .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
130
127
  }
131
128
  .btn-xs {
132
- padding: 1px 5px;
129
+ .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small);
133
130
  }
134
131
 
135
132
 
@@ -91,6 +91,7 @@
91
91
  // Hover/focus state
92
92
  &:hover,
93
93
  &:focus {
94
+ outline: none;
94
95
  color: @carousel-control-color;
95
96
  text-decoration: none;
96
97
  .opacity(.9);
@@ -10,12 +10,9 @@
10
10
  height: 0;
11
11
  margin-left: 2px;
12
12
  vertical-align: middle;
13
- border-top: @caret-width-base solid @dropdown-caret-color;
13
+ border-top: @caret-width-base solid;
14
14
  border-right: @caret-width-base solid transparent;
15
15
  border-left: @caret-width-base solid transparent;
16
- // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
17
- // we can just straight up remove this.
18
- border-bottom: 0 dotted;
19
16
  }
20
17
 
21
18
  // The dropdown wrapper (div)
@@ -163,10 +160,8 @@
163
160
  .navbar-fixed-bottom .dropdown {
164
161
  // Reverse the caret
165
162
  .caret {
166
- // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this
167
- // gets fixed, restore `border-top: 0;`.
168
- border-top: 0 dotted;
169
- border-bottom: @caret-width-base solid @dropdown-caret-color;
163
+ border-top: 0;
164
+ border-bottom: @caret-width-base solid;
170
165
  content: "";
171
166
  }
172
167
  // Different positioning for bottom up menu
@@ -309,6 +309,11 @@ input[type="checkbox"],
309
309
  display: inline-block;
310
310
  }
311
311
 
312
+ // Override `width: 100%;` when not within a `.form-group`
313
+ select.form-control {
314
+ width: auto;
315
+ }
316
+
312
317
  // Remove default margin on radios/checkboxes that were used for stacking, and
313
318
  // then undo the floating of radios and checkboxes to match (which also avoids
314
319
  // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
@@ -345,6 +350,12 @@ input[type="checkbox"],
345
350
  margin-bottom: 0;
346
351
  padding-top: (@padding-base-vertical + 1); // Default padding plus a border
347
352
  }
353
+ // Account for padding we're adding to ensure the alignment and of help text
354
+ // and other content below items
355
+ .radio,
356
+ .checkbox {
357
+ min-height: @line-height-computed + (@padding-base-vertical + 1);
358
+ }
348
359
 
349
360
  // Make form groups behave like rows
350
361
  .form-group {
@@ -10,11 +10,11 @@
10
10
  // Import the fonts
11
11
  @font-face {
12
12
  font-family: 'Glyphicons Halflings';
13
- src: asset-url('@{icon-font-path}@{icon-font-name}.eot');
14
- src: asset-url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'),
15
- asset-url('@{icon-font-path}@{icon-font-name}.woff') format('woff'),
16
- asset-url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'),
17
- asset-url('@{icon-font-path}@{icon-font-name}.svg#glyphicons_halflingsregular') format('svg');
13
+ src: ~"url('@{icon-font-path}@{icon-font-name}.eot')";
14
+ src: ~"url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype')",
15
+ ~"url('@{icon-font-path}@{icon-font-name}.woff') format('woff')",
16
+ ~"url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype')",
17
+ ~"url('@{icon-font-path}@{icon-font-name}.svg#glyphicons-halflingsregular') format('svg')";
18
18
  }
19
19
 
20
20
  // Catchall baseclass
@@ -5,6 +5,16 @@
5
5
  // Set the container width, and override it for fixed navbars in media queries
6
6
  .container {
7
7
  .container-fixed();
8
+
9
+ @media (min-width: @screen-sm) {
10
+ width: @container-sm;
11
+ }
12
+ @media (min-width: @screen-md) {
13
+ width: @container-md;
14
+ }
15
+ @media (min-width: @screen-lg-min) {
16
+ width: @container-lg;
17
+ }
8
18
  }
9
19
 
10
20
  // mobile first defaults
@@ -18,11 +28,8 @@
18
28
 
19
29
  // Extra small grid
20
30
  //
21
- // Grid classes for extra small devices like smartphones. No offset, push, or
22
- // pull classes are present here due to the size of the target.
23
- //
24
- // Note that `.col-xs-12` doesn't get floated on purpose--there's no need since
25
- // it's full-width.
31
+ // Columns, offsets, pushes, and pulls for extra small devices like
32
+ // smartphones.
26
33
 
27
34
  .make-grid-columns-float(xs);
28
35
  .make-grid(@grid-columns, xs, width);
@@ -35,15 +42,8 @@
35
42
  //
36
43
  // Columns, offsets, pushes, and pulls for the small device range, from phones
37
44
  // to tablets.
38
- //
39
- // Note that `.col-sm-12` doesn't get floated on purpose--there's no need since
40
- // it's full-width.
41
45
 
42
46
  @media (min-width: @screen-sm-min) {
43
- .container {
44
- width: @container-sm;
45
- }
46
-
47
47
  .make-grid-columns-float(sm);
48
48
  .make-grid(@grid-columns, sm, width);
49
49
  .make-grid(@grid-columns, sm, pull);
@@ -55,15 +55,8 @@
55
55
  // Medium grid
56
56
  //
57
57
  // Columns, offsets, pushes, and pulls for the desktop device range.
58
- //
59
- // Note that `.col-md-12` doesn't get floated on purpose--there's no need since
60
- // it's full-width.
61
58
 
62
59
  @media (min-width: @screen-md-min) {
63
- .container {
64
- width: @container-md;
65
- }
66
-
67
60
  .make-grid-columns-float(md);
68
61
  .make-grid(@grid-columns, md, width);
69
62
  .make-grid(@grid-columns, md, pull);
@@ -75,15 +68,8 @@
75
68
  // Large grid
76
69
  //
77
70
  // Columns, offsets, pushes, and pulls for the large desktop device range.
78
- //
79
- // Note that `.col-lg-12` doesn't get floated on purpose--there's no need since
80
- // it's full-width.
81
71
 
82
72
  @media (min-width: @screen-lg-min) {
83
- .container {
84
- width: @container-lg;
85
- }
86
-
87
73
  .make-grid-columns-float(lg);
88
74
  .make-grid(@grid-columns, lg, width);
89
75
  .make-grid(@grid-columns, lg, pull);
@@ -10,7 +10,7 @@
10
10
  border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table
11
11
 
12
12
  // Undo padding and float of grid classes
13
- &.col {
13
+ &[class*="col-"] {
14
14
  float: none;
15
15
  padding-left: 0;
16
16
  padding-right: 0;
@@ -12,7 +12,8 @@
12
12
  color: @jumbotron-color;
13
13
  background-color: @jumbotron-bg;
14
14
 
15
- h1 {
15
+ h1,
16
+ .h1 {
16
17
  line-height: 1;
17
18
  color: @jumbotron-heading-color;
18
19
  }
@@ -24,6 +25,10 @@
24
25
  border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
25
26
  }
26
27
 
28
+ .container {
29
+ max-width: 100%;
30
+ }
31
+
27
32
  @media screen and (min-width: @screen-sm-min) {
28
33
  padding-top: (@jumbotron-padding * 1.6);
29
34
  padding-bottom: (@jumbotron-padding * 1.6);
@@ -33,7 +38,8 @@
33
38
  padding-right: (@jumbotron-padding * 2);
34
39
  }
35
40
 
36
- h1 {
41
+ h1,
42
+ .h1 {
37
43
  font-size: (@font-size-base * 4.5);
38
44
  }
39
45
  }
@@ -28,6 +28,12 @@
28
28
  &:empty {
29
29
  display: none;
30
30
  }
31
+
32
+ // Quick fix for labels in buttons
33
+ .btn & {
34
+ position: relative;
35
+ top: -1px;
36
+ }
31
37
  }
32
38
 
33
39
  // Colors
@@ -19,8 +19,8 @@
19
19
  .clearfix() {
20
20
  &:before,
21
21
  &:after {
22
- content: " "; /* 1 */
23
- display: table; /* 2 */
22
+ content: " "; // 1
23
+ display: table; // 2
24
24
  }
25
25
  &:after {
26
26
  clear: both;
@@ -30,7 +30,7 @@
30
30
  // WebKit-style focus
31
31
  .tab-focus() {
32
32
  // Default
33
- outline: thin dotted #333;
33
+ outline: thin dotted;
34
34
  // WebKit
35
35
  outline: 5px auto -webkit-focus-ring-color;
36
36
  outline-offset: -2px;
@@ -55,7 +55,8 @@
55
55
  // Placeholder text
56
56
  .placeholder(@color: @input-color-placeholder) {
57
57
  &:-moz-placeholder { color: @color; } // Firefox 4-18
58
- &::-moz-placeholder { color: @color; } // Firefox 19+
58
+ &::-moz-placeholder { color: @color; // Firefox 19+
59
+ opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526
59
60
  &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+
60
61
  &::-webkit-input-placeholder { color: @color; } // Safari and Chrome
61
62
  }
@@ -87,11 +88,7 @@
87
88
  }
88
89
  // New mixin to use as of v3.0.1
89
90
  .text-hide() {
90
- font: ~"0/0" a;
91
- color: transparent;
92
- text-shadow: none;
93
- background-color: transparent;
94
- border: 0;
91
+ .hide-text();
95
92
  }
96
93
 
97
94
 
@@ -277,10 +274,8 @@
277
274
  // Creates two color stops, start and end, by specifying a color and position for each color stop.
278
275
  // Color stops are not available in IE9 and below.
279
276
  .horizontal(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {
280
- background-image: -webkit-gradient(linear, @start-percent top, @end-percent top, from(@start-color), to(@end-color)); // Safari 4+, Chrome 2+
281
- background-image: -webkit-linear-gradient(left, color-stop(@start-color @start-percent), color-stop(@end-color @end-percent)); // Safari 5.1+, Chrome 10+
282
- background-image: -moz-linear-gradient(left, @start-color @start-percent, @end-color @end-percent); // FF 3.6+
283
- background-image: linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10
277
+ background-image: -webkit-linear-gradient(left, color-stop(@start-color @start-percent), color-stop(@end-color @end-percent)); // Safari 5.1-6, Chrome 10+
278
+ background-image: linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
284
279
  background-repeat: repeat-x;
285
280
  filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@start-color),argb(@end-color))); // IE9 and down
286
281
  }
@@ -290,47 +285,36 @@
290
285
  // Creates two color stops, start and end, by specifying a color and position for each color stop.
291
286
  // Color stops are not available in IE9 and below.
292
287
  .vertical(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {
293
- background-image: -webkit-gradient(linear, left @start-percent, left @end-percent, from(@start-color), to(@end-color)); // Safari 4+, Chrome 2+
294
- background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Safari 5.1+, Chrome 10+
295
- background-image: -moz-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // FF 3.6+
296
- background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10
288
+ background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Safari 5.1-6, Chrome 10+
289
+ background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
297
290
  background-repeat: repeat-x;
298
291
  filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down
299
292
  }
300
293
 
301
294
  .directional(@start-color: #555; @end-color: #333; @deg: 45deg) {
302
295
  background-repeat: repeat-x;
303
- background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1+, Chrome 10+
304
- background-image: -moz-linear-gradient(@deg, @start-color, @end-color); // FF 3.6+
305
- background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10
296
+ background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1-6, Chrome 10+
297
+ background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
306
298
  }
307
299
  .horizontal-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {
308
- background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(@start-color), color-stop(@color-stop, @mid-color), to(@end-color));
309
300
  background-image: -webkit-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color);
310
- background-image: -moz-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color);
311
301
  background-image: linear-gradient(to right, @start-color, @mid-color @color-stop, @end-color);
312
302
  background-repeat: no-repeat;
313
303
  filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback
314
304
  }
315
305
  .vertical-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {
316
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@start-color), color-stop(@color-stop, @mid-color), to(@end-color));
317
306
  background-image: -webkit-linear-gradient(@start-color, @mid-color @color-stop, @end-color);
318
- background-image: -moz-linear-gradient(top, @start-color, @mid-color @color-stop, @end-color);
319
307
  background-image: linear-gradient(@start-color, @mid-color @color-stop, @end-color);
320
308
  background-repeat: no-repeat;
321
309
  filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback
322
310
  }
323
311
  .radial(@inner-color: #555; @outer-color: #333) {
324
- background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@inner-color), to(@outer-color));
325
312
  background-image: -webkit-radial-gradient(circle, @inner-color, @outer-color);
326
- background-image: -moz-radial-gradient(circle, @inner-color, @outer-color);
327
313
  background-image: radial-gradient(circle, @inner-color, @outer-color);
328
314
  background-repeat: no-repeat;
329
315
  }
330
316
  .striped(@color: rgba(255,255,255,.15); @angle: 45deg) {
331
- background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, @color), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, @color), color-stop(.75, @color), color-stop(.75, transparent), to(transparent));
332
317
  background-image: -webkit-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);
333
- background-image: -moz-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);
334
318
  background-image: linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);
335
319
  }
336
320
  }
@@ -391,7 +375,7 @@
391
375
 
392
376
  // Panels
393
377
  // -------------------------
394
- .panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border;) {
378
+ .panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) {
395
379
  border-color: @border;
396
380
 
397
381
  & > .panel-heading {
@@ -402,9 +386,6 @@
402
386
  + .panel-collapse .panel-body {
403
387
  border-top-color: @border;
404
388
  }
405
- & > .dropdown .caret {
406
- border-color: @heading-text-color transparent;
407
- }
408
389
  }
409
390
  & > .panel-footer {
410
391
  + .panel-collapse .panel-body {
@@ -430,27 +411,27 @@
430
411
 
431
412
  // Tables
432
413
  // -------------------------
433
- .table-row-variant(@state; @background; @border) {
414
+ .table-row-variant(@state; @background) {
434
415
  // Exact selectors below required to override `.table-striped` and prevent
435
416
  // inheritance to nested tables.
436
- .table > thead > tr,
437
- .table > tbody > tr,
438
- .table > tfoot > tr {
439
- > td.@{state},
440
- > th.@{state},
441
- &.@{state} > td,
442
- &.@{state} > th {
443
- background-color: @background;
417
+ .table {
418
+ > thead,
419
+ > tbody,
420
+ > tfoot {
421
+ > tr > .@{state},
422
+ > .@{state} > td,
423
+ > .@{state} > th {
424
+ background-color: @background;
425
+ }
444
426
  }
445
427
  }
446
428
 
447
429
  // Hover states for `.table-hover`
448
430
  // Note: this is not available for cells or rows within `thead` or `tfoot`.
449
- .table-hover > tbody > tr {
450
- > td.@{state}:hover,
451
- > th.@{state}:hover,
452
- &.@{state}:hover > td,
453
- &.@{state}:hover > th {
431
+ .table-hover > tbody {
432
+ > tr > .@{state}:hover,
433
+ > .@{state}:hover > td,
434
+ > .@{state}:hover > th {
454
435
  background-color: darken(@background, 5%);
455
436
  }
456
437
  }
@@ -491,6 +472,11 @@
491
472
  border-color: @border;
492
473
  }
493
474
  }
475
+
476
+ .badge {
477
+ color: @background;
478
+ background-color: #fff;
479
+ }
494
480
  }
495
481
 
496
482
  // Button sizes
@@ -561,9 +547,10 @@
561
547
  // More easily include all the states for responsive-utilities.less.
562
548
  .responsive-visibility() {
563
549
  display: block !important;
564
- tr& { display: table-row !important; }
550
+ table& { display: table; }
551
+ tr& { display: table-row !important; }
565
552
  th&,
566
- td& { display: table-cell !important; }
553
+ td& { display: table-cell !important; }
567
554
  }
568
555
 
569
556
  .responsive-invisibility() {
@@ -738,11 +725,11 @@
738
725
  @item: ~".col-@{class}-@{index}";
739
726
  .col(@index + 1, @item);
740
727
  }
741
- .col(@index, @list) when (@index < @grid-columns) { // general
728
+ .col(@index, @list) when (@index =< @grid-columns) { // general
742
729
  @item: ~".col-@{class}-@{index}";
743
730
  .col(@index + 1, ~"@{list}, @{item}");
744
731
  }
745
- .col(@index, @list) when (@index = @grid-columns) { // terminal
732
+ .col(@index, @list) when (@index > @grid-columns) { // terminal
746
733
  @{list} {
747
734
  float: left;
748
735
  }