Skip to content

Commit a83988e

Browse files
committed
rake update[v4-dev]
1 parent 357ce5c commit a83988e

10 files changed

Lines changed: 35 additions & 12 deletions

File tree

assets/javascripts/bootstrap.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,14 @@ var Carousel = (function ($) {
650650
this._slide(Direction.NEXT);
651651
}
652652
}
653+
}, {
654+
key: 'nextWhenVisible',
655+
value: function nextWhenVisible() {
656+
// Don't call next when the page isn't visible
657+
if (!document.hidden) {
658+
this.next();
659+
}
660+
}
653661
}, {
654662
key: 'prev',
655663
value: function prev() {
@@ -685,7 +693,7 @@ var Carousel = (function ($) {
685693
}
686694

687695
if (this._config.interval && !this._isPaused) {
688-
this._interval = setInterval($.proxy(this.next, this), this._config.interval);
696+
this._interval = setInterval($.proxy(document.visibilityState ? this.nextWhenVisible : this.next, this), this._config.interval);
689697
}
690698
}
691699
}, {

assets/javascripts/bootstrap.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/javascripts/bootstrap/carousel.js

Lines changed: 9 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/stylesheets/bootstrap/_mixins.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
@import "mixins/alert";
3434
@import "mixins/buttons";
3535
@import "mixins/pagination";
36+
@import "mixins/lists";
3637
@import "mixins/list-group";
3738
@import "mixins/nav-divider";
3839
@import "mixins/forms";

assets/stylesheets/bootstrap/_reboot.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,8 @@ textarea {
249249
// properly inherited. However, `line-height` isn't addressed there. Using this
250250
// ensures we don't need to unnecessarily redeclare the global font stack.
251251
line-height: inherit;
252+
// iOS adds rounded borders by default
253+
border-radius: 0;
252254
}
253255

254256
textarea {

assets/stylesheets/bootstrap/_type.scss

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,14 @@ mark,
8585
// Lists
8686
//
8787

88-
// Unstyled keeps list items block level, just removes default browser padding and list-style
8988
.list-unstyled {
90-
padding-left: 0;
91-
list-style: none;
89+
@include list-unstyled;
9290
}
9391

9492
// Inline turns list items into inline-block
9593
.list-inline {
96-
padding-left: 0;
94+
@include list-unstyled;
9795
margin-left: -5px;
98-
list-style: none;
9996

10097
> li {
10198
display: inline-block;

assets/stylesheets/bootstrap/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ $state-danger-border: darken($state-danger-bg, 5%) !default;
450450
$card-spacer-x: 1.25rem !default;
451451
$card-spacer-y: .75rem !default;
452452
$card-border-width: .0625rem !default;
453-
$card-border-radius: .25rem !default;
453+
$card-border-radius: $border-radius !default;
454454
$card-border-color: #e5e5e5 !default;
455455
$card-border-radius-inner: ($card-border-radius - $card-border-width) !default;
456456
$card-cap-bg: #f5f5f5 !default;
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Lists
2+
3+
// Unstyled keeps list items block level, just removes default browser padding and list-style
4+
@mixin list-unstyled {
5+
padding-left: 0;
6+
list-style: none;
7+
}

lib/bootstrap/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module Bootstrap
22
VERSION = '4.0.0.dev'
3-
BOOTSTRAP_SHA = 'ba16aa44d06be8a6a4ba61a532906bb0c75f607e'
3+
BOOTSTRAP_SHA = '1f4401fd10880ba1160ceffb1d95e98277afb830'
44
end

templates/project/_bootstrap-variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@
451451
// $card-spacer-x: 1.25rem;
452452
// $card-spacer-y: .75rem;
453453
// $card-border-width: .0625rem;
454-
// $card-border-radius: .25rem;
454+
// $card-border-radius: $border-radius;
455455
// $card-border-color: #e5e5e5;
456456
// $card-border-radius-inner: ($card-border-radius - $card-border-width);
457457
// $card-cap-bg: #f5f5f5;

0 commit comments

Comments
 (0)