bootstrap-sass 3.1.1.1 → 3.2.0.4

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 (143) hide show
  1. checksums.yaml +5 -5
  2. data/.gitignore +1 -0
  3. data/.travis.yml +6 -2
  4. data/CHANGELOG.md +19 -0
  5. data/Gemfile +5 -10
  6. data/README.md +140 -75
  7. data/Rakefile +4 -5
  8. data/{vendor/assets → assets}/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
  9. data/{vendor/assets → assets}/fonts/bootstrap/glyphicons-halflings-regular.svg +0 -0
  10. data/{vendor/assets → assets}/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
  11. data/{vendor/assets → assets}/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
  12. data/assets/images/.keep +0 -0
  13. data/assets/javascripts/bootstrap-sprockets.js +12 -0
  14. data/assets/javascripts/bootstrap.js +2107 -0
  15. data/{vendor/assets → assets}/javascripts/bootstrap/affix.js +18 -11
  16. data/{vendor/assets → assets}/javascripts/bootstrap/alert.js +10 -6
  17. data/{vendor/assets → assets}/javascripts/bootstrap/button.js +11 -8
  18. data/{vendor/assets → assets}/javascripts/bootstrap/carousel.js +49 -31
  19. data/{vendor/assets → assets}/javascripts/bootstrap/collapse.js +19 -24
  20. data/{vendor/assets → assets}/javascripts/bootstrap/dropdown.js +9 -5
  21. data/{vendor/assets → assets}/javascripts/bootstrap/modal.js +25 -16
  22. data/{vendor/assets → assets}/javascripts/bootstrap/popover.js +9 -6
  23. data/{vendor/assets → assets}/javascripts/bootstrap/scrollspy.js +37 -21
  24. data/{vendor/assets → assets}/javascripts/bootstrap/tab.js +11 -8
  25. data/{vendor/assets → assets}/javascripts/bootstrap/tooltip.js +52 -17
  26. data/{vendor/assets → assets}/javascripts/bootstrap/transition.js +14 -3
  27. data/assets/stylesheets/_bootstrap-compass.scss +7 -0
  28. data/{vendor/assets → assets}/stylesheets/_bootstrap-mincer.scss +0 -0
  29. data/assets/stylesheets/_bootstrap-sprockets.scss +7 -0
  30. data/{vendor/assets/stylesheets/bootstrap.scss → assets/stylesheets/_bootstrap.scss} +0 -0
  31. data/{vendor/assets → assets}/stylesheets/bootstrap/_alerts.scss +4 -3
  32. data/{vendor/assets → assets}/stylesheets/bootstrap/_badges.scss +0 -0
  33. data/{vendor/assets → assets}/stylesheets/bootstrap/_breadcrumbs.scss +0 -0
  34. data/{vendor/assets → assets}/stylesheets/bootstrap/_button-groups.scss +5 -1
  35. data/{vendor/assets → assets}/stylesheets/bootstrap/_buttons.scss +0 -2
  36. data/{vendor/assets → assets}/stylesheets/bootstrap/_carousel.scss +3 -1
  37. data/{vendor/assets → assets}/stylesheets/bootstrap/_close.scss +0 -0
  38. data/{vendor/assets → assets}/stylesheets/bootstrap/_code.scss +6 -0
  39. data/{vendor/assets → assets}/stylesheets/bootstrap/_component-animations.scss +0 -0
  40. data/{vendor/assets → assets}/stylesheets/bootstrap/_dropdowns.scss +1 -0
  41. data/{vendor/assets → assets}/stylesheets/bootstrap/_forms.scss +82 -22
  42. data/{vendor/assets → assets}/stylesheets/bootstrap/_glyphicons.scss +4 -4
  43. data/{vendor/assets → assets}/stylesheets/bootstrap/_grid.scss +0 -0
  44. data/{vendor/assets → assets}/stylesheets/bootstrap/_input-groups.scss +6 -2
  45. data/{vendor/assets → assets}/stylesheets/bootstrap/_jumbotron.scss +0 -0
  46. data/{vendor/assets → assets}/stylesheets/bootstrap/_labels.scss +0 -0
  47. data/{vendor/assets → assets}/stylesheets/bootstrap/_list-group.scss +3 -1
  48. data/{vendor/assets → assets}/stylesheets/bootstrap/_media.scss +0 -0
  49. data/{vendor/assets → assets}/stylesheets/bootstrap/_mixins.scss +0 -0
  50. data/{vendor/assets → assets}/stylesheets/bootstrap/_modals.scss +7 -4
  51. data/{vendor/assets → assets}/stylesheets/bootstrap/_navbar.scss +1 -0
  52. data/{vendor/assets → assets}/stylesheets/bootstrap/_navs.scss +1 -1
  53. data/{vendor/assets → assets}/stylesheets/bootstrap/_normalize.scss +0 -0
  54. data/{vendor/assets → assets}/stylesheets/bootstrap/_pager.scss +0 -0
  55. data/{vendor/assets → assets}/stylesheets/bootstrap/_pagination.scss +0 -0
  56. data/{vendor/assets → assets}/stylesheets/bootstrap/_panels.scss +6 -3
  57. data/{vendor/assets → assets}/stylesheets/bootstrap/_popovers.scss +0 -0
  58. data/{vendor/assets → assets}/stylesheets/bootstrap/_print.scss +0 -0
  59. data/{vendor/assets → assets}/stylesheets/bootstrap/_progress-bars.scss +18 -2
  60. data/{vendor/assets → assets}/stylesheets/bootstrap/_responsive-embed.scss +0 -0
  61. data/{vendor/assets → assets}/stylesheets/bootstrap/_responsive-utilities.scss +2 -1
  62. data/{vendor/assets → assets}/stylesheets/bootstrap/_scaffolding.scss +1 -1
  63. data/{vendor/assets → assets}/stylesheets/bootstrap/_tables.scss +2 -2
  64. data/{vendor/assets → assets}/stylesheets/bootstrap/_theme.scss +11 -0
  65. data/{vendor/assets → assets}/stylesheets/bootstrap/_thumbnails.scss +0 -0
  66. data/{vendor/assets → assets}/stylesheets/bootstrap/_tooltip.scss +0 -0
  67. data/{vendor/assets → assets}/stylesheets/bootstrap/_type.scss +16 -6
  68. data/{vendor/assets → assets}/stylesheets/bootstrap/_utilities.scss +1 -0
  69. data/{vendor/assets → assets}/stylesheets/bootstrap/_variables.scss +25 -20
  70. data/{vendor/assets → assets}/stylesheets/bootstrap/_wells.scss +0 -0
  71. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_alerts.scss +0 -0
  72. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_background-variant.scss +0 -0
  73. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_border-radius.scss +0 -0
  74. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_buttons.scss +0 -0
  75. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_center-block.scss +0 -0
  76. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_clearfix.scss +0 -0
  77. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_forms.scss +0 -0
  78. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_gradients.scss +1 -1
  79. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_grid-framework.scss +2 -8
  80. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_grid.scss +3 -3
  81. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_hide-text.scss +0 -0
  82. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_image.scss +1 -0
  83. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_labels.scss +0 -0
  84. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_list-group.scss +0 -0
  85. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_nav-divider.scss +0 -0
  86. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_nav-vertical-align.scss +0 -0
  87. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_opacity.scss +0 -0
  88. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_pagination.scss +0 -0
  89. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_panels.scss +4 -0
  90. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_progress-bar.scss +2 -0
  91. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_reset-filter.scss +0 -0
  92. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_resize.scss +1 -1
  93. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_responsive-visibility.scss +0 -0
  94. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_size.scss +0 -0
  95. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_tab-focus.scss +0 -0
  96. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_table-row.scss +0 -0
  97. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_text-emphasis.scss +0 -0
  98. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_text-overflow.scss +0 -0
  99. data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +5 -10
  100. data/bootstrap-sass.gemspec +11 -6
  101. data/bower.json +22 -90
  102. data/composer.json +1 -1
  103. data/lib/bootstrap-sass.rb +3 -2
  104. data/lib/bootstrap-sass/engine.rb +4 -1
  105. data/lib/bootstrap-sass/version.rb +2 -2
  106. data/package.json +6 -1
  107. data/sache.json +5 -0
  108. data/tasks/bower.rake +6 -5
  109. data/tasks/converter.rb +3 -3
  110. data/tasks/converter/js_conversion.rb +11 -5
  111. data/tasks/converter/less_conversion.rb +30 -21
  112. data/tasks/converter/logger.rb +1 -0
  113. data/tasks/converter/network.rb +14 -16
  114. data/templates/project/{_variables.sass.erb → _bootstrap-variables.sass.erb} +0 -2
  115. data/templates/project/manifest.rb +17 -16
  116. data/templates/project/styles.sass +2 -2
  117. data/test/compass_test.rb +5 -4
  118. data/test/compilation_test.rb +10 -9
  119. data/test/dummy_node_mincer/manifest.js +2 -2
  120. data/test/dummy_rails/README.rdoc +1 -1
  121. data/test/dummy_rails/app/assets/javascripts/application.js +1 -1
  122. data/test/dummy_rails/app/assets/stylesheets/application.css.sass +2 -1
  123. data/test/dummy_rails/app/views/pages/root.html.slim +1 -1
  124. data/test/dummy_rails/config/application.rb +19 -3
  125. data/test/dummy_sass_only/compile.rb +4 -4
  126. data/test/gemfiles/sass_3_2.gemfile +1 -11
  127. data/test/gemfiles/sass_3_3.gemfile +2 -13
  128. data/test/gemfiles/sass_3_4.gemfile +7 -0
  129. data/test/gemfiles/sass_head.gemfile +2 -13
  130. data/test/node_mincer_test.rb +6 -5
  131. data/test/node_sass_test.rb +7 -6
  132. data/test/pages_test.rb +3 -3
  133. data/test/sass_test.rb +9 -6
  134. data/test/sprockets_rails_test.rb +11 -5
  135. data/test/support/dummy_rails_integration.rb +22 -0
  136. data/test/support/integration_test.rb +4 -11
  137. data/test/support/reporting.rb +17 -0
  138. data/test/test_helper.rb +22 -18
  139. data/test/test_helper_rails.rb +6 -0
  140. metadata +231 -151
  141. data/lib/bootstrap-sass/sass_functions.rb +0 -50
  142. data/vendor/assets/javascripts/bootstrap.js +0 -12
  143. data/vendor/assets/stylesheets/bootstrap/bootstrap.scss +0 -50
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: transition.js v3.1.1
2
+ * Bootstrap: transition.js v3.2.0
3
3
  * http://getbootstrap.com/javascript/#transitions
4
4
  * ========================================================================
5
5
  * Copyright 2011-2014 Twitter, Inc.
@@ -34,8 +34,9 @@
34
34
 
35
35
  // http://blog.alexmaccaw.com/css-transitions
36
36
  $.fn.emulateTransitionEnd = function (duration) {
37
- var called = false, $el = this
38
- $(this).one($.support.transition.end, function () { called = true })
37
+ var called = false
38
+ var $el = this
39
+ $(this).one('bsTransitionEnd', function () { called = true })
39
40
  var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
40
41
  setTimeout(callback, duration)
41
42
  return this
@@ -43,6 +44,16 @@
43
44
 
44
45
  $(function () {
45
46
  $.support.transition = transitionEnd()
47
+
48
+ if (!$.support.transition) return
49
+
50
+ $.event.special.bsTransitionEnd = {
51
+ bindType: $.support.transition.end,
52
+ delegateType: $.support.transition.end,
53
+ handle: function (e) {
54
+ if ($(e.target).is(this)) return e.handleObj.handler.apply(this, arguments)
55
+ }
56
+ }
46
57
  })
47
58
 
48
59
  }(jQuery);
@@ -0,0 +1,7 @@
1
+ @function twbs-font-path($path) {
2
+ @return font-url($path, true);
3
+ }
4
+
5
+ @function twbs-image-path($path) {
6
+ @return image-url($path, true);
7
+ }
@@ -0,0 +1,7 @@
1
+ @function twbs-font-path($path) {
2
+ @return font-path($path);
3
+ }
4
+
5
+ @function twbs-image-path($path) {
6
+ @return image-path($path);
7
+ }
@@ -33,12 +33,13 @@
33
33
  }
34
34
  }
35
35
 
36
- // Dismissable alerts
36
+ // Dismissible alerts
37
37
  //
38
38
  // Expand the right padding and account for the close button's positioning.
39
39
 
40
- .alert-dismissable {
41
- padding-right: ($alert-padding + 20);
40
+ .alert-dismissable, // The misspelled .alert-dismissable was deprecated in 3.2.0.
41
+ .alert-dismissible {
42
+ padding-right: ($alert-padding + 20);
42
43
 
43
44
  // Adjust close link position
44
45
  .close {
@@ -216,6 +216,10 @@
216
216
  > .btn-group .btn {
217
217
  width: 100%;
218
218
  }
219
+
220
+ > .btn-group .dropdown-menu {
221
+ left: auto;
222
+ }
219
223
  }
220
224
 
221
225
 
@@ -232,5 +236,5 @@
232
236
  [data-toggle="buttons"] > .btn > input[type="checkbox"] {
233
237
  position: absolute;
234
238
  z-index: -1;
235
- opacity: 0;
239
+ @include opacity(0);
236
240
  }
@@ -140,8 +140,6 @@
140
140
  .btn-block {
141
141
  display: block;
142
142
  width: 100%;
143
- padding-left: 0;
144
- padding-right: 0;
145
143
  }
146
144
 
147
145
  // Vertically space out multiple block buttons
@@ -28,7 +28,9 @@
28
28
 
29
29
  > .active,
30
30
  > .next,
31
- > .prev { display: block; }
31
+ > .prev {
32
+ display: block;
33
+ }
32
34
 
33
35
  > .active {
34
36
  left: 0;
@@ -28,6 +28,12 @@ kbd {
28
28
  background-color: $kbd-bg;
29
29
  border-radius: $border-radius-small;
30
30
  box-shadow: inset 0 -1px 0 rgba(0,0,0,.25);
31
+
32
+ kbd {
33
+ padding: 0;
34
+ font-size: 100%;
35
+ box-shadow: none;
36
+ }
31
37
  }
32
38
 
33
39
  // Blocks of code
@@ -155,6 +155,7 @@
155
155
  font-size: $font-size-small;
156
156
  line-height: $line-height-base;
157
157
  color: $dropdown-header-color;
158
+ white-space: nowrap; // as with > li > a
158
159
  }
159
160
 
160
161
  // Backdrop to catch body clicks on mobile, etc.
@@ -11,7 +11,7 @@ fieldset {
11
11
  padding: 0;
12
12
  margin: 0;
13
13
  border: 0;
14
- // Chrome and Firefox set a `min-width: -webkit-min-content;` on fieldsets,
14
+ // Chrome and Firefox set a `min-width: min-content;` on fieldsets,
15
15
  // so we reset that to ensure it behaves more like a standard block element.
16
16
  // See https://github.com/twbs/bootstrap/issues/12359.
17
17
  min-width: 0;
@@ -167,9 +167,11 @@ input[type="search"] {
167
167
  }
168
168
 
169
169
 
170
- // Special styles for iOS date input
170
+ // Special styles for iOS temporal inputs
171
171
  //
172
- // In Mobile Safari, date inputs require a pixel line-height that matches the
172
+ // In Mobile Safari, setting `display: block` on temporal inputs causes the
173
+ // text within the input to become vertically misaligned.
174
+ // As a workaround, we set a pixel line-height that matches the
173
175
  // given height of the input. Since this fucks up everything else, we have to
174
176
  // appropriately reset it for Internet Explorer and the size variations.
175
177
 
@@ -206,6 +208,7 @@ input[type="month"] {
206
208
 
207
209
  .radio,
208
210
  .checkbox {
211
+ position: relative;
209
212
  display: block;
210
213
  min-height: $line-height-computed; // clear the floating input if there is no label text
211
214
  margin-top: 10px;
@@ -222,9 +225,11 @@ input[type="month"] {
222
225
  .radio-inline input[type="radio"],
223
226
  .checkbox input[type="checkbox"],
224
227
  .checkbox-inline input[type="checkbox"] {
225
- float: left;
228
+ position: absolute;
226
229
  margin-left: -20px;
230
+ margin-top: 4px \9;
227
231
  }
232
+
228
233
  .radio + .radio,
229
234
  .checkbox + .checkbox {
230
235
  margin-top: -5px; // Move up sibling radios or checkboxes for tighter spacing
@@ -247,19 +252,55 @@ input[type="month"] {
247
252
  }
248
253
 
249
254
  // Apply same disabled cursor tweak as for inputs
255
+ // Some special care is needed because <label>s don't inherit their parent's `cursor`.
250
256
  //
251
257
  // Note: Neither radios nor checkboxes can be readonly.
252
258
  input[type="radio"],
253
- input[type="checkbox"],
254
- .radio,
259
+ input[type="checkbox"] {
260
+ &[disabled],
261
+ &.disabled,
262
+ fieldset[disabled] & {
263
+ cursor: not-allowed;
264
+ }
265
+ }
266
+ // These classes are used directly on <label>s
255
267
  .radio-inline,
256
- .checkbox,
257
268
  .checkbox-inline {
258
- &[disabled],
269
+ &.disabled,
259
270
  fieldset[disabled] & {
260
271
  cursor: not-allowed;
261
272
  }
262
273
  }
274
+ // These classes are used on elements with <label> descendants
275
+ .radio,
276
+ .checkbox {
277
+ &.disabled,
278
+ fieldset[disabled] & {
279
+ label {
280
+ cursor: not-allowed;
281
+ }
282
+ }
283
+ }
284
+
285
+
286
+ // Static form control text
287
+ //
288
+ // Apply class to a `p` element to make any string of text align with labels in
289
+ // a horizontal form layout.
290
+
291
+ .form-control-static {
292
+ // Size it appropriately next to real form controls
293
+ padding-top: ($padding-base-vertical + 1);
294
+ padding-bottom: ($padding-base-vertical + 1);
295
+ // Remove default margin from `p`
296
+ margin-bottom: 0;
297
+
298
+ &.input-lg,
299
+ &.input-sm {
300
+ padding-left: 0;
301
+ padding-right: 0;
302
+ }
303
+ }
263
304
 
264
305
 
265
306
  // Form control sizing
@@ -320,13 +361,9 @@ input[type="checkbox"],
320
361
  }
321
362
 
322
363
 
323
- // Static form control text
324
- //
325
- // Apply class to a `p` element to make any string of text align with labels in
326
- // a horizontal form layout.
327
-
328
- .form-control-static {
329
- margin-bottom: 0; // Remove default margin from `p`
364
+ // Reposition feedback icon if label is hidden with "screenreader only" state
365
+ .has-feedback label.sr-only ~ .form-control-feedback {
366
+ top: 0;
330
367
  }
331
368
 
332
369
 
@@ -402,12 +439,15 @@ input[type="checkbox"],
402
439
  display: inline-block;
403
440
  margin-top: 0;
404
441
  margin-bottom: 0;
405
- padding-left: 0;
406
442
  vertical-align: middle;
443
+
444
+ label {
445
+ padding-left: 0;
446
+ }
407
447
  }
408
448
  .radio input[type="radio"],
409
449
  .checkbox input[type="checkbox"] {
410
- float: none;
450
+ position: relative;
411
451
  margin-left: 0;
412
452
  }
413
453
 
@@ -452,11 +492,6 @@ input[type="checkbox"],
452
492
  @include make-row();
453
493
  }
454
494
 
455
- .form-control-static {
456
- padding-top: ($padding-base-vertical + 1);
457
- padding-bottom: ($padding-base-vertical + 1);
458
- }
459
-
460
495
  // Reset spacing and right align labels, but scope to media queries so that
461
496
  // labels on narrow viewports stack the same as a default form example.
462
497
  @media (min-width: $screen-sm-min) {
@@ -475,4 +510,29 @@ input[type="checkbox"],
475
510
  top: 0;
476
511
  right: ($grid-gutter-width / 2);
477
512
  }
513
+
514
+ // Form group sizes
515
+ //
516
+ // Quick utility class for applying `.input-lg` and `.input-sm` styles to the
517
+ // inputs and labels within a `.form-group`.
518
+ .form-group-lg {
519
+ @media (min-width: $screen-sm-min) {
520
+ .control-label {
521
+ padding-top: (($padding-large-vertical * $line-height-large) + 1);
522
+ }
523
+ }
524
+ .form-control {
525
+ @extend .input-lg;
526
+ }
527
+ }
528
+ .form-group-sm {
529
+ @media (min-width: $screen-sm-min) {
530
+ .control-label {
531
+ padding-top: ($padding-small-vertical + 1);
532
+ }
533
+ }
534
+ .form-control {
535
+ @extend .input-sm;
536
+ }
537
+ }
478
538
  }
@@ -1,7 +1,7 @@
1
- //= depend_on_asset "bootstrap/glyphicons-halflings-regular.eot"
2
- //= depend_on_asset "bootstrap/glyphicons-halflings-regular.svg"
3
- //= depend_on_asset "bootstrap/glyphicons-halflings-regular.ttf"
4
- //= depend_on_asset "bootstrap/glyphicons-halflings-regular.woff"
1
+ //= depend_on "bootstrap/glyphicons-halflings-regular.eot"
2
+ //= depend_on "bootstrap/glyphicons-halflings-regular.svg"
3
+ //= depend_on "bootstrap/glyphicons-halflings-regular.ttf"
4
+ //= depend_on "bootstrap/glyphicons-halflings-regular.woff"
5
5
  //
6
6
  // Glyphicons for Bootstrap
7
7
  //
@@ -39,10 +39,14 @@
39
39
 
40
40
  .input-group-lg > .form-control,
41
41
  .input-group-lg > .input-group-addon,
42
- .input-group-lg > .input-group-btn > .btn { @extend .input-lg; }
42
+ .input-group-lg > .input-group-btn > .btn {
43
+ @extend .input-lg;
44
+ }
43
45
  .input-group-sm > .form-control,
44
46
  .input-group-sm > .input-group-addon,
45
- .input-group-sm > .input-group-btn > .btn { @extend .input-sm; }
47
+ .input-group-sm > .input-group-btn > .btn {
48
+ @extend .input-sm;
49
+ }
46
50
 
47
51
 
48
52
  // Display as table-cell
@@ -94,7 +94,9 @@ a.list-group-item {
94
94
  border-color: $list-group-active-border;
95
95
 
96
96
  // Force color to inherit for custom content
97
- .list-group-item-heading {
97
+ .list-group-item-heading,
98
+ .list-group-item-heading > small,
99
+ .list-group-item-heading > .small {
98
100
  color: inherit;
99
101
  }
100
102
  .list-group-item-text {
@@ -15,8 +15,7 @@
15
15
  // Container that the modal scrolls within
16
16
  .modal {
17
17
  display: none;
18
- overflow: auto;
19
- overflow-y: scroll;
18
+ overflow: hidden;
20
19
  position: fixed;
21
20
  top: 0;
22
21
  right: 0;
@@ -31,10 +30,14 @@
31
30
 
32
31
  // When fading in the modal, animate it to slide down
33
32
  &.fade .modal-dialog {
34
- @include translate(0, -25%);
33
+ @include translate3d(0, -25%, 0);
35
34
  @include transition-transform(0.3s ease-out);
36
35
  }
37
- &.in .modal-dialog { @include translate(0, 0)}
36
+ &.in .modal-dialog { @include translate3d(0, 0, 0) }
37
+ }
38
+ .modal-open .modal {
39
+ overflow-x: hidden;
40
+ overflow-y: auto;
38
41
  }
39
42
 
40
43
  // Shell div to position the modal with bottom padding
@@ -141,6 +141,7 @@
141
141
  right: 0;
142
142
  left: 0;
143
143
  z-index: $zindex-navbar-fixed;
144
+ @include translate3d(0, 0, 0);
144
145
 
145
146
  // Undo the rounded corners
146
147
  @media (min-width: $grid-float-breakpoint) {
@@ -162,7 +162,7 @@
162
162
 
163
163
  > li {
164
164
  float: none;
165
- > a {
165
+ > a {
166
166
  text-align: center;
167
167
  margin-bottom: 5px;
168
168
  }
@@ -86,7 +86,9 @@
86
86
  border-top-width: 0;
87
87
  }
88
88
  }
89
-
89
+ .list-group + .panel-footer {
90
+ border-top-width: 0;
91
+ }
90
92
 
91
93
  // Tables in panels
92
94
  //
@@ -95,7 +97,8 @@
95
97
 
96
98
  .panel {
97
99
  > .table,
98
- > .table-responsive > .table {
100
+ > .table-responsive > .table,
101
+ > .panel-collapse > .table {
99
102
  margin-bottom: 0;
100
103
  }
101
104
  // Add border top radius for first one
@@ -206,7 +209,7 @@
206
209
 
207
210
  .panel-heading {
208
211
  border-bottom: 0;
209
- + .panel-collapse .panel-body {
212
+ + .panel-collapse > .panel-body {
210
213
  border-top: 1px solid $panel-inner-border;
211
214
  }
212
215
  }