Skip to content

Commit f6a7b7b

Browse files
glebmglebm
committed
rake update[v4-dev]
1 parent e39dac2 commit f6a7b7b

File tree

23 files changed

+423
-450
lines changed

23 files changed

+423
-450
lines changed

‎assets/javascripts/bootstrap.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2062,13 +2062,7 @@ var Modal = (function ($) {
20622062
}, {
20632063
key: '_checkScrollbar',
20642064
value: function _checkScrollbar() {
2065-
var fullWindowWidth = window.innerWidth;
2066-
if (!fullWindowWidth) {
2067-
// workaround for missing window.innerWidth in IE8
2068-
var documentElementRect = document.documentElement.getBoundingClientRect();
2069-
fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left);
2070-
}
2071-
this._isBodyOverflowing = document.body.clientWidth < fullWindowWidth;
2065+
this._isBodyOverflowing = document.body.clientWidth < window.innerWidth;
20722066
this._scrollbarWidth = this._getScrollbarWidth();
20732067
}
20742068
}, {

‎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/modal.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -410,13 +410,7 @@ var Modal = (function ($) {
410410
}, {
411411
key: '_checkScrollbar',
412412
value: function _checkScrollbar() {
413-
var fullWindowWidth = window.innerWidth;
414-
if (!fullWindowWidth) {
415-
// workaround for missing window.innerWidth in IE8
416-
var documentElementRect = document.documentElement.getBoundingClientRect();
417-
fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left);
418-
}
419-
this._isBodyOverflowing = document.body.clientWidth < fullWindowWidth;
413+
this._isBodyOverflowing = document.body.clientWidth < window.innerWidth;
420414
this._scrollbarWidth = this._getScrollbarWidth();
421415
}
422416
}, {

‎assets/stylesheets/bootstrap/_button-group.scss‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,26 @@
104104
// Split button dropdowns
105105
//
106106

107-
// Give the line between buttons some depth
108-
.btn-group > .btn + .dropdown-toggle {
109-
padding-right: $split-btn-dropdown-toggle-padding-x;
110-
padding-left: $split-btn-dropdown-toggle-padding-x;
107+
.btn + .dropdown-toggle-split {
108+
padding-right: $btn-padding-x * .75;
109+
padding-left: $btn-padding-x * .75;
110+
111+
&::after {
112+
margin-left: 0;
113+
}
111114
}
112-
.btn-group > .btn-lg + .dropdown-toggle {
113-
padding-right: $split-btn-lg-dropdown-toggle-padding-x;
114-
padding-left: $split-btn-lg-dropdown-toggle-padding-x;
115+
116+
.btn-sm + .dropdown-toggle-split {
117+
padding-right: $btn-padding-x-sm * .75;
118+
padding-left: $btn-padding-x-sm * .75;
115119
}
116120

121+
.btn-lg + .dropdown-toggle-split {
122+
padding-right: $btn-padding-x-lg * .75;
123+
padding-left: $btn-padding-x-lg * .75;
124+
}
125+
126+
117127
// The clickable button for toggling the menu
118128
// Remove the gradient and set the same inset shadow as the :active state
119129
.btn-group.open .dropdown-toggle {

‎assets/stylesheets/bootstrap/_card.scss‎

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
background-color: $card-bg;
1010
// border: $card-border-width solid $card-border-color;
1111
@include border-radius($card-border-radius);
12-
// Doesn't use mixin so that cards always have a "border"
13-
box-shadow: inset 0 0 0 $card-border-width $card-border-color;
12+
border: $card-border-width solid $card-border-color;
1413
}
1514

1615
.card-block {
@@ -49,20 +48,16 @@
4948
}
5049
}
5150

52-
@if $enable-rounded {
53-
.card {
54-
> .list-group:first-child {
55-
.list-group-item:first-child {
56-
border-top-left-radius: $card-border-radius;
57-
border-top-right-radius: $card-border-radius;
58-
}
51+
.card {
52+
> .list-group:first-child {
53+
.list-group-item:first-child {
54+
@include border-top-radius($card-border-radius);
5955
}
56+
}
6057

61-
> .list-group:last-child {
62-
.list-group-item:last-child {
63-
border-bottom-right-radius: $card-border-radius;
64-
border-bottom-left-radius: $card-border-radius;
65-
}
58+
> .list-group:last-child {
59+
.list-group-item:last-child {
60+
@include border-bottom-radius($card-border-radius);
6661
}
6762
}
6863
}
@@ -76,9 +71,7 @@
7671
@include clearfix;
7772
padding: $card-spacer-y $card-spacer-x;
7873
background-color: $card-cap-bg;
79-
// border-bottom: $card-border-width solid $card-border-color;
80-
// Doesn't use mixin so that cards always have a "border"
81-
box-shadow: inset 0 0 0 $card-border-width $card-border-color;
74+
border-bottom: $card-border-width solid $card-border-color;
8275

8376
&:first-child {
8477
@include border-radius($card-border-radius-inner $card-border-radius-inner 0 0);
@@ -89,9 +82,7 @@
8982
@include clearfix;
9083
padding: $card-spacer-y $card-spacer-x;
9184
background-color: $card-cap-bg;
92-
// border-top: $card-border-width solid $card-border-color;
93-
// Doesn't use mixin so that cards always have a "border"
94-
box-shadow: inset 0 0 0 $card-border-width $card-border-color;
85+
border-top: $card-border-width solid $card-border-color;
9586

9687
&:last-child {
9788
@include border-radius(0 0 $card-border-radius-inner $card-border-radius-inner);
@@ -108,10 +99,6 @@
10899
margin-bottom: -$card-spacer-y;
109100
margin-left: -($card-spacer-x / 2);
110101
border-bottom: 0;
111-
112-
.nav-item {
113-
margin-bottom: 0;
114-
}
115102
}
116103

117104
.card-header-pills {
@@ -189,35 +176,42 @@
189176
right: 0;
190177
bottom: 0;
191178
left: 0;
192-
padding: 1.25rem;
179+
padding: $card-img-overlay-padding;
193180
}
194181

195182

196183

197184
// Card image caps
198185
.card-img-top {
199-
@include border-radius($card-border-radius-inner $card-border-radius-inner 0 0);
186+
@include border-top-radius($card-border-radius-inner);
200187
}
201188
.card-img-bottom {
202-
@include border-radius(0 0 $card-border-radius-inner $card-border-radius-inner);
189+
@include border-bottom-radius($card-border-radius-inner);
203190
}
204191

205192

206-
//
207193
// Card set
208194
//
195+
// Heads up! We do some funky style resetting here for margins across our two
196+
// variations (one flex, one table). Individual cards have margin-bottom by
197+
// default, but they're ignored due to table styles. For a consistent design,
198+
// we've done the same to the flex variation.
199+
//
200+
// Those changes are noted by `// Margin balancing`.
209201

210202
@if $enable-flex {
211203
@include media-breakpoint-up(sm) {
212204
.card-deck {
213205
display: flex;
214206
flex-flow: row wrap;
215207
margin-right: -$card-deck-margin;
208+
margin-bottom: $card-spacer-y; // Margin balancing
216209
margin-left: -$card-deck-margin;
217210

218211
.card {
219212
flex: 1 0 0;
220213
margin-right: $card-deck-margin;
214+
margin-bottom: 0; // Margin balancing
221215
margin-left: $card-deck-margin;
222216
}
223217
}
@@ -227,12 +221,14 @@
227221
$space-between-cards: (2 * $card-deck-margin);
228222
.card-deck {
229223
display: table;
224+
width: 100%;
225+
margin-bottom: $card-spacer-y; // Margin balancing
230226
table-layout: fixed;
231227
border-spacing: $space-between-cards 0;
232228

233229
.card {
234230
display: table-cell;
235-
width: 1%;
231+
margin-bottom: 0; // Margin balancing
236232
vertical-align: top;
237233
}
238234
}

‎assets/stylesheets/bootstrap/_carousel.scss‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,19 +125,19 @@
125125
top: 50%;
126126
z-index: 5;
127127
display: inline-block;
128-
width: 20px;
129-
height: 20px;
130-
margin-top: -10px;
128+
width: $carousel-icon-width;
129+
height: $carousel-icon-width;
130+
margin-top: -($carousel-icon-width / 2);
131131
font-family: serif;
132132
line-height: 1;
133133
}
134134
.icon-prev {
135135
left: 50%;
136-
margin-left: -10px;
136+
margin-left: -($carousel-icon-width / 2);
137137
}
138138
.icon-next {
139139
right: 50%;
140-
margin-right: -10px;
140+
margin-right: -($carousel-icon-width / 2);
141141
}
142142

143143
.icon-prev {

‎assets/stylesheets/bootstrap/_custom-forms.scss‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,22 @@
159159
border-color: $custom-select-focus-border-color;
160160
outline: none;
161161
@include box-shadow($custom-select-focus-box-shadow);
162+
163+
&::-ms-value {
164+
// For visual consistency with other platforms/browsers,
165+
// supress the default white text on blue background highlight given to
166+
// the selected option text when the (still closed) <select> receives focus
167+
// in IE and (under certain conditions) Edge.
168+
// See https://github.com/twbs/bootstrap/issues/19398.
169+
color: $input-color;
170+
background-color: $input-bg;
171+
}
172+
}
173+
174+
&:disabled {
175+
color: $custom-select-disabled-color;
176+
cursor: $cursor-disabled;
177+
background-color: $custom-select-disabled-bg;
162178
}
163179

164180
// Hides the default caret in IE11

‎assets/stylesheets/bootstrap/_dropdown.scss‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
display: inline-block;
1111
width: 0;
1212
height: 0;
13-
margin-right: .25rem;
14-
margin-left: .25rem;
13+
margin-left: $caret-width;
1514
vertical-align: middle;
1615
content: "";
1716
border-top: $caret-width solid;

0 commit comments

Comments
 (0)