Skip to content

Commit 31c5e89

Browse files
committed
upgrade to bootstrap 4
1 parent 020b22a commit 31c5e89

4 files changed

Lines changed: 11 additions & 13 deletions

File tree

ember-cli-build.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
55
module.exports = function (defaults) {
66
let app = new EmberAddon(defaults, {
77
'ember-bootstrap': {
8-
bootstrapVersion: 3,
9-
importBootstrapFont: true,
8+
bootstrapVersion: 4,
9+
importBootstrapFont: false,
1010
importBootstrapCSS: false,
1111
},
1212
snippetSearchPaths: ['addon', 'tests/dummy/app'],

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@glimmer/component": "^1.0.4",
4747
"@glimmer/tracking": "^1.0.4",
4848
"babel-eslint": "^10.1.0",
49-
"bootstrap-sass": "^3.3.7",
49+
"bootstrap": "^4.6.0",
5050
"broccoli-asset-rev": "^3.0.0",
5151
"ember-auto-import": "^2.2.4",
5252
"ember-basic-dropdown": "^4.0.1",

tests/dummy/app/styles/app.scss

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,15 @@
2424
.navigation-example-link {
2525
margin: 1px 2px;
2626
padding: 1px 3px;
27-
border-radius: $nav-pills-border-radius;
2827

29-
&:hover,
30-
&:focus {
28+
@include border-radius($nav-pills-border-radius);
29+
@include hover-focus() {
3130
text-decoration: none;
32-
background-color: $nav-link-hover-bg;
3331
}
3432

3533
&.active {
36-
color: $nav-pills-active-link-hover-color;
37-
background-color: $nav-pills-active-link-hover-bg;
34+
color: $nav-pills-link-active-color;
35+
background-color: $nav-pills-link-active-bg;
3836
}
3937
}
4038
}

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3802,10 +3802,10 @@ boom@0.4.x:
38023802
dependencies:
38033803
hoek "0.9.x"
38043804

3805-
bootstrap-sass@^3.3.7:
3806-
version "3.4.1"
3807-
resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.4.1.tgz#6843c73b1c258a0ac5cb2cc6f6f5285b664a8e9a"
3808-
integrity sha512-p5rxsK/IyEDQm2CwiHxxUi0MZZtvVFbhWmyMOt4lLkA4bujDA1TGoKT0i1FKIWiugAdP+kK8T5KMDFIKQCLYIA==
3805+
bootstrap@^4.6.0:
3806+
version "4.6.1"
3807+
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.1.tgz#bc25380c2c14192374e8dec07cf01b2742d222a2"
3808+
integrity sha512-0dj+VgI9Ecom+rvvpNZ4MUZJz8dcX7WCX+eTID9+/8HgOkv3dsRzi8BGeZJCQU6flWQVYxwTQnEZFrmJSEO7og==
38093809

38103810
bops@0.0.3:
38113811
version "0.0.3"

0 commit comments

Comments
 (0)