Skip to content

Commit af97ec4

Browse files
authored
Merge pull request #5 from brunolm/install-bootstrap
Install bootstrap
2 parents cf3339f + f0835ce commit af97ec4

File tree

8 files changed

+20
-3
lines changed

8 files changed

+20
-3
lines changed

.angular-cli.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"testTsconfig": "tsconfig.spec.json",
2020
"prefix": "app",
2121
"styles": [
22-
"styles.scss"
22+
"assets/css/index.scss"
2323
],
2424
"scripts": [],
2525
"environmentSource": "environments/environment.ts",

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@ Each Pull Request will contain explanation and steps taken to complete a feature
1212

1313
- [Add project on Travis CI](https://github.com/brunolm/angular-how-to/pull/2)
1414
- [Add code coverage and coveralls integration](https://github.com/brunolm/angular-how-to/pull/3)
15-
- [Add code coverage thresholds](https://github.com/brunolm/angular-how-to/pull/4)
15+
- [Add code coverage thresholds](https://github.com/brunolm/angular-how-to/pull/4)
16+
17+
## Installing Frameworks and Libs
18+
19+
- [Add Boostrap 4](https://github.com/brunolm/angular-how-to/pull/5)

package-lock.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"@angular/platform-browser": "^4.2.4",
2525
"@angular/platform-browser-dynamic": "^4.2.4",
2626
"@angular/router": "^4.2.4",
27+
"bootstrap": "^4.0.0-beta.2",
2728
"core-js": "^2.4.1",
2829
"rxjs": "^5.4.2",
2930
"zone.js": "^0.8.14"

src/app/app.component.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,10 @@ <h2><a target="_blank" rel="noopener" href="https://blog.angular.io/">Angular bl
1818
</li>
1919
</ul>
2020

21+
<div class="container">
22+
<div class="row">
23+
<div class="col-4">Col-4</div>
24+
<div class="col-4">Col-4</div>
25+
<div class="col-4">Col-4</div>
26+
</div>
27+
</div>

src/assets/.gitkeep

Whitespace-only changes.

src/assets/css/index.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import '~bootstrap/scss/bootstrap.scss';

src/styles.scss

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)