Skip to content

Commit 289d93f

Browse files
committed
rake update[v4-dev]
1 parent c00bd69 commit 289d93f

25 files changed

Lines changed: 146 additions & 317 deletions

assets/javascripts/bootstrap.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ if (typeof jQuery === 'undefined') {
1010

1111
+function ($) {
1212
var version = $.fn.jquery.split(' ')[0].split('.')
13-
if (version[0] !== '2') {
14-
throw new Error('Bootstrap\'s JavaScript requires jQuery version 2.x.x')
13+
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] >= 3)) {
14+
throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v3.0.0')
1515
}
1616
}(jQuery);
1717

@@ -1786,7 +1786,7 @@ var Modal = (function ($) {
17861786
$(this._dialog).on(Event.MOUSEDOWN_DISMISS, function () {
17871787
$(_this7._element).one(Event.MOUSEUP_DISMISS, function (event) {
17881788
if ($(event.target).is(_this7._element)) {
1789-
that._ignoreBackdropClick = true;
1789+
_this7._ignoreBackdropClick = true;
17901790
}
17911791
});
17921792
});
@@ -2753,6 +2753,8 @@ var Tab = (function ($) {
27532753
return Tab;
27542754
})(jQuery);
27552755

2756+
/* global Tether */
2757+
27562758
/**
27572759
* --------------------------------------------------------------------------
27582760
* Bootstrap (v4.0.0): tooltip.js
@@ -2762,6 +2764,14 @@ var Tab = (function ($) {
27622764

27632765
var Tooltip = (function ($) {
27642766

2767+
/**
2768+
* Check for Tether dependency
2769+
* Tether - http://github.hubspot.com/tether/
2770+
*/
2771+
if (window.Tether === undefined) {
2772+
throw new Error('Bootstrap tooltips require Tether (http://github.hubspot.com/tether/)');
2773+
}
2774+
27652775
/**
27662776
* ------------------------------------------------------------------------
27672777
* Constants
@@ -2997,7 +3007,8 @@ var Tooltip = (function ($) {
29973007
classes: TetherClass,
29983008
classPrefix: CLASS_PREFIX,
29993009
offset: this.config.offset,
3000-
constraints: this.config.constraints
3010+
constraints: this.config.constraints,
3011+
addTargetClasses: false
30013012
});
30023013

30033014
Util.reflow(tip);
@@ -3119,12 +3130,6 @@ var Tooltip = (function ($) {
31193130
value: function cleanupTether() {
31203131
if (this._tether) {
31213132
this._tether.destroy();
3122-
3123-
// clean up after tether's junk classes
3124-
// remove after they fix issue
3125-
// (https://github.com/HubSpot/tether/issues/36)
3126-
$(this.element).removeClass(this._removeTetherClasses);
3127-
$(this.tip).removeClass(this._removeTetherClasses);
31283133
}
31293134
}
31303135

@@ -3162,11 +3167,6 @@ var Tooltip = (function ($) {
31623167
this._fixTitle();
31633168
}
31643169
}
3165-
}, {
3166-
key: '_removeTetherClasses',
3167-
value: function _removeTetherClasses(i, css) {
3168-
return ((css.baseVal || css).match(new RegExp('(^|\\s)' + CLASS_PREFIX + '-\\S+', 'g')) || []).join(' ');
3169-
}
31703170
}, {
31713171
key: '_fixTitle',
31723172
value: function _fixTitle() {

assets/javascripts/bootstrap.min.js

Lines changed: 2 additions & 215 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ var Modal = (function ($) {
138138
$(this._dialog).on(Event.MOUSEDOWN_DISMISS, function () {
139139
$(_this._element).one(Event.MOUSEUP_DISMISS, function (event) {
140140
if ($(event.target).is(_this._element)) {
141-
that._ignoreBackdropClick = true;
141+
_this._ignoreBackdropClick = true;
142142
}
143143
});
144144
});

assets/javascripts/bootstrap/tooltip.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* global Tether */
2+
13
'use strict';
24

35
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
@@ -13,6 +15,14 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
1315

1416
var Tooltip = (function ($) {
1517

18+
/**
19+
* Check for Tether dependency
20+
* Tether - http://github.hubspot.com/tether/
21+
*/
22+
if (window.Tether === undefined) {
23+
throw new Error('Bootstrap tooltips require Tether (http://github.hubspot.com/tether/)');
24+
}
25+
1626
/**
1727
* ------------------------------------------------------------------------
1828
* Constants
@@ -248,7 +258,8 @@ var Tooltip = (function ($) {
248258
classes: TetherClass,
249259
classPrefix: CLASS_PREFIX,
250260
offset: this.config.offset,
251-
constraints: this.config.constraints
261+
constraints: this.config.constraints,
262+
addTargetClasses: false
252263
});
253264

254265
Util.reflow(tip);
@@ -370,12 +381,6 @@ var Tooltip = (function ($) {
370381
value: function cleanupTether() {
371382
if (this._tether) {
372383
this._tether.destroy();
373-
374-
// clean up after tether's junk classes
375-
// remove after they fix issue
376-
// (https://github.com/HubSpot/tether/issues/36)
377-
$(this.element).removeClass(this._removeTetherClasses);
378-
$(this.tip).removeClass(this._removeTetherClasses);
379384
}
380385
}
381386

@@ -413,11 +418,6 @@ var Tooltip = (function ($) {
413418
this._fixTitle();
414419
}
415420
}
416-
}, {
417-
key: '_removeTetherClasses',
418-
value: function _removeTetherClasses(i, css) {
419-
return ((css.baseVal || css).match(new RegExp('(^|\\s)' + CLASS_PREFIX + '-\\S+', 'g')) || []).join(' ');
420-
}
421421
}, {
422422
key: '_fixTitle',
423423
value: function _fixTitle() {

assets/stylesheets/bootstrap/_alert.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.alert {
66
padding: $alert-padding;
77
margin-bottom: $spacer-y;
8-
border: 1px solid transparent;
8+
border: $alert-border-width solid transparent;
99
@include border-radius($alert-border-radius);
1010

1111
// Improve alignment and spacing of inner content

assets/stylesheets/bootstrap/_buttons.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
text-align: center;
99
white-space: nowrap;
1010
vertical-align: middle;
11-
touch-action: manipulation;
1211
cursor: pointer;
1312
user-select: none;
1413
border: $border-width solid transparent;

assets/stylesheets/bootstrap/_card.scss

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
.card {
66
position: relative;
7+
display: block;
78
margin-bottom: $card-spacer-y;
89
background-color: $card-bg;
910
border: $card-border-width solid $card-border-color;
@@ -135,7 +136,7 @@
135136
}
136137
.card-link {
137138
@include hover-focus {
138-
color: #fff;
139+
color: $card-link-hover-color;
139140
}
140141
}
141142
}
@@ -169,10 +170,10 @@
169170

170171
// Card image caps
171172
.card-img-top {
172-
@include border-radius(.25rem .25rem 0 0);
173+
@include border-radius($card-border-radius-inner $card-border-radius-inner 0 0);
173174
}
174175
.card-img-bottom {
175-
@include border-radius(0 0 .25rem .25rem);
176+
@include border-radius(0 0 $card-border-radius-inner $card-border-radius-inner);
176177
}
177178

178179

@@ -246,6 +247,8 @@
246247
// Handle rounded corners
247248
@if $enable-rounded {
248249
&:first-child {
250+
@include border-right-radius(0);
251+
249252
.card-img-top {
250253
border-top-right-radius: 0;
251254
}
@@ -254,6 +257,8 @@
254257
}
255258
}
256259
&:last-child {
260+
@include border-left-radius(0);
261+
257262
.card-img-top {
258263
border-top-left-radius: 0;
259264
}

assets/stylesheets/bootstrap/_carousel.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,9 @@
178178
cursor: pointer;
179179
// IE9 hack for event handling
180180
//
181-
// Internet Explorer 9 does not support clicks on elements without a set
182-
// `background-color`. We cannot use `filter` since that's not viewed as a
183-
// background color by the browser. Thus, a hack is needed.
181+
// Internet Explorer 9 does not properly handle clicks on elements with a `background-color` of `transparent`,
182+
// so we use `rgba(0,0,0,0)` instead since it's a non-buggy equivalent.
183+
// See https://developer.mozilla.org/en-US/docs/Web/Events/click#Internet_Explorer
184184
background-color: rgba(0,0,0,0); // IE9
185185
border: 1px solid $carousel-indicator-border-color;
186186
border-radius: 10px;

assets/stylesheets/bootstrap/_dropdown.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
display: inline-block;
1111
width: 0;
1212
height: 0;
13+
margin-right: .25rem;
1314
margin-left: .25rem;
1415
vertical-align: middle;
1516
content: "";
@@ -45,6 +46,7 @@
4546
padding: 5px 0;
4647
margin: 2px 0 0; // override default ul
4748
font-size: $font-size-base;
49+
color: $body-color;
4850
text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
4951
list-style: none;
5052
background-color: $dropdown-bg;
@@ -170,7 +172,7 @@
170172

171173
// Allow for dropdowns to go bottom up (aka, dropup-menu)
172174
//
173-
// Just add .dropup after the standard .dropdown class and you're set, bro.
175+
// Just add .dropup after the standard .dropdown class and you're set.
174176
// TODO: abstract this so that the navbar fixed styles are not placed here?
175177

176178
.dropup,

assets/stylesheets/bootstrap/_forms.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ input[type="checkbox"] {
261261

262262
.form-control-success,
263263
.form-control-warning,
264-
.form-control-error {
264+
.form-control-danger {
265265
padding-right: ($input-padding-x * 3);
266266
background-repeat: no-repeat;
267267
background-position: center right ($input-height * .25);
@@ -285,11 +285,11 @@ input[type="checkbox"] {
285285
}
286286
}
287287

288-
.has-error {
288+
.has-danger {
289289
@include form-control-validation($brand-danger);
290290

291-
.form-control-error {
292-
background-image: url($form-icon-error);
291+
.form-control-danger {
292+
background-image: url($form-icon-danger);
293293
}
294294
}
295295

@@ -354,7 +354,7 @@ input[type="checkbox"] {
354354
// .has-warning {
355355
// @include form-control-validation($state-warning-text, $state-warning-text, $state-warning-bg);
356356
// }
357-
// .has-error {
357+
// .has-danger {
358358
// @include form-control-validation($state-danger-text, $state-danger-text, $state-danger-bg);
359359
// }
360360
//

0 commit comments

Comments
 (0)