Merge pull request #11974 from XhmikosR/meta

Normalize meta
This commit is contained in:
Mark Otto 2013-12-22 22:20:23 -08:00
commit 45a8a9508e
3 changed files with 27 additions and 17 deletions

View File

@ -2,8 +2,8 @@
"name": "bootstrap",
"version": "3.1.0",
"main": [
"./dist/js/bootstrap.js",
"./dist/css/bootstrap.css",
"./dist/js/bootstrap.js",
"./dist/fonts/glyphicons-halflings-regular.eot",
"./dist/fonts/glyphicons-halflings-regular.svg",
"./dist/fonts/glyphicons-halflings-regular.ttf",
@ -11,14 +11,14 @@
],
"ignore": [
"**/.*",
"*.html",
"_*",
"CNAME",
"composer.json",
"CONTRIBUTING.md",
"docs-assets",
"examples",
"js/tests",
"CNAME",
"CONTRIBUTING.md",
"composer.json",
"*.html"
"js/tests"
],
"dependencies": {
"jquery": ">= 1.9.0"

View File

@ -1,15 +1,15 @@
{
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
"requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true },
"disallowKeywords": ["with"],
"requireLeftStickedOperators": [","],
"disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"requireRightStickedOperators": ["!"],
"disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
"requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
"requireLineFeedAtFileEnd": true,
"requireRightStickedOperators": ["!"],
"requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
"disallowKeywords": ["with"],
"validateLineBreaks": "LF",
"requireLineFeedAtFileEnd": true
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
"requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
"requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true },
"validateLineBreaks": "LF"
}

View File

@ -2,10 +2,15 @@
"name": "bootstrap",
"description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.",
"version": "3.1.0",
"keywords": ["bootstrap", "css"],
"keywords": [
"bootstrap",
"css"
],
"homepage": "http://getbootstrap.com",
"author": "Twitter, Inc.",
"scripts": { "test": "grunt test" },
"scripts": {
"test": "grunt test"
},
"repository": {
"type": "git",
"url": "https://github.com/twbs/bootstrap.git"
@ -43,13 +48,18 @@
},
"jspm": {
"main": "js/bootstrap",
"directories": { "lib": "dist" },
"directories": {
"example": "examples",
"lib": "dist"
},
"shim": {
"js/bootstrap": {
"imports": "jquery",
"exports": "$"
}
},
"buildConfig": { "uglify": true }
"buildConfig": {
"uglify": true
}
}
}