mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Mark Otto
2017-05-30 23:31:40 -07:00
parent f8d1dc4d04 ccd86bdc96
commit 2fd192968d
12 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile.lock
+4 -2
View File
@@ -5,6 +5,7 @@ GEM
public_suffix (~> 2.0, >= 2.0.2) public_suffix (~> 2.0, >= 2.0.2)
colorator (1.1.0) colorator (1.1.0)
ffi (1.9.18) ffi (1.9.18)
ffi (1.9.18-x64-mingw32)
forwardable-extended (2.6.0) forwardable-extended (2.6.0)
jekyll (3.4.3) jekyll (3.4.3)
addressable (~> 2.4) addressable (~> 2.4)
@@ -45,13 +46,14 @@ GEM
ffi (>= 0.5.0) ffi (>= 0.5.0)
rouge (1.11.1) rouge (1.11.1)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sass (3.4.23) sass (3.4.24)
scss_lint (0.53.0) scss_lint (0.53.0)
rake (>= 0.9, < 13) rake (>= 0.9, < 13)
sass (~> 3.4.20) sass (~> 3.4.20)
PLATFORMS PLATFORMS
ruby ruby
x64-mingw32
DEPENDENCIES DEPENDENCIES
jekyll (~> 3.4.3) jekyll (~> 3.4.3)
@@ -61,4 +63,4 @@ DEPENDENCIES
scss_lint (~> 0.53.0) scss_lint (~> 0.53.0)
BUNDLED WITH BUNDLED WITH
1.14.6 1.15.0
dist/css/bootstrap-grid.css
Vendored
+5
View File
@@ -243,6 +243,7 @@ html {
-ms-flex: 0 0 auto; -ms-flex: 0 0 auto;
flex: 0 0 auto; flex: 0 0 auto;
width: auto; width: auto;
max-width: none;
} }
.col-1 { .col-1 {
@@ -506,6 +507,7 @@ html {
-ms-flex: 0 0 auto; -ms-flex: 0 0 auto;
flex: 0 0 auto; flex: 0 0 auto;
width: auto; width: auto;
max-width: none;
} }
.col-sm-1 { .col-sm-1 {
-webkit-box-flex: 0; -webkit-box-flex: 0;
@@ -724,6 +726,7 @@ html {
-ms-flex: 0 0 auto; -ms-flex: 0 0 auto;
flex: 0 0 auto; flex: 0 0 auto;
width: auto; width: auto;
max-width: none;
} }
.col-md-1 { .col-md-1 {
-webkit-box-flex: 0; -webkit-box-flex: 0;
@@ -942,6 +945,7 @@ html {
-ms-flex: 0 0 auto; -ms-flex: 0 0 auto;
flex: 0 0 auto; flex: 0 0 auto;
width: auto; width: auto;
max-width: none;
} }
.col-lg-1 { .col-lg-1 {
-webkit-box-flex: 0; -webkit-box-flex: 0;
@@ -1160,6 +1164,7 @@ html {
-ms-flex: 0 0 auto; -ms-flex: 0 0 auto;
flex: 0 0 auto; flex: 0 0 auto;
width: auto; width: auto;
max-width: none;
} }
.col-xl-1 { .col-xl-1 {
-webkit-box-flex: 0; -webkit-box-flex: 0;
dist/css/bootstrap-grid.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap-grid.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap-grid.min.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.css
+5
View File
@@ -856,6 +856,7 @@ pre code {
-ms-flex: 0 0 auto; -ms-flex: 0 0 auto;
flex: 0 0 auto; flex: 0 0 auto;
width: auto; width: auto;
max-width: none;
} }
.col-1 { .col-1 {
@@ -1119,6 +1120,7 @@ pre code {
-ms-flex: 0 0 auto; -ms-flex: 0 0 auto;
flex: 0 0 auto; flex: 0 0 auto;
width: auto; width: auto;
max-width: none;
} }
.col-sm-1 { .col-sm-1 {
-webkit-box-flex: 0; -webkit-box-flex: 0;
@@ -1337,6 +1339,7 @@ pre code {
-ms-flex: 0 0 auto; -ms-flex: 0 0 auto;
flex: 0 0 auto; flex: 0 0 auto;
width: auto; width: auto;
max-width: none;
} }
.col-md-1 { .col-md-1 {
-webkit-box-flex: 0; -webkit-box-flex: 0;
@@ -1555,6 +1558,7 @@ pre code {
-ms-flex: 0 0 auto; -ms-flex: 0 0 auto;
flex: 0 0 auto; flex: 0 0 auto;
width: auto; width: auto;
max-width: none;
} }
.col-lg-1 { .col-lg-1 {
-webkit-box-flex: 0; -webkit-box-flex: 0;
@@ -1773,6 +1777,7 @@ pre code {
-ms-flex: 0 0 auto; -ms-flex: 0 0 auto;
flex: 0 0 auto; flex: 0 0 auto;
width: auto; width: auto;
max-width: none;
} }
.col-xl-1 { .col-xl-1 {
-webkit-box-flex: 0; -webkit-box-flex: 0;
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
js/tests/vendor/qunit.css
Vendored
+4 -4
View File
@@ -1,12 +1,12 @@
/*! /*!
* QUnit 2.2.0 * QUnit 2.3.2
* https://qunitjs.com/ * https://qunitjs.com/
* *
* Copyright jQuery Foundation and other contributors * Copyright jQuery Foundation and other contributors
* Released under the MIT license * Released under the MIT license
* https://jquery.org/license * https://jquery.org/license
* *
* Date: 2017-03-11T16:19Z * Date: 2017-04-18T02:19Z
*/ */
/** Font Family and Sizes */ /** Font Family and Sizes */
@@ -236,7 +236,7 @@
} }
#qunit-tests.hidepass li.running, #qunit-tests.hidepass li.running,
#qunit-tests.hidepass li.pass { #qunit-tests.hidepass li.pass:not(.todo) {
visibility: hidden; visibility: hidden;
position: absolute; position: absolute;
width: 0; width: 0;
@@ -433,4 +433,4 @@
left: -10000px; left: -10000px;
width: 1000px; width: 1000px;
height: 1000px; height: 1000px;
} }
js/tests/vendor/qunit.js
Vendored
+6 -6
View File
@@ -1,12 +1,12 @@
/*! /*!
* QUnit 2.2.0 * QUnit 2.3.2
* https://qunitjs.com/ * https://qunitjs.com/
* *
* Copyright jQuery Foundation and other contributors * Copyright jQuery Foundation and other contributors
* Released under the MIT license * Released under the MIT license
* https://jquery.org/license * https://jquery.org/license
* *
* Date: 2017-03-11T16:19Z * Date: 2017-04-18T02:19Z
*/ */
(function (global$1) { (function (global$1) {
'use strict'; 'use strict';
@@ -21,12 +21,12 @@
var document = window && window.document; var document = window && window.document;
var navigator = window && window.navigator; var navigator = window && window.navigator;
var sessionStorage = function () { var localSessionStorage = function () {
var x = "qunit-test-string"; var x = "qunit-test-string";
try { try {
sessionStorage.setItem(x, x); global$1.sessionStorage.setItem(x, x);
sessionStorage.removeItem(x); global$1.sessionStorage.removeItem(x);
return sessionStorage; return global$1.sessionStorage;
} catch (e) { } catch (e) {
return undefined; return undefined;
} }
package.json
+8 -8
View File
@@ -73,25 +73,25 @@
"popper.js": "^1.9.9" "popper.js": "^1.9.9"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.7.7", "autoprefixer": "^7.1.1",
"babel-cli": "^6.24.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-plugin-transform-es2015-modules-strip": "^0.1.1",
"babel-preset-es2015": "^7.0.0-alpha.7", "babel-preset-es2015": "^7.0.0-alpha.7",
"clean-css-cli": "^4.0.12", "clean-css-cli": "^4.1.3",
"eslint": "^3.19.0", "eslint": "^3.19.0",
"htmllint-cli": "^0.0.6", "htmllint-cli": "^0.0.6",
"node-sass": "^4.5.2", "node-sass": "^4.5.3",
"nodemon": "^1.11.0", "nodemon": "^1.11.0",
"npm-run-all": "^4.0.2", "npm-run-all": "^4.0.2",
"phantomjs-prebuilt": "^2.1.14", "phantomjs-prebuilt": "^2.1.14",
"postcss-cli": "^3.1.1", "postcss-cli": "^4.0.0",
"postcss-flexbugs-fixes": "^2.1.1", "postcss-flexbugs-fixes": "^3.0.0",
"qunit-phantomjs-runner": "^2.3.0", "qunit-phantomjs-runner": "^2.3.0",
"qunitjs": "^2.3.1", "qunitjs": "^2.3.2",
"shelljs": "^0.7.7", "shelljs": "^0.7.7",
"shx": "^0.2.2", "shx": "^0.2.2",
"uglify-js": "^2.8.22" "uglify-js": "^3.0.13"
}, },
"engines": { "engines": {
"node": ">=4" "node": ">=4"
scss/mixins/_grid-framework.scss
+1
View File
@@ -37,6 +37,7 @@
.col#{$infix}-auto { .col#{$infix}-auto {
flex: 0 0 auto; flex: 0 0 auto;
width: auto; width: auto;
max-width: none; // Reset earlier grid tiers
} }
@for $i from 1 through $columns { @for $i from 1 through $columns {