1
0
mirror of https://github.com/tabler/tabler.git synced 2025-12-21 17:34:25 +04:00

Merge branches 'dev' and 'dev-doc-bootstrap-link' of https://github.com/tabler/tabler into dev-doc-bootstrap-link

 Conflicts:
	.editorconfig
	pages/_docs/colors.md
This commit is contained in:
codecalm
2019-12-09 18:34:11 +01:00
34 changed files with 377 additions and 313 deletions

View File

@@ -12,6 +12,7 @@ tab_width=3
[*.html]
indent_style=tab
indent_size=3
insert_final_newline=false
[*.md]
indent_style=tab
@@ -20,12 +21,3 @@ tab_width=3
[*.js.map]
indent_style=tab
indent_size=3
[{*.css,*.scss}]
indent_style=space
indent_size=2
insert_final_newline = true
[{*.yml,*.yaml}]
indent_style=space
indent_size=2