From 322fc9a6c476ce89101c6b48e5308d2f6ee8eba9 Mon Sep 17 00:00:00 2001 From: Stephen Edgar Date: Sat, 20 Apr 2013 14:28:50 +1000 Subject: [PATCH 1/4] Include .editorconfig http://editorconfig.org/ --- .editorconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..cf8d7fa6ee --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +# editorconfig.org + +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true From 7c41b318015f2e6f0963a75f0e1112828e17c977 Mon Sep 17 00:00:00 2001 From: Stephen Edgar Date: Sun, 21 Apr 2013 16:52:32 +1000 Subject: [PATCH 2/4] Refined .editorconfig --- .editorconfig | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/.editorconfig b/.editorconfig index cf8d7fa6ee..9055021c9f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,10 +2,26 @@ root = true -[*] +[Makefile] +indent_style = tab +indent_size = 8 + +[*.css] +indent_style = space +indent_size = 2 + +[*.less] +indent_style = space +indent_size = 2 + +[*.html] +indent_style = space +indent_size = 2 + +[*.js] +indent_style = space +indent_size = 2 + +[*.json] indent_style = space indent_size = 2 -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true From 4e9c8880f7c32f71727be15aa19b5f4b871e9488 Mon Sep 17 00:00:00 2001 From: Stephen Edgar Date: Mon, 22 Apr 2013 17:10:59 +1000 Subject: [PATCH 3/4] Use* global rules with exceptions as needed --- .editorconfig | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/.editorconfig b/.editorconfig index 9055021c9f..ad9d6beae3 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,26 +2,13 @@ root = true +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + [Makefile] indent_style = tab -indent_size = 8 - -[*.css] -indent_style = space -indent_size = 2 - -[*.less] -indent_style = space -indent_size = 2 - -[*.html] -indent_style = space -indent_size = 2 - -[*.js] -indent_style = space -indent_size = 2 - -[*.json] -indent_style = space -indent_size = 2 From 08de4136089af30d99bae14526603ef14fc48040 Mon Sep 17 00:00:00 2001 From: Stephen Edgar Date: Mon, 22 Apr 2013 17:19:56 +1000 Subject: [PATCH 4/4] 'root' repo end 'insert_final_newline = true' --- .travis.yml | 2 +- CHANGELOG.md | 2 +- LICENSE | 2 +- Makefile | 2 +- component.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b8e1f17207..2d26206d58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: node_js node_js: - - 0.6 \ No newline at end of file + - 0.6 diff --git a/CHANGELOG.md b/CHANGELOG.md index 154fb2c528..f33f97937b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -357,4 +357,4 @@ Complete rewrite of the library. For full details, head to the upgrading doc at - Bug fixes ## v1.0.0 -- **Initial release** \ No newline at end of file +- **Initial release** diff --git a/LICENSE b/LICENSE index 2bb9ad240f..d9a10c0d8e 100644 --- a/LICENSE +++ b/LICENSE @@ -173,4 +173,4 @@ incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - END OF TERMS AND CONDITIONS \ No newline at end of file + END OF TERMS AND CONDITIONS diff --git a/Makefile b/Makefile index 3150adae5c..1337ea968e 100644 --- a/Makefile +++ b/Makefile @@ -123,4 +123,4 @@ watch: watchr -e "watch('less/.*\.less') { system 'make' }" -.PHONY: docs watch gh-pages bootstrap-img bootstrap-css bootstrap-js \ No newline at end of file +.PHONY: docs watch gh-pages bootstrap-img bootstrap-css bootstrap-js diff --git a/component.json b/component.json index 51940e4d02..57d6e9acb5 100644 --- a/component.json +++ b/component.json @@ -5,4 +5,4 @@ "dependencies": { "jquery": "~1.8.0" } -} \ No newline at end of file +}