mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-28 15:50:01 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:twbs/bootstrap

Browse Source
This commit is contained in:
Mark Otto
2014-03-06 23:18:39 -08:00
parent 705ff7f227 73ad81d89c
commit 61c9e9df4b
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gruntfile.js
View File

@@ -391,6 +391,7 @@ module.exports = function (grunt) {
// These plugins provide necessary tasks. // These plugins provide necessary tasks.
require('load-grunt-tasks')(grunt, {scope: 'devDependencies'}); require('load-grunt-tasks')(grunt, {scope: 'devDependencies'});
require('time-grunt')(grunt);
// Docs HTML validation task // Docs HTML validation task
grunt.registerTask('validate-html', ['jekyll', 'validation']); grunt.registerTask('validate-html', ['jekyll', 'validation']);

7
package.json
View File

@@ -47,8 +47,8 @@
"grunt-contrib-qunit": "~0.4.0", "grunt-contrib-qunit": "~0.4.0",
"grunt-contrib-uglify": "~0.4.0", "grunt-contrib-uglify": "~0.4.0",
"grunt-contrib-watch": "~0.5.3", "grunt-contrib-watch": "~0.5.3",
"grunt-css-flip": "^0.1.0",
"grunt-csscomb": "~2.0.1", "grunt-csscomb": "~2.0.1",
"grunt-css-flip": "^0.1.0",
"grunt-exec": "~0.4.5", "grunt-exec": "~0.4.5",
"grunt-html-validation": "~0.1.13", "grunt-html-validation": "~0.1.13",
"grunt-jekyll": "~0.4.1", "grunt-jekyll": "~0.4.1",
@@ -57,7 +57,10 @@
"grunt-sed": "~0.1.1", "grunt-sed": "~0.1.1",
"load-grunt-tasks": "~0.4.0", "load-grunt-tasks": "~0.4.0",
"markdown": "~0.5.0", "markdown": "~0.5.0",
"css-flip": "~0.3.0" "time-grunt": "~0.2.10"
},
"engines": {
"node": "~0.10.1"
}, },
"jspm": { "jspm": {
"main": "js/bootstrap", "main": "js/bootstrap",

2
test-infra/npm-shrinkwrap.canonical.json
View File

File diff suppressed because one or more lines are too long