gitignore updated and added .editorconfig

juanpablob · Jul 21, 2015 · fec00b2 · fec00b2
1 parent 0956601
commit fec00b2
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,34 @@
+# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
+# http://editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = tab
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.php]
+indent_size = 4
+
+[*.json]
+indent_style = space
+indent_size = 2
+
+[{.jshintrc, .bowerrc, .sailsrc}]
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = tab
+indent_size = 2
+
+[{.css,.sass,*.scss,.styl,.less}]
+indent_style = tab
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,6 @@
 *#
 .DS_Store
 .node_history
-.editorconfig
 npm-debug.log
 
 node_modules/*/*