Skip to content

Commit 2fd1929

Browse files
committed
Merge branch 'v4-dev' into v4-docs-streamlined
2 parents f8d1dc4 + ccd86bd commit 2fd1929

12 files changed

+38
-25
lines changed

Gemfile.lock

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ GEM
55
public_suffix (~> 2.0, >= 2.0.2)
66
colorator (1.1.0)
77
ffi (1.9.18)
8+
ffi (1.9.18-x64-mingw32)
89
forwardable-extended (2.6.0)
910
jekyll (3.4.3)
1011
addressable (~> 2.4)
@@ -45,13 +46,14 @@ GEM
4546
ffi (>= 0.5.0)
4647
rouge (1.11.1)
4748
safe_yaml (1.0.4)
48-
sass (3.4.23)
49+
sass (3.4.24)
4950
scss_lint (0.53.0)
5051
rake (>= 0.9, < 13)
5152
sass (~> 3.4.20)
5253

5354
PLATFORMS
5455
ruby
56+
x64-mingw32
5557

5658
DEPENDENCIES
5759
jekyll (~> 3.4.3)
@@ -61,4 +63,4 @@ DEPENDENCIES
6163
scss_lint (~> 0.53.0)
6264

6365
BUNDLED WITH
64-
1.14.6
66+
1.15.0

dist/css/bootstrap-grid.css

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-grid.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-grid.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-grid.min.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.css

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.min.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/tests/vendor/qunit.css

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*!
2-
* QUnit 2.2.0
2+
* QUnit 2.3.2
33
* https://qunitjs.com/
44
*
55
* Copyright jQuery Foundation and other contributors
66
* Released under the MIT license
77
* https://jquery.org/license
88
*
9-
* Date: 2017-03-11T16:19Z
9+
* Date: 2017-04-18T02:19Z
1010
*/
1111

1212
/** Font Family and Sizes */
@@ -236,7 +236,7 @@
236236
}
237237

238238
#qunit-tests.hidepass li.running,
239-
#qunit-tests.hidepass li.pass {
239+
#qunit-tests.hidepass li.pass:not(.todo) {
240240
visibility: hidden;
241241
position: absolute;
242242
width: 0;
@@ -433,4 +433,4 @@
433433
left: -10000px;
434434
width: 1000px;
435435
height: 1000px;
436-
}
436+
}

js/tests/vendor/qunit.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*!
2-
* QUnit 2.2.0
2+
* QUnit 2.3.2
33
* https://qunitjs.com/
44
*
55
* Copyright jQuery Foundation and other contributors
66
* Released under the MIT license
77
* https://jquery.org/license
88
*
9-
* Date: 2017-03-11T16:19Z
9+
* Date: 2017-04-18T02:19Z
1010
*/
1111
(function (global$1) {
1212
'use strict';
@@ -21,12 +21,12 @@
2121
var document = window && window.document;
2222
var navigator = window && window.navigator;
2323

24-
var sessionStorage = function () {
24+
var localSessionStorage = function () {
2525
var x = "qunit-test-string";
2626
try {
27-
sessionStorage.setItem(x, x);
28-
sessionStorage.removeItem(x);
29-
return sessionStorage;
27+
global$1.sessionStorage.setItem(x, x);
28+
global$1.sessionStorage.removeItem(x);
29+
return global$1.sessionStorage;
3030
} catch (e) {
3131
return undefined;
3232
}

package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -73,25 +73,25 @@
7373
"popper.js": "^1.9.9"
7474
},
7575
"devDependencies": {
76-
"autoprefixer": "^6.7.7",
76+
"autoprefixer": "^7.1.1",
7777
"babel-cli": "^6.24.1",
78-
"babel-eslint": "^7.2.2",
78+
"babel-eslint": "^7.2.3",
7979
"babel-plugin-transform-es2015-modules-strip": "^0.1.1",
8080
"babel-preset-es2015": "^7.0.0-alpha.7",
81-
"clean-css-cli": "^4.0.12",
81+
"clean-css-cli": "^4.1.3",
8282
"eslint": "^3.19.0",
8383
"htmllint-cli": "^0.0.6",
84-
"node-sass": "^4.5.2",
84+
"node-sass": "^4.5.3",
8585
"nodemon": "^1.11.0",
8686
"npm-run-all": "^4.0.2",
8787
"phantomjs-prebuilt": "^2.1.14",
88-
"postcss-cli": "^3.1.1",
89-
"postcss-flexbugs-fixes": "^2.1.1",
88+
"postcss-cli": "^4.0.0",
89+
"postcss-flexbugs-fixes": "^3.0.0",
9090
"qunit-phantomjs-runner": "^2.3.0",
91-
"qunitjs": "^2.3.1",
91+
"qunitjs": "^2.3.2",
9292
"shelljs": "^0.7.7",
9393
"shx": "^0.2.2",
94-
"uglify-js": "^2.8.22"
94+
"uglify-js": "^3.0.13"
9595
},
9696
"engines": {
9797
"node": ">=4"

scss/mixins/_grid-framework.scss

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
.col#{$infix}-auto {
3838
flex: 0 0 auto;
3939
width: auto;
40+
max-width: none; // Reset earlier grid tiers
4041
}
4142

4243
@for $i from 1 through $columns {

0 commit comments

Comments
 (0)