Update ember-bootstrap

adopted-ember-addons · Jun 24, 2022 · e4bbb9e · e4bbb9e
1 parent de2f0c5
commit e4bbb9e
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 31 deletions.
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -8,13 +8,13 @@ module.exports = function (defaults) {
     snippetPaths: ['snippets', 'tests/dummy/snippets'],
 
     'ember-bootstrap': {
-      bootstrapVersion: 3,
+      bootstrapVersion: 4,
       importBootstrapFont: true,
       importBootstrapCSS: false,
     },
 
     'ember-prism': {
-      'components': ['javascript', 'markup'],
+      components: ['javascript', 'markup'],
     },
   });
 

diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
-    "bootstrap-sass": "^3.3.7",
+    "bootstrap": "^4.6.0",
     "broccoli-asset-rev": "^2.7.0",
     "ember-auto-import": "^1.12.0",
     "ember-bootstrap": "^4.0.0",

diff --git a/tests/dummy/app/styles/navbar.scss b/tests/dummy/app/styles/navbar.scss
@@ -1,4 +1,4 @@
-.navbar.navbar-default {
+.navbar.navbar-light {
   background-color: white;
   margin: 0;
   border-radius: 0;
@@ -21,20 +21,22 @@
       color: #444444;
     }
   }
-  .navbar-nav > li > a {
+  .navbar-nav a {
     font-size: 14px;
     font-weight: 200;
+    color: #444444;
 
-   > .fa-caret-down {
-     margin-left: 3px;
-   }
+    .fa-caret-down {
+      margin-left: 3px;
+      margin-right: 3px;
+    }
 
     &.github {
       font-size: 24px;
     }
   }
-  .navbar-nav > li > a:focus,
-  .navbar-nav > li > a:hover {
+  .navbar-nav a:focus,
+  .navbar-nav a:hover {
     color: $accent-color;
   }
   .navbar-nav > .active > a,

diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs
@@ -1,28 +1,39 @@
 {{! template-lint-disable }}
 
-{{#bs-navbar fluid=true collapsed=true as |navbar|}}
+<BsNavbar fluid=true collapsed=true as |navbar|>
   <div class="navbar-header">
-    {{navbar.toggle}}
+    <navbar.toggle />
     <LinkTo @route='index' class='navbar-brand'>
       <img src='images/ember-logo.png' alt=''>
       <span>CP Validations</span>
     </LinkTo>
   </div>
 
-  {{#navbar.content}}
-    {{#navbar.nav class="navbar-right" as |nav|}}
-      {{#nav.dropdown as |dd|}}
-        {{#dd.toggle}}Documentation <span class="caret"></span>{{/dd.toggle}}
-        {{#dd.menu as |ddm|}}
-          {{#ddm.item}}<a href='docs'>v4.x</a>{{/ddm.item}}
-          {{#ddm.item}}<a href='https://rawgit.com/adopted-ember-addons/ember-cp-validations/c4123c983e54f24dd790ffa1bad66cfdf2f47ec6/docs/index.html'>v3.x</a>{{/ddm.item}}
-          {{#ddm.item}}<a href='https://rawgit.com/adopted-ember-addons/ember-cp-validations/c08fedbf3dcfff1e8904a6469c8defd1fc2bfdf5/docs/index.html'>v2.x</a>{{/ddm.item}}
-        {{/dd.menu}}
-      {{/nav.dropdown}}
-      {{#nav.item}}<a href='https://github.com/adopted-ember-addons/ember-cp-validations' class='fa fa-github github'></a>{{/nav.item}}
-    {{/navbar.nav}}
-  {{/navbar.content}}
-{{/bs-navbar}}
+  <navbar.content>
+    <navbar.nav class="ml-auto" as |nav|>
+      <nav.dropdown as |dd|>
+        <dd.toggle>Documentation <span class="caret"></span></dd.toggle>
+        <dd.menu as |ddm|>
+          <ddm.item>
+            <a class="dropdown-item" href='docs'>v4.x</a>
+          </ddm.item>
+          <ddm.item>
+            <a class="dropdown-item" href='https://rawgit.com/adopted-ember-addons/ember-cp-validations/c4123c983e54f24dd790ffa1bad66cfdf2f47ec6/docs/index.html'>v3.x</a>
+          </ddm.item>
+          <ddm.item>
+            <a class="dropdown-item" href='https://rawgit.com/adopted-ember-addons/ember-cp-validations/c08fedbf3dcfff1e8904a6469c8defd1fc2bfdf5/docs/index.html'>v2.x</a>
+          </ddm.item>
+        </dd.menu>
+      </nav.dropdown>
+    </navbar.nav>
+
+    <navbar.nav as |nav|>
+      <nav.item>
+        <a href='https://github.com/adopted-ember-addons/ember-cp-validations' class='fa fa-github github'></a>
+      </nav.item>
+    </navbar.nav>
+  </navbar.content>
+</BsNavbar>
 
 <div class='content'>
   {{outlet}}

diff --git a/yarn.lock b/yarn.lock
@@ -3162,11 +3162,6 @@ boom@2.x.x:
   dependencies:
     hoek "2.x.x"
 
-bootstrap-sass@^3.3.7:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.4.3.tgz#742cc8f4286303ae9fe8e4c95237321eae73766c"
-  integrity sha512-vPgFnGMp1jWZZupOND65WS6mkR8rxhJxndT/AcMbqcq1hHMdkcH4sMPhznLzzoHOHkSCrd6J9F8pWBriPCKP2Q==
-
 bops@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/bops/-/bops-0.0.3.tgz#c5cbf6fea8be7401ca5ea6d1679e6c4e8b407c79"