Skip to content

Commit

Permalink
feat(angular): add lost files, move others and fix search bar compone…
Browse files Browse the repository at this point in the history
…nt styles
  • Loading branch information
Ismaestro authored and Ismael Ramos committed May 9, 2018
1 parent 4071e1f commit 6db191d
Show file tree
Hide file tree
Showing 18 changed files with 253 additions and 155 deletions.
13 changes: 13 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Editor configuration, see http://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
13 changes: 7 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc

# dependencies
/node_modules
/coverage

# IDEs and editors
/.idea
Expand All @@ -13,6 +15,7 @@
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
Expand All @@ -24,15 +27,13 @@
# misc
/.sass-cache
/connect.lock
/coverage/*
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings

# e2e
/e2e/*.map

#System Files
# System Files
.DS_Store
Thumbs.db
18 changes: 9 additions & 9 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,24 @@
},
{
"glob": "sitemap.xml",
"input": "src",
"input": "src/assets",
"output": "/"
},
{
"glob": "googled41787c6aae2151b.html",
"input": "src",
"input": "src/assets",
"output": "/"
},
{
"glob": "CNAME",
"input": "src",
"input": "src/assets",
"output": "/"
}
],
"styles": [
"src/assets/css/reset.css",
"src/assets/css/loading.css",
"src/assets/css/styles.scss"
"src/styles.scss"
],
"stylePreprocessorOptions": {
"includePaths": [
Expand Down Expand Up @@ -111,7 +111,7 @@
"styles": [
"src/assets/css/reset.css",
"src/assets/css/loading.css",
"src/assets/css/styles.scss"
"src/styles.scss"
],
"assets": [
{
Expand All @@ -126,17 +126,17 @@
},
{
"glob": "sitemap.xml",
"input": "src",
"input": "src/assets",
"output": "/"
},
{
"glob": "googled41787c6aae2151b.html",
"input": "src",
"input": "src/assets",
"output": "/"
},
{
"glob": "CNAME",
"input": "src",
"input": "src/assets",
"output": "/"
}
],
Expand Down Expand Up @@ -194,4 +194,4 @@
"prefix": "app"
}
}
}
}
3 changes: 1 addition & 2 deletions e2e/tsconfig.e2e.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"baseUrl": "./",
"outDir": "../out-tsc/app",
"module": "commonjs",
"target": "es5",
"types": [
Expand Down
Loading

0 comments on commit 6db191d

Please sign in to comment.