diff options
| author | Mark Otto <[email protected]> | 2014-03-06 22:40:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-06 22:40:25 -0800 |
| commit | 12c619f5b9149a4d3f4d24efe106504b6a8a5004 (patch) | |
| tree | dacdd064110d04b8195151c08ef4e5713ba3ea24 /package.json | |
| parent | f4dd6221d4e7a8eaa9cd8ebe0457ad016f5058cc (diff) | |
| parent | 7e299c6a49bced5d2c2581a5504ddf7dbcaf041f (diff) | |
| download | bootstrap-12c619f5b9149a4d3f4d24efe106504b6a8a5004.tar.xz bootstrap-12c619f5b9149a4d3f4d24efe106504b6a8a5004.zip | |
Merge branch 'master' into boulox-responsive-embed
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/css.html
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 52 |
1 files changed, 31 insertions, 21 deletions
diff --git a/package.json b/package.json index 14d42ab7e..3132b3ff8 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,23 @@ { "name": "bootstrap", - "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.", - "version": "3.0.3", + "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", + "version": "3.1.1", "keywords": [ - "bootstrap", - "css" + "css", + "less", + "mobile-first", + "responsive", + "front-end", + "framework", + "web" ], "homepage": "http://getbootstrap.com", "author": "Twitter, Inc.", "scripts": { "test": "grunt test" }, + "style": "./dist/css/bootstrap.css", + "less": "./less/bootstrap.less", "repository": { "type": "git", "url": "https://github.com/twbs/bootstrap.git" @@ -18,36 +25,39 @@ "bugs": { "url": "https://github.com/twbs/bootstrap/issues" }, - "licenses": [ - { - "type": "MIT", - "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE" - } - ], + "license": { + "type": "MIT", + "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE" + }, "devDependencies": { "btoa": "~1.1.1", + "canonical-json": "~0.0.4", + "css-flip": "~0.3.0", "grunt": "~0.4.2", - "grunt-banner": "~0.2.0", + "grunt-banner": "~0.2.1", "grunt-contrib-clean": "~0.5.0", "grunt-contrib-concat": "~0.3.0", - "grunt-contrib-connect": "~0.6.0", + "grunt-contrib-connect": "~0.7.1", "grunt-contrib-copy": "~0.5.0", "grunt-contrib-csslint": "~0.2.0", - "grunt-contrib-cssmin": "~0.7.0", - "grunt-contrib-jade": "~0.9.1", + "grunt-contrib-cssmin": "~0.9.0", + "grunt-contrib-jade": "~0.11.0", "grunt-contrib-jshint": "~0.8.0", - "grunt-contrib-less": "~0.9.0", - "grunt-contrib-qunit": "~0.3.0", - "grunt-contrib-uglify": "~0.2.7", + "grunt-contrib-less": "~0.10.0", + "grunt-contrib-qunit": "~0.4.0", + "grunt-contrib-uglify": "~0.4.0", "grunt-contrib-watch": "~0.5.3", + "grunt-css-flip": "^0.1.0", "grunt-csscomb": "~2.0.1", + "grunt-exec": "~0.4.5", "grunt-html-validation": "~0.1.13", "grunt-jekyll": "~0.4.1", - "grunt-jscs-checker": "~0.3.0", - "grunt-saucelabs": "~4.1.2", + "grunt-jscs-checker": "~0.4.0", + "grunt-saucelabs": "~5.0.1", "grunt-sed": "~0.1.1", - "load-grunt-tasks": "~0.2.1", - "markdown": "~0.5.0" + "load-grunt-tasks": "~0.4.0", + "markdown": "~0.5.0", + "css-flip": "~0.3.0" }, "jspm": { "main": "js/bootstrap", |