From f0f0d9d625fcd1eb326ea6f3b3007295cd23441f Mon Sep 17 00:00:00 2001 From: Aurelio De Rosa Date: Sat, 23 Jan 2016 17:16:32 +0000 Subject: [PATCH 1/3] Added .editorconfig file --- .editorconfig | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..06dbe065 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,27 @@ +# This file is for unifying the coding style for different editors and IDEs +# editorconfig.org + +root = true + + +[*] +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +# Tabs in JS unless otherwise specified +[**.js] +indent_style = tab + +[test/**.xml] +indent_style = tab + +[test/**.php] +indent_style = tab + +[test/**.html] +indent_style = tab + +[test/**.css] +indent_style = tab From 9a417e0c4fda8dfa5d0effb6abaf013776ec76e4 Mon Sep 17 00:00:00 2001 From: Aurelio De Rosa Date: Sat, 23 Jan 2016 18:28:33 +0000 Subject: [PATCH 2/3] fixup! Improved PR --- .editorconfig | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.editorconfig b/.editorconfig index 06dbe065..b75fd2cf 100644 --- a/.editorconfig +++ b/.editorconfig @@ -14,14 +14,5 @@ insert_final_newline = true [**.js] indent_style = tab -[test/**.xml] -indent_style = tab - -[test/**.php] -indent_style = tab - -[test/**.html] -indent_style = tab - -[test/**.css] +[page/**.html] indent_style = tab From c129aabec11e21fe838cf40b64de974176d58717 Mon Sep 17 00:00:00 2001 From: Aurelio De Rosa Date: Thu, 25 Feb 2016 23:02:14 +0000 Subject: [PATCH 3/3] fixup! Updated based on feedback --- .editorconfig | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.editorconfig b/.editorconfig index b75fd2cf..29b657a3 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,16 +3,17 @@ root = true - [*] end_of_line = lf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true - -# Tabs in JS unless otherwise specified -[**.js] indent_style = tab -[page/**.html] -indent_style = tab +[package.json] +indent_style = space +indent_size = 2 + +[*.yml] +indent_style = space +indent_size = 2