Skip to content

Commit 6014a8d

Browse files
glebmglebm
committed
rake update[v4-dev]
1 parent a83988e commit 6014a8d

11 files changed

Lines changed: 41 additions & 110 deletions

File tree

‎assets/javascripts/bootstrap.js‎

Lines changed: 2 additions & 2 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 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {
14-
throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher')
13+
if (version[0] !== '2') {
14+
throw new Error('Bootstrap\'s JavaScript requires jQuery version 2.x.x')
1515
}
1616
}(jQuery);
1717

‎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/stylesheets/_bootstrap.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
55
*/
66

7-
// Core variables and mixins
7+
// Core variables and mixins
88
@import "bootstrap/variables";
99
@import "bootstrap/mixins";
1010

11-
// // Reset and dependencies
11+
// Reset and dependencies
1212
@import "bootstrap/normalize";
1313
@import "bootstrap/print";
1414

@@ -22,7 +22,7 @@
2222
@import "bootstrap/forms";
2323
@import "bootstrap/buttons";
2424

25-
// // Components
25+
// Components
2626
@import "bootstrap/animation";
2727
@import "bootstrap/dropdown";
2828
@import "bootstrap/button-group";

‎assets/stylesheets/bootstrap/_forms.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@
8989
// text within the input to become vertically misaligned. As a workaround, we
9090
// set a pixel line-height that matches the given height of the input, but only
9191
// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
92+
//
93+
// Note that as of 8.3, iOS doesn't support `datetime` or `week`.
9294

9395
@media screen and (-webkit-min-device-pixel-ratio: 0) {
9496
input[type="date"],

‎assets/stylesheets/bootstrap/_grid.scss‎

Lines changed: 17 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -47,78 +47,31 @@
4747

4848
// Flex column reordering
4949

50-
.col-xs-first { order: -1; }
51-
.col-xs-last { order: 1; }
52-
53-
@include media-breakpoint-up(sm) {
54-
.col-sm-first { order: -1; }
55-
.col-sm-last { order: 1; }
56-
}
57-
@include media-breakpoint-up(md) {
58-
.col-md-first { order: -1; }
59-
.col-md-last { order: 1; }
60-
}
61-
@include media-breakpoint-up(lg) {
62-
.col-lg-first { order: -1; }
63-
.col-lg-last { order: 1; }
64-
}
65-
@include media-breakpoint-up(xl) {
66-
.col-xl-first { order: -1; }
67-
.col-xl-last { order: 1; }
50+
@each $breakpoint in map-keys($grid-breakpoints) {
51+
@include media-breakpoint-up($breakpoint) {
52+
.col-#{$breakpoint}-first { order: -1; }
53+
.col-#{$breakpoint}-last { order: 1; }
54+
}
6855
}
6956

7057
// Alignment for every column in row
7158

72-
.row-xs-top { align-items: flex-start; }
73-
.row-xs-center { align-items: center; }
74-
.row-xs-bottom { align-items: flex-end; }
75-
76-
@include media-breakpoint-up(sm) {
77-
.row-sm-top { align-items: flex-start; }
78-
.row-sm-center { align-items: center; }
79-
.row-sm-bottom { align-items: flex-end; }
80-
}
81-
@include media-breakpoint-up(md) {
82-
.row-md-top { align-items: flex-start; }
83-
.row-md-center { align-items: center; }
84-
.row-md-bottom { align-items: flex-end; }
85-
}
86-
@include media-breakpoint-up(lg) {
87-
.row-lg-top { align-items: flex-start; }
88-
.row-lg-center { align-items: center; }
89-
.row-lg-bottom { align-items: flex-end; }
90-
}
91-
@include media-breakpoint-up(xl) {
92-
.row-xl-top { align-items: flex-start; }
93-
.row-xl-center { align-items: center; }
94-
.row-xl-bottom { align-items: flex-end; }
59+
@each $breakpoint in map-keys($grid-breakpoints) {
60+
@include media-breakpoint-up($breakpoint) {
61+
.row-#{$breakpoint}-top { align-items: flex-start; }
62+
.row-#{$breakpoint}-center { align-items: center; }
63+
.row-#{$breakpoint}-bottom { align-items: flex-end; }
64+
}
9565
}
9666

9767
// Alignment per column
9868

99-
.col-xs-top { align-self: flex-start; }
100-
.col-xs-center { align-self: center; }
101-
.col-xs-bottom { align-self: flex-end; }
102-
103-
@include media-breakpoint-up(sm) {
104-
.col-sm-top { align-self: flex-start; }
105-
.col-sm-center { align-self: center; }
106-
.col-sm-bottom { align-self: flex-end; }
107-
}
108-
@include media-breakpoint-up(md) {
109-
.col-md-top { align-self: flex-start; }
110-
.col-md-center { align-self: center; }
111-
.col-md-bottom { align-self: flex-end; }
112-
}
113-
@include media-breakpoint-up(lg) {
114-
.col-lg-top { align-self: flex-start; }
115-
.col-lg-center { align-self: center; }
116-
.col-lg-bottom { align-self: flex-end; }
117-
}
118-
@include media-breakpoint-up(xl) {
119-
.col-xl-top { align-self: flex-start; }
120-
.col-xl-center { align-self: center; }
121-
.col-xl-bottom { align-self: flex-end; }
69+
@each $breakpoint in map-keys($grid-breakpoints) {
70+
@include media-breakpoint-up($breakpoint) {
71+
.col-#{$breakpoint}-top { align-self: flex-start; }
72+
.col-#{$breakpoint}-center { align-self: center; }
73+
.col-#{$breakpoint}-bottom { align-self: flex-end; }
74+
}
12275
}
12376

12477
}

‎assets/stylesheets/bootstrap/_labels.scss‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,9 @@ a.label {
4343
.label-pill {
4444
padding-right: .6em;
4545
padding-left: .6em;
46-
border-radius: 1rem;
46+
@include border-radius(1rem);
4747
}
4848

49-
5049
// Colors
5150
//
5251
// Contextual variations (linked labels get darker on :hover).

‎assets/stylesheets/bootstrap/_reboot.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ img {
199199
// Fixes "clickability" issue (and more generally, the firing of events such as focus as well)
200200
// for traditionally non-focusable elements with role="button"
201201
// see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
202-
// Upstream patch for normalize.css submitted: https://github.com/necolas/normalize.css/pull/379 - remove this fix once that is merged
203202

204203
[role="button"] {
205204
cursor: pointer;

‎assets/stylesheets/bootstrap/_type.scss‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ h1, h2, h3, h4, h5, h6,
1212

1313
h1, .h1,
1414
h2, .h2,
15-
h3, .h3 {
16-
margin-bottom: $headings-margin-bottom;
17-
}
15+
h3, .h3,
1816
h4, .h4,
1917
h5, .h5,
2018
h6, .h6 {

‎assets/stylesheets/bootstrap/_utilities.scss‎

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -51,41 +51,21 @@
5151

5252
// Alignment
5353

54-
.text-left { text-align: left; }
55-
.text-right { text-align: right; }
56-
.text-center { text-align: center; }
57-
.text-justify { text-align: justify; }
58-
.text-nowrap { white-space: nowrap; }
54+
.text-left { text-align: left !important; }
55+
.text-right { text-align: right !important; }
56+
.text-center { text-align: center !important; }
57+
.text-justify { text-align: justify !important; }
58+
.text-nowrap { white-space: nowrap !important; }
5959
.text-truncate { @include text-truncate; }
6060

6161
// Responsive alignment
6262

63-
.text-xs-left { text-align: left; }
64-
.text-xs-right { text-align: right; }
65-
.text-xs-center { text-align: center; }
66-
67-
@include media-breakpoint-up(sm) {
68-
.text-sm-left { text-align: left; }
69-
.text-sm-right { text-align: right; }
70-
.text-sm-center { text-align: center; }
71-
}
72-
73-
@include media-breakpoint-up(md) {
74-
.text-md-left { text-align: left; }
75-
.text-md-right { text-align: right; }
76-
.text-md-center { text-align: center; }
77-
}
78-
79-
@include media-breakpoint-up(lg) {
80-
.text-lg-left { text-align: left; }
81-
.text-lg-right { text-align: right; }
82-
.text-lg-center { text-align: center; }
83-
}
84-
85-
@include media-breakpoint-up(xl) {
86-
.text-xl-left { text-align: left; }
87-
.text-xl-right { text-align: right; }
88-
.text-xl-center { text-align: center; }
63+
@each $breakpoint in map-keys($grid-breakpoints) {
64+
@include media-breakpoint-up($breakpoint) {
65+
.text-#{$breakpoint}-left { text-align: left; }
66+
.text-#{$breakpoint}-right { text-align: right; }
67+
.text-#{$breakpoint}-center { text-align: center; }
68+
}
8969
}
9070

9171
// Transformation

‎assets/stylesheets/bootstrap/mixins/_grid.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// Generate semantic grid columns with these mixins.
44

55
@mixin make-container($gutter: $grid-gutter-width) {
6-
margin-right: auto;
76
margin-left: auto;
7+
margin-right: auto;
88
padding-left: ($gutter / 2);
99
padding-right: ($gutter / 2);
1010
@if not $enable-flex {

0 commit comments

Comments
 (0)