diff options
| author | Mark Otto <[email protected]> | 2016-09-15 10:20:57 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-09-15 10:20:57 -0700 |
| commit | 64dcb8b5073293daa911d2b274fd875f31693317 (patch) | |
| tree | 112821f9bdd9b51f8953521cc2f34a537ccf74a2 /grunt | |
| parent | 15f522fd4ae3fe7933d526f045b0b2df22a35291 (diff) | |
| parent | 63129112bbea91f7cd62014f162f857f50084656 (diff) | |
| download | bootstrap-64dcb8b5073293daa911d2b274fd875f31693317.tar.xz bootstrap-64dcb8b5073293daa911d2b274fd875f31693317.zip | |
Merge branch 'v4-dev' into v4-navbars
Diffstat (limited to 'grunt')
| -rw-r--r-- | grunt/bs-sass-compile/libsass.js | 3 | ||||
| -rw-r--r-- | grunt/bs-sass-compile/sass.js | 3 | ||||
| -rw-r--r-- | grunt/npm-shrinkwrap.json | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/grunt/bs-sass-compile/libsass.js b/grunt/bs-sass-compile/libsass.js index 271aac881..79b21c5a1 100644 --- a/grunt/bs-sass-compile/libsass.js +++ b/grunt/bs-sass-compile/libsass.js @@ -25,7 +25,8 @@ module.exports = function configureLibsass(grunt) { }, docs: { files: { - 'docs/assets/css/docs.min.css': 'docs/assets/scss/docs.scss' + 'docs/assets/css/docs.min.css': 'docs/assets/scss/docs.scss', + 'docs/assets/css/docs-flexbox.min.css': 'docs/assets/scss/flex-grid.scss' } } } diff --git a/grunt/bs-sass-compile/sass.js b/grunt/bs-sass-compile/sass.js index 3a7d4a710..6e32691c0 100644 --- a/grunt/bs-sass-compile/sass.js +++ b/grunt/bs-sass-compile/sass.js @@ -29,7 +29,8 @@ module.exports = function configureRubySass(grunt) { docs: { options: options, files: { - 'docs/assets/css/docs.min.css': 'docs/assets/scss/docs.scss' + 'docs/assets/css/docs.min.css': 'docs/assets/scss/docs.scss', + 'docs/assets/css/docs-flexbox.min.css': 'docs/assets/scss/flex-grid.scss' } } } diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json index bba713367..d43d3e4bd 100644 --- a/grunt/npm-shrinkwrap.json +++ b/grunt/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "bootstrap", - "version": "4.0.0-alpha.2", + "version": "4.0.0-alpha.4", "dependencies": { "abbrev": { "version": "1.0.9", |