mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

Merge pull request #19982 from twbs/master-devDeps

Browse Source 
Update devDependencies
This commit is contained in:
Chris Rebert
2016-05-29 14:47:08 -07:00
parent 349cc8c3b4 224cef8794
commit 846b578107
8 changed files with 1391 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gruntfile.js
+4 -4
View File
@@ -333,17 +333,17 @@ module.exports = function (grunt) {
} }
}, },
jade: { pug: {
options: { options: {
pretty: true, pretty: true,
data: getLessVarsData data: getLessVarsData
}, },
customizerVars: { customizerVars: {
src: 'docs/_jade/customizer-variables.jade', src: 'docs/_pug/customizer-variables.pug',
dest: 'docs/_includes/customizer-variables.html' dest: 'docs/_includes/customizer-variables.html'
}, },
customizerNav: { customizerNav: {
src: 'docs/_jade/customizer-nav.jade', src: 'docs/_pug/customizer-nav.pug',
dest: 'docs/_includes/nav/customize.html' dest: 'docs/_includes/nav/customize.html'
} }
}, },
@@ -472,7 +472,7 @@ module.exports = function (grunt) {
// task for building customizer // task for building customizer
grunt.registerTask('build-customizer', ['build-customizer-html', 'build-raw-files']); grunt.registerTask('build-customizer', ['build-customizer-html', 'build-raw-files']);
grunt.registerTask('build-customizer-html', 'jade'); grunt.registerTask('build-customizer-html', 'pug');
grunt.registerTask('build-raw-files', 'Add scripts/less files to customizer.', function () { grunt.registerTask('build-raw-files', 'Add scripts/less files to customizer.', function () {
var banner = grunt.template.process('<%= banner %>'); var banner = grunt.template.process('<%= banner %>');
generateRawFiles(grunt, banner); generateRawFiles(grunt, banner);
docs/_includes/customizer-variables.html
+525 -525
View File
File diff suppressed because it is too large Load Diff
docs/_includes/nav/customize.html
+2 -2
View File
@@ -1,5 +1,5 @@
<!-- NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template.--> <!-- NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.pug template.-->
<li><a href="#import-drop-target">Import</a></li> <li><a href="#import-drop-target">Import</a></li>
<li><a href="#less">Less components</a></li> <li><a href="#less">Less components</a></li>
<li><a href="#plugins">jQuery plugins</a></li> <li><a href="#plugins">jQuery plugins</a></li>
@@ -44,4 +44,4 @@
</ul> </ul>
</li> </li>
<li><a href="#download">Download</a></li> <li><a href="#download">Download</a></li>
<!-- NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template.--> <!-- NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.pug template.-->
docs/_jade/customizer-nav.jade → docs/_pug/customizer-nav.pug
+2 -2
View File
@@ -1,4 +1,4 @@
// NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template. // NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.pug template.
li li
a(href='#import-drop-target') Import a(href='#import-drop-target') Import
li li
@@ -14,4 +14,4 @@ li
a(href='#'+section.id)= section.heading a(href='#'+section.id)= section.heading
li li
a(href='#download') Download a(href='#download') Download
// NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template. // NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.pug template.
docs/_jade/customizer-variables.jade → docs/_pug/customizer-variables.pug
+2 -2
View File
@@ -1,4 +1,4 @@
// NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template. // NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.pug template.
each section in sections each section in sections
if section.customizable if section.customizable
h2(id=section.id)= section.heading h2(id=section.id)= section.heading
@@ -22,4 +22,4 @@ each section in sections
data-var=variable.name) data-var=variable.name)
if variable.docstring if variable.docstring
p.help-block(id=helpId)!= variable.docstring.html p.help-block(id=helpId)!= variable.docstring.html
// NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template. // NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.pug template.
docs/assets/js/customize.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
grunt/npm-shrinkwrap.json
Generated
+849 -420
View File
File diff suppressed because it is too large Load Diff
package.json
+6 -6
View File
@@ -35,16 +35,16 @@
"grunt": "~0.4.5", "grunt": "~0.4.5",
"grunt-autoprefixer": "~3.0.4", "grunt-autoprefixer": "~3.0.4",
"grunt-contrib-clean": "~1.0.0", "grunt-contrib-clean": "~1.0.0",
"grunt-contrib-compress": "~1.2.0", "grunt-contrib-compress": "~1.3.0",
"grunt-contrib-concat": "~1.0.0", "grunt-contrib-concat": "~1.0.0",
"grunt-contrib-connect": "~1.0.0", "grunt-contrib-connect": "~1.0.0",
"grunt-contrib-copy": "~1.0.0", "grunt-contrib-copy": "~1.0.0",
"grunt-contrib-csslint": "~1.0.0", "grunt-contrib-csslint": "~1.0.0",
"grunt-contrib-cssmin": "~1.0.0", "grunt-contrib-cssmin": "~1.0.0",
"grunt-contrib-htmlmin": "~1.2.0", "grunt-contrib-htmlmin": "~1.4.0",
"grunt-contrib-jade": "~1.0.0",
"grunt-contrib-jshint": "~1.0.0", "grunt-contrib-jshint": "~1.0.0",
"grunt-contrib-less": "~1.2.0", "grunt-contrib-less": "~1.3.0",
"grunt-contrib-pug": "~1.0.0",
"grunt-contrib-qunit": "~0.7.0", "grunt-contrib-qunit": "~0.7.0",
"grunt-contrib-uglify": "~1.0.0", "grunt-contrib-uglify": "~1.0.0",
"grunt-contrib-watch": "~1.0.0", "grunt-contrib-watch": "~1.0.0",
@@ -54,9 +54,9 @@
"grunt-jekyll": "~0.4.4", "grunt-jekyll": "~0.4.4",
"grunt-jscs": "~2.8.0", "grunt-jscs": "~2.8.0",
"grunt-saucelabs": "~8.6.2", "grunt-saucelabs": "~8.6.2",
"load-grunt-tasks": "~3.4.1", "load-grunt-tasks": "~3.5.0",
"markdown-it": "^6.0.0", "markdown-it": "^6.0.0",
"shelljs": "^0.6.0", "shelljs": "^0.7.0",
"time-grunt": "^1.3.0" "time-grunt": "^1.3.0"
}, },
"engines": { "engines": {