Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install bootstrap #5

Merged
merged 4 commits into from
Oct 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .angular-cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": [
"styles.scss"
"assets/css/index.scss"
],
"scripts": [],
"environmentSource": "environments/environment.ts",
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ Each Pull Request will contain explanation and steps taken to complete a feature

- [Add project on Travis CI](https://github.com/brunolm/angular-how-to/pull/2)
- [Add code coverage and coveralls integration](https://github.com/brunolm/angular-how-to/pull/3)
- [Add code coverage thresholds](https://github.com/brunolm/angular-how-to/pull/4)
- [Add code coverage thresholds](https://github.com/brunolm/angular-how-to/pull/4)

## Installing Frameworks and Libs

- [Add Boostrap 4](https://github.com/brunolm/angular-how-to/pull/5)
5 changes: 5 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"@angular/platform-browser": "^4.2.4",
"@angular/platform-browser-dynamic": "^4.2.4",
"@angular/router": "^4.2.4",
"bootstrap": "^4.0.0-beta.2",
"core-js": "^2.4.1",
"rxjs": "^5.4.2",
"zone.js": "^0.8.14"
Expand Down
7 changes: 7 additions & 0 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,10 @@ <h2><a target="_blank" rel="noopener" href="https://blog.angular.io/">Angular bl
</li>
</ul>

<div class="container">
<div class="row">
<div class="col-4">Col-4</div>
<div class="col-4">Col-4</div>
<div class="col-4">Col-4</div>
</div>
</div>
Empty file removed src/assets/.gitkeep
Empty file.
1 change: 1 addition & 0 deletions src/assets/css/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import '~bootstrap/scss/bootstrap.scss';
1 change: 0 additions & 1 deletion src/styles.scss

This file was deleted.