Commit 45a8a950 authored by Mark Otto's avatar Mark Otto

Merge pull request #11974 from XhmikosR/meta

Normalize meta
parents 90ba7fa8 b27fecb7
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"name": "bootstrap", "name": "bootstrap",
"version": "3.1.0", "version": "3.1.0",
"main": [ "main": [
"./dist/js/bootstrap.js",
"./dist/css/bootstrap.css", "./dist/css/bootstrap.css",
"./dist/js/bootstrap.js",
"./dist/fonts/glyphicons-halflings-regular.eot", "./dist/fonts/glyphicons-halflings-regular.eot",
"./dist/fonts/glyphicons-halflings-regular.svg", "./dist/fonts/glyphicons-halflings-regular.svg",
"./dist/fonts/glyphicons-halflings-regular.ttf", "./dist/fonts/glyphicons-halflings-regular.ttf",
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
], ],
"ignore": [ "ignore": [
"**/.*", "**/.*",
"*.html",
"_*", "_*",
"docs-assets",
"examples",
"js/tests",
"CNAME", "CNAME",
"CONTRIBUTING.md",
"composer.json", "composer.json",
"*.html" "CONTRIBUTING.md",
"docs-assets",
"examples",
"js/tests"
], ],
"dependencies": { "dependencies": {
"jquery": ">= 1.9.0" "jquery": ">= 1.9.0"
......
{ {
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], "disallowKeywords": ["with"],
"requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true },
"requireLeftStickedOperators": [","], "requireLeftStickedOperators": [","],
"disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"requireRightStickedOperators": ["!"],
"disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"], "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
"requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], "requireLineFeedAtFileEnd": true,
"requireRightStickedOperators": ["!"],
"requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
"disallowKeywords": ["with"], "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
"validateLineBreaks": "LF", "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
"requireLineFeedAtFileEnd": true "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true },
"validateLineBreaks": "LF"
} }
...@@ -2,10 +2,15 @@ ...@@ -2,10 +2,15 @@
"name": "bootstrap", "name": "bootstrap",
"description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.", "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.",
"version": "3.1.0", "version": "3.1.0",
"keywords": ["bootstrap", "css"], "keywords": [
"bootstrap",
"css"
],
"homepage": "http://getbootstrap.com", "homepage": "http://getbootstrap.com",
"author": "Twitter, Inc.", "author": "Twitter, Inc.",
"scripts": { "test": "grunt test" }, "scripts": {
"test": "grunt test"
},
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/twbs/bootstrap.git" "url": "https://github.com/twbs/bootstrap.git"
...@@ -43,13 +48,18 @@ ...@@ -43,13 +48,18 @@
}, },
"jspm": { "jspm": {
"main": "js/bootstrap", "main": "js/bootstrap",
"directories": { "lib": "dist" }, "directories": {
"example": "examples",
"lib": "dist"
},
"shim": { "shim": {
"js/bootstrap": { "js/bootstrap": {
"imports": "jquery", "imports": "jquery",
"exports": "$" "exports": "$"
} }
}, },
"buildConfig": { "uglify": true } "buildConfig": {
"uglify": true
}
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment