From e3892cefdef96666d0d67de0fc95c86be27e2ff5 Mon Sep 17 00:00:00 2001 From: Bruno Leonardo Michels Date: Thu, 26 Oct 2017 23:55:05 -0200 Subject: [PATCH 1/4] Install bootstrap npm i -S bootstrap@4.0.0-beta.2 --- package-lock.json | 5 +++++ package.json | 1 + 2 files changed, 6 insertions(+) diff --git a/package-lock.json b/package-lock.json index e498d4d..dbe73db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -877,6 +877,11 @@ "hoek": "2.16.3" } }, + "bootstrap": { + "version": "4.0.0-beta.2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0-beta.2.tgz", + "integrity": "sha512-DzGtdTlKbrMoGMpz0LigKSqJ+MgtFKxA791PU/q062OlRG0HybNZcTLH7rpDAmLS66Y3esN9yzKHLLbqa5UR3w==" + }, "brace-expansion": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", diff --git a/package.json b/package.json index 7444df6..b6f86e3 100644 --- a/package.json +++ b/package.json @@ -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" From a65e08bf00db094464cb9a33f3168ac39fe75364 Mon Sep 17 00:00:00 2001 From: Bruno Leonardo Michels Date: Fri, 27 Oct 2017 00:03:31 -0200 Subject: [PATCH 2/4] Change entry scss file --- .angular-cli.json | 2 +- src/assets/.gitkeep | 0 src/assets/css/index.scss | 1 + src/styles.scss | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 src/assets/.gitkeep create mode 100644 src/assets/css/index.scss delete mode 100644 src/styles.scss diff --git a/.angular-cli.json b/.angular-cli.json index bcb7606..2204bdb 100644 --- a/.angular-cli.json +++ b/.angular-cli.json @@ -19,7 +19,7 @@ "testTsconfig": "tsconfig.spec.json", "prefix": "app", "styles": [ - "styles.scss" + "assets/css/index.scss" ], "scripts": [], "environmentSource": "environments/environment.ts", diff --git a/src/assets/.gitkeep b/src/assets/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss new file mode 100644 index 0000000..d6779a3 --- /dev/null +++ b/src/assets/css/index.scss @@ -0,0 +1 @@ +@import '~bootstrap/scss/bootstrap.scss'; diff --git a/src/styles.scss b/src/styles.scss deleted file mode 100644 index 90d4ee0..0000000 --- a/src/styles.scss +++ /dev/null @@ -1 +0,0 @@ -/* You can add global styles to this file, and also import other style files */ From 10d04c034945feea3c504ca7ac80060608d98edc Mon Sep 17 00:00:00 2001 From: Bruno Leonardo Michels Date: Fri, 27 Oct 2017 00:03:50 -0200 Subject: [PATCH 3/4] Add Bootstrap example in HTML --- src/app/app.component.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/app/app.component.html b/src/app/app.component.html index 46d517b..30cce15 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -18,3 +18,10 @@

Angular bl +
+
+
Col-4
+
Col-4
+
Col-4
+
+
From f0835ce2d66522190635e646b9675d7b95d7ccaa Mon Sep 17 00:00:00 2001 From: Bruno Leonardo Michels Date: Fri, 27 Oct 2017 00:04:43 -0200 Subject: [PATCH 4/4] Add installing frameworks/libs section and Bootstrap --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d102cbd..268b537 100644 --- a/README.md +++ b/README.md @@ -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) \ No newline at end of file + - [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)