Skip to content
This repository was archived by the owner on Dec 7, 2018. It is now read-only.

Commit a9f06a3

Browse files
committed
update to bootstrap 4 beta #45
1 parent b4d0938 commit a9f06a3

File tree

8 files changed

+119
-134
lines changed

8 files changed

+119
-134
lines changed

.bootstraprc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ styles:
6464
mixins: true
6565

6666
# Reset and dependencies
67-
normalize: true
67+
normalize: false
6868
print: true
6969

7070
# Core CSS
@@ -93,7 +93,7 @@ styles:
9393
progress: true
9494
media: true
9595
list-group: true
96-
responsive-embed: true
96+
responsive-embed: false
9797
close: true
9898
badge: true # mandatory for bootstrap alpha 6, otherwise you have to use 'tags: true'
9999

bootstrap/before.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
// $input-color: $gray !default;
3333
// This means you can define $input-color before we load _variables.scss
3434

35+
// at the beginning to support Bootstrap 4 beta 1
36+
@import "~bootstrap/scss/_functions.scss";
37+
3538
// Start with assigning color names to specific hex values.
3639
$white: #fff !default;
3740
$black: #000 !default;

config/webpack.common.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ module.exports = {
244244
jQuery: 'jquery',
245245
jquery: 'jquery',
246246
$: 'jquery',
247+
'Popper': 'popper.js',
247248
'Tether': 'tether',
248249
'window.Tether': 'tether',
249250
//---------------------------------------------------

package-lock.json

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

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@angularclass/idle-preload": "^1.0.4",
5959
"@ng-bootstrap/ng-bootstrap": "^1.0.0-alpha.30",
6060
"@ngrx/store": "^4.0.0",
61-
"bootstrap": "=4.0.0-alpha.6",
61+
"bootstrap": "^4.0.0-beta",
6262
"bootstrap-loader": "^2.1.0",
6363
"classlist.js": "^1.1.20150312",
6464
"core-js": "^2.4.1",
@@ -69,6 +69,7 @@
6969
"lodash": "^4.17.4",
7070
"mousetrap": "^1.6.0",
7171
"ng2-validators": "^2.2.0",
72+
"popper.js": "^1.11.1",
7273
"reflect-metadata": "^0.1.10",
7374
"rxjs": "^5.4.2",
7475
"tether": "^1.3.8",

0 commit comments

Comments
 (0)