align with bootstrap 4 beta (#65)

IdanCo · Sep 1, 2017 · 6785c77 · 6785c77
1 parent ae2813c
commit 6785c77
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -22,6 +22,8 @@ See it in action at https://idanco.github.io/ng1bs4/.
 
 ## Install
 
+[Install bootstrap 4](https://getbootstrap.com/docs/4.0/getting-started/webpack/) and import it's JS and styling into your project.
+
 Install _ng1bs4_
 
 ```sh

diff --git a/conf/webpack.base.config.js b/conf/webpack.base.config.js
@@ -66,7 +66,7 @@ module.exports = new WebpackConfig().merge({
       $: 'jquery',
       jQuery: 'jquery',
       'window.jQuery': 'jquery',
-      Tether: 'tether'
+      Popper: ['popper.js', 'default'],
     })
     // new webpack.optimize.CommonsChunkPlugin({ // seperate vendor chunks
     //   name: ['vendor', 'manifest']

diff --git a/package.json b/package.json
@@ -30,7 +30,9 @@
   "dependencies": {
     "angular": "^1.6.3",
     "angular-sanitize": "^1.6.4",
-    "bootstrap": "4.0.0-alpha.6"
+    "bootstrap": "4.0.0-beta",
+    "jquery": ">=3.0.0",
+    "popper.js": "^1.11.0"
   },
   "devDependencies": {
     "angular-highlightjs": "^0.7.1",

diff --git a/src/docs/utils/demo/demo.scss b/src/docs/utils/demo/demo.scss
@@ -1,3 +1,4 @@
+@import "~bootstrap/scss/_functions.scss"; // needed because of https://github.com/twbs/bootstrap/issues/23331
 @import "~bootstrap/scss/variables";
 @import "~bootstrap/scss/mixins";
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,8 @@ See it in action at https://idanco.github.io/ng1bs4/. @@
     ## Install
+    [Install bootstrap 4](https://getbootstrap.com/docs/4.0/getting-started/webpack/) and import it's JS and styling into your project.
     Install _ng1bs4_
     ```sh
@@ Expand Down @@