0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00

Merge branch 'v4-dev' into v4-docs-streamlined

This commit is contained in:
Mark Otto 2017-05-30 23:31:40 -07:00
commit 2fd192968d
12 changed files with 38 additions and 25 deletions

View File

@ -5,6 +5,7 @@ GEM
public_suffix (~> 2.0, >= 2.0.2)
colorator (1.1.0)
ffi (1.9.18)
ffi (1.9.18-x64-mingw32)
forwardable-extended (2.6.0)
jekyll (3.4.3)
addressable (~> 2.4)
@ -45,13 +46,14 @@ GEM
ffi (>= 0.5.0)
rouge (1.11.1)
safe_yaml (1.0.4)
sass (3.4.23)
sass (3.4.24)
scss_lint (0.53.0)
rake (>= 0.9, < 13)
sass (~> 3.4.20)
PLATFORMS
ruby
x64-mingw32
DEPENDENCIES
jekyll (~> 3.4.3)
@ -61,4 +63,4 @@ DEPENDENCIES
scss_lint (~> 0.53.0)
BUNDLED WITH
1.14.6
1.15.0

View File

@ -243,6 +243,7 @@ html {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
}
.col-1 {
@ -506,6 +507,7 @@ html {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
}
.col-sm-1 {
-webkit-box-flex: 0;
@ -724,6 +726,7 @@ html {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
}
.col-md-1 {
-webkit-box-flex: 0;
@ -942,6 +945,7 @@ html {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
}
.col-lg-1 {
-webkit-box-flex: 0;
@ -1160,6 +1164,7 @@ html {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
}
.col-xl-1 {
-webkit-box-flex: 0;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -856,6 +856,7 @@ pre code {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
}
.col-1 {
@ -1119,6 +1120,7 @@ pre code {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
}
.col-sm-1 {
-webkit-box-flex: 0;
@ -1337,6 +1339,7 @@ pre code {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
}
.col-md-1 {
-webkit-box-flex: 0;
@ -1555,6 +1558,7 @@ pre code {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
}
.col-lg-1 {
-webkit-box-flex: 0;
@ -1773,6 +1777,7 @@ pre code {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
}
.col-xl-1 {
-webkit-box-flex: 0;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,12 +1,12 @@
/*!
* QUnit 2.2.0
* QUnit 2.3.2
* https://qunitjs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2017-03-11T16:19Z
* Date: 2017-04-18T02:19Z
*/
/** Font Family and Sizes */
@ -236,7 +236,7 @@
}
#qunit-tests.hidepass li.running,
#qunit-tests.hidepass li.pass {
#qunit-tests.hidepass li.pass:not(.todo) {
visibility: hidden;
position: absolute;
width: 0;
@ -433,4 +433,4 @@
left: -10000px;
width: 1000px;
height: 1000px;
}
}

View File

@ -1,12 +1,12 @@
/*!
* QUnit 2.2.0
* QUnit 2.3.2
* https://qunitjs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2017-03-11T16:19Z
* Date: 2017-04-18T02:19Z
*/
(function (global$1) {
'use strict';
@ -21,12 +21,12 @@
var document = window && window.document;
var navigator = window && window.navigator;
var sessionStorage = function () {
var localSessionStorage = function () {
var x = "qunit-test-string";
try {
sessionStorage.setItem(x, x);
sessionStorage.removeItem(x);
return sessionStorage;
global$1.sessionStorage.setItem(x, x);
global$1.sessionStorage.removeItem(x);
return global$1.sessionStorage;
} catch (e) {
return undefined;
}

View File

@ -73,25 +73,25 @@
"popper.js": "^1.9.9"
},
"devDependencies": {
"autoprefixer": "^6.7.7",
"autoprefixer": "^7.1.1",
"babel-cli": "^6.24.1",
"babel-eslint": "^7.2.2",
"babel-eslint": "^7.2.3",
"babel-plugin-transform-es2015-modules-strip": "^0.1.1",
"babel-preset-es2015": "^7.0.0-alpha.7",
"clean-css-cli": "^4.0.12",
"clean-css-cli": "^4.1.3",
"eslint": "^3.19.0",
"htmllint-cli": "^0.0.6",
"node-sass": "^4.5.2",
"node-sass": "^4.5.3",
"nodemon": "^1.11.0",
"npm-run-all": "^4.0.2",
"phantomjs-prebuilt": "^2.1.14",
"postcss-cli": "^3.1.1",
"postcss-flexbugs-fixes": "^2.1.1",
"postcss-cli": "^4.0.0",
"postcss-flexbugs-fixes": "^3.0.0",
"qunit-phantomjs-runner": "^2.3.0",
"qunitjs": "^2.3.1",
"qunitjs": "^2.3.2",
"shelljs": "^0.7.7",
"shx": "^0.2.2",
"uglify-js": "^2.8.22"
"uglify-js": "^3.0.13"
},
"engines": {
"node": ">=4"

View File

@ -37,6 +37,7 @@
.col#{$infix}-auto {
flex: 0 0 auto;
width: auto;
max-width: none; // Reset earlier grid tiers
}
@for $i from 1 through $columns {