Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
# Conflicts:
#	.vscode/settings.json
  • Loading branch information
duluca committed Sep 29, 2017
2 parents 855ffe9 + d41f6d9 commit 93545a0
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 19 deletions.
11 changes: 11 additions & 0 deletions .vscode/extensions.json
@@ -0,0 +1,11 @@
{
"recommendations": [
"johnpapa.angular-essentials",
"formulahendry.auto-close-tag",
"esbenp.prettier-vscode",
"PeterJausovec.vscode-docker",
"eamodio.gitlens",
"WallabyJs.quokka-vscode",
"rbbit.typescript-hero"
]
}
5 changes: 0 additions & 5 deletions .vscode/keybindings.json

This file was deleted.

37 changes: 23 additions & 14 deletions .vscode/settings.json
@@ -1,16 +1,25 @@
// Place your settings in this file to overwrite the default settings
{
"editor.tabSize": 2,
"editor.rulers": [120],
"files.trimTrailingWhitespace": true,
"files.autoSave": "onFocusChange",
"files.exclude": {
// "node_modules": true,
"*_TEMPLATE.md": true,
".idea": true,
"**/.git": true,
"**/.DS_Store": true,
"**/*.js": {"when": "$(basename).ts"},
"**/*.js.map": {"when": "$(basename)"}
}
}
"editor.tabSize": 2,
"editor.rulers": [90, 140],
"files.trimTrailingWhitespace": true,
"files.autoSave": "onFocusChange",
"editor.cursorBlinking": "solid",
"workbench.iconTheme": "material-icon-theme",
"git.enableSmartCommit": true,
"editor.autoIndent": true,
"debug.openExplorerOnEnd": true,
"auto-close-tag.SublimeText3Mode": true,
"explorer.openEditors.visible": 0,
"editor.minimap.enabled": false,
"html.autoClosingTags": false,
"git.confirmSync": false,
"editor.formatOnType": true,
"editor.formatOnPaste": true,
"editor.formatOnSave": true,
"typescriptHero.resolver.insertSemicolons": false,
"prettier.printWidth": 90,
"prettier.semi": false,
"prettier.singleQuote": true,
"prettier.trailingComma": "es5"
}

0 comments on commit 93545a0

Please sign in to comment.