From 4bf9985d0c7e794adf833b1d53a9821a209bb042 Mon Sep 17 00:00:00 2001 From: GoNode5 Date: Mon, 6 Mar 2017 14:15:22 +0100 Subject: [PATCH 1/4] Update wiki Bootstrap story --- .../stories/include-bootstrap.md | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/docs/documentation/stories/include-bootstrap.md b/docs/documentation/stories/include-bootstrap.md index 3debf5d279f1..69f40061b288 100644 --- a/docs/documentation/stories/include-bootstrap.md +++ b/docs/documentation/stories/include-bootstrap.md @@ -2,7 +2,7 @@ # Include [Bootstrap](http://getbootstrap.com/) -[Bootstrap](http://getbootstrap.com/) is a popular CSS framework which can be used within an Angular project. +[Bootstrap](https://getbootstrap.com/) is a popular CSS framework which can be used within an Angular project. This guide will walk you through adding bootstrap to your Angular CLI project and configuring it to use bootstrap. ## Using CSS @@ -44,7 +44,27 @@ Now that the project is set up it must be configured to include the bootstrap CS "../node_modules/bootstrap/dist/css/bootstrap.min.css", "styles.css" ], - ``` + + ### Adding full Bootstrap component JS support + + # version 4.x + + **Note:** from Bootstrap site + + Some plugins and CSS components depend on other plugins. If you include plugins individually, + make sure to check for these dependencies in the docs. Also note that all plugins depend on + jQuery (this means jQuery must be included before the plugin files). Consult our bower.json + to see which versions of jQuery are supported. + https://v4-alpha.getbootstrap.com/getting-started/javascript/ + + ``json + "scripts": [ + "../node_modules/jquery/dist/jquery.js", + "../node_modules/tether/dist/js/tether.js", + "../node_modules/bootstrap/dist/js/bootstrap.js", + ] + + **Note:** When you make changes to `.angular-cli.json` you will need to re-start `ng serve` to pick up configuration changes. From 0d7c2973c2d122a88e728b859c0ac1a8d1a4472f Mon Sep 17 00:00:00 2001 From: GoNode5 Date: Mon, 6 Mar 2017 14:54:09 +0100 Subject: [PATCH 2/4] Update include-bootstrap.md --- .../stories/include-bootstrap.md | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/docs/documentation/stories/include-bootstrap.md b/docs/documentation/stories/include-bootstrap.md index 69f40061b288..aac9274fc74b 100644 --- a/docs/documentation/stories/include-bootstrap.md +++ b/docs/documentation/stories/include-bootstrap.md @@ -44,25 +44,31 @@ Now that the project is set up it must be configured to include the bootstrap CS "../node_modules/bootstrap/dist/css/bootstrap.min.css", "styles.css" ], + ``` - ### Adding full Bootstrap component JS support +### Adding full Bootstrap component JS support - # version 4.x +```json - **Note:** from Bootstrap site - - Some plugins and CSS components depend on other plugins. If you include plugins individually, - make sure to check for these dependencies in the docs. Also note that all plugins depend on - jQuery (this means jQuery must be included before the plugin files). Consult our bower.json - to see which versions of jQuery are supported. - https://v4-alpha.getbootstrap.com/getting-started/javascript/ +// version 4 + +**Note:** from Bootstrap site - ``json +Some plugins and CSS components depend on other plugins. If you include plugins individually, +make sure to check for these dependencies in the docs. Also note that all plugins depend on +jQuery (this means jQuery must be included before the plugin files). +Consult our bower.json to see which versions of jQuery are supported. +https://v4-alpha.getbootstrap.com/getting-started/javascript/ + +In `.angular-cli.json` add the following lines to the scripts section: + +# version 4.x "scripts": [ "../node_modules/jquery/dist/jquery.js", - "../node_modules/tether/dist/js/tether.js", - "../node_modules/bootstrap/dist/js/bootstrap.js", + "../node_modules/tether/dist/js/tether.js", + "../node_modules/bootstrap/dist/js/bootstrap.js", ] +``` From 63b1cd059e9462778d6e7bad3ef4124c22312d22 Mon Sep 17 00:00:00 2001 From: GoNode5 Date: Thu, 9 Mar 2017 23:25:32 +0100 Subject: [PATCH 3/4] Update include-bootstrap.md --- docs/documentation/stories/include-bootstrap.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/documentation/stories/include-bootstrap.md b/docs/documentation/stories/include-bootstrap.md index aac9274fc74b..39ec5a39c3b5 100644 --- a/docs/documentation/stories/include-bootstrap.md +++ b/docs/documentation/stories/include-bootstrap.md @@ -69,10 +69,16 @@ In `.angular-cli.json` add the following lines to the scripts section: "../node_modules/bootstrap/dist/js/bootstrap.js", ] ``` +**Note:** When you make changes to `.angular-cli.json` you will need to re-start `ng serve` to pick up configuration changes. +### Other Bootstrap component libaries + - ng bootstrap https://ng-bootstrap.github.io (version 4.x only) + - ng2 bootstrap http://valor-software.com/ng2-bootstrap/ (version 3.x & 4.x) + +You should check with the libraries for instructions how to include their project with Angular-cli. You probably only need to +include the above CSS instructions, the JS/TS part will be provided by the library themself. -**Note:** When you make changes to `.angular-cli.json` you will need to re-start `ng serve` to pick up configuration changes. ### Testing Project From 9c264178d2c9a8dc3373648ccd84d5944ca589fc Mon Sep 17 00:00:00 2001 From: GoNode5 Date: Thu, 9 Mar 2017 23:29:22 +0100 Subject: [PATCH 4/4] Update include-bootstrap.md --- docs/documentation/stories/include-bootstrap.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/documentation/stories/include-bootstrap.md b/docs/documentation/stories/include-bootstrap.md index 39ec5a39c3b5..564b473c4798 100644 --- a/docs/documentation/stories/include-bootstrap.md +++ b/docs/documentation/stories/include-bootstrap.md @@ -71,7 +71,7 @@ In `.angular-cli.json` add the following lines to the scripts section: ``` **Note:** When you make changes to `.angular-cli.json` you will need to re-start `ng serve` to pick up configuration changes. -### Other Bootstrap component libaries +### Other Bootstrap component libraries - ng bootstrap https://ng-bootstrap.github.io (version 4.x only) - ng2 bootstrap http://valor-software.com/ng2-bootstrap/ (version 3.x & 4.x)