Skip to content

Commit cc88195

Browse files
committed
upgrade to bootstrap 5
1 parent c330be3 commit cc88195

4 files changed

Lines changed: 8 additions & 11 deletions

File tree

ember-cli-build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ 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: 4,
8+
bootstrapVersion: 5,
99
importBootstrapFont: false,
1010
importBootstrapCSS: false,
1111
},

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": "^4.6.0",
49+
"bootstrap": "^5.0.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: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,8 @@
2424
.navigation-example-link {
2525
margin: 1px 2px;
2626
padding: 1px 3px;
27-
28-
@include border-radius($nav-pills-border-radius);
29-
@include hover-focus() {
30-
text-decoration: none;
31-
}
27+
text-decoration: none;
28+
border-radius: $nav-pills-border-radius;
3229

3330
&.active {
3431
color: $nav-pills-link-active-color;

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3799,10 +3799,10 @@ boom@0.4.x:
37993799
dependencies:
38003800
hoek "0.9.x"
38013801

3802-
bootstrap@^4.6.0:
3803-
version "4.6.1"
3804-
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.1.tgz#bc25380c2c14192374e8dec07cf01b2742d222a2"
3805-
integrity sha512-0dj+VgI9Ecom+rvvpNZ4MUZJz8dcX7WCX+eTID9+/8HgOkv3dsRzi8BGeZJCQU6flWQVYxwTQnEZFrmJSEO7og==
3802+
bootstrap@^5.0.0:
3803+
version "5.1.3"
3804+
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34"
3805+
integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==
38063806

38073807
bops@0.0.3:
38083808
version "0.0.3"

0 commit comments

Comments
 (0)